diff --git a/.gitignore b/.gitignore index 185fe61bd3..a5b8b2e15c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ record-and-playback/playback-web/playback-web-0.1.war record-and-playback/.project push_to_git.py */.gradle -.gitignore bbb-lti/.classpath bbb-lti/.project bbb-lti/bin diff --git a/bbb-api-demo/build.gradle b/bbb-api-demo/build.gradle index 116007ae51..979557f29d 100755 --- a/bbb-api-demo/build.gradle +++ b/bbb-api-demo/build.gradle @@ -1,17 +1,18 @@ -//usePlugin 'war' -usePlugin 'war' +apply plugin: 'war' + version = '0.8' repositories { mavenCentral() } -task resolveDeps(dependsOn: configurations.default.buildArtifacts, type: Copy) { +task resolveDeps(type: Copy) { into('lib') from configurations.default - from configurations.default.allArtifacts*.file + from configurations.default.allArtifacts.file } + war { baseName = 'demo' version = '' diff --git a/bbb-lti/application.properties b/bbb-lti/application.properties index 2c7d2d179c..e5656fae00 100644 --- a/bbb-lti/application.properties +++ b/bbb-lti/application.properties @@ -1,7 +1,5 @@ -#utf-8 -#Wed Oct 10 08:34:02 PDT 2012 -app.version=0.1.1 -app.servlet.version=2.4 -app.grails.version=1.1.1 -plugins.hibernate=1.1.1 +#Grails Metadata file +#Thu Mar 20 10:48:08 PDT 2014 +app.grails.version=2.3.6 app.name=lti +app.version=0.1.2 diff --git a/bbb-lti/grails-app/conf/ApplicationResources.groovy b/bbb-lti/grails-app/conf/ApplicationResources.groovy new file mode 100644 index 0000000000..6fe55b24a7 --- /dev/null +++ b/bbb-lti/grails-app/conf/ApplicationResources.groovy @@ -0,0 +1,23 @@ +/* + BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ + + Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). + + This program is free software; you can redistribute it and/or modify it under the + terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 3.0 of the License, or (at your option) any later + version. + + BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along + with BigBlueButton; if not, see . +*/ + +modules = { + application { + resource url:'js/application.js' + } +} \ No newline at end of file diff --git a/bbb-lti/grails-app/conf/BootStrap.groovy b/bbb-lti/grails-app/conf/BootStrap.groovy index 5868a9c3f1..f2ad868ffc 100644 --- a/bbb-lti/grails-app/conf/BootStrap.groovy +++ b/bbb-lti/grails-app/conf/BootStrap.groovy @@ -15,13 +15,10 @@ You should have received a copy of the GNU Lesser General Public License along with BigBlueButton; if not, see . */ - class BootStrap { - def init = { servletContext -> - log.debug "Bootstrapping bbb-lti" - } - - def destroy = { - } -} \ No newline at end of file + def init = { servletContext -> + } + def destroy = { + } +} diff --git a/bbb-lti/grails-app/conf/BuildConfig.groovy b/bbb-lti/grails-app/conf/BuildConfig.groovy new file mode 100644 index 0000000000..cff8ee4071 --- /dev/null +++ b/bbb-lti/grails-app/conf/BuildConfig.groovy @@ -0,0 +1,73 @@ +/* + BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ + + Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). + + This program is free software; you can redistribute it and/or modify it under the + terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 3.0 of the License, or (at your option) any later + version. + + BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along + with BigBlueButton; if not, see . +*/ + +grails.servlet.version = "3.0" +grails.project.class.dir = "target/classes" +grails.project.test.class.dir = "target/test-classes" +grails.project.test.reports.dir = "target/test-reports" +grails.project.work.dir = "target/work" +grails.project.target.level = 1.6 +grails.project.source.level = 1.6 +//grails.project.war.file = "target/${appName}-${appVersion}.war" + +grails.project.fork = [ + test: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, daemon:true], + run: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false], + war: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false], + console: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256] +] + +grails.project.dependency.resolver = "maven" // or ivy +grails.project.dependency.resolution = { + inherits("global") { + } + log "error" + checksums true + legacyResolve false + + repositories { + inherits true + + grailsPlugins() + grailsHome() + mavenLocal() + grailsCentral() + mavenCentral() + + mavenRepo "http://snapshots.repository.codehaus.org" + mavenRepo "http://repository.codehaus.org" + mavenRepo "http://download.java.net/maven/2/" + mavenRepo "http://repository.jboss.com/maven2/" + //mavenRepo "https://raw.github.com/blindsidenetworks/oauth/mvn-repo/" + } + + dependencies { + //runtime "commons-net:commons-net:3.0.1" + //runtime "net.oauth:oauth:1.0.1" + } + + plugins { + // plugins for the build system only + build ":tomcat:7.0.50.1" + + runtime ":database-migration:1.3.8" + runtime ":jquery:1.11.0" + runtime ":resources:1.2.1" + runtime ':twitter-bootstrap:3.1.1' + } +} diff --git a/bbb-lti/grails-app/conf/Config.groovy b/bbb-lti/grails-app/conf/Config.groovy index 9e38b52d67..b276a78363 100644 --- a/bbb-lti/grails-app/conf/Config.groovy +++ b/bbb-lti/grails-app/conf/Config.groovy @@ -1,93 +1,139 @@ -/* - BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ - - Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). - - This program is free software; you can redistribute it and/or modify it under the - terms of the GNU Lesser General Public License as published by the Free Software - Foundation; either version 3.0 of the License, or (at your option) any later - version. - - BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License along - with BigBlueButton; if not, see . -*/ - -// locations to search for config files that get merged into the main config -// config files can either be Java properties files or ConfigSlurper scripts - -// grails.config.locations = [ "classpath:${appName}-config.properties", -// "classpath:${appName}-config.groovy", -// "file:${userHome}/.grails/${appName}-config.properties", -// "file:${userHome}/.grails/${appName}-config.groovy"] - -grails.config.locations = [ "classpath:lti.properties"] - -// if(System.properties["${appName}.config.location"]) { -// grails.config.locations << "file:" + System.properties["${appName}.config.location"] -// } -grails.mime.file.extensions = true // enables the parsing of file extensions from URLs into the request format -grails.mime.use.accept.header = false -grails.mime.types = [ html: ['text/html','application/xhtml+xml'], - xml: ['text/xml', 'application/xml'], - text: 'text/plain', - js: 'text/javascript', - rss: 'application/rss+xml', - atom: 'application/atom+xml', - css: 'text/css', - csv: 'text/csv', - all: '*/*', - json: ['application/json','text/json'], - form: 'application/x-www-form-urlencoded', - multipartForm: 'multipart/form-data' - ] -// The default codec used to encode data with ${} -grails.views.default.codec="none" // none, html, base64 -grails.views.gsp.encoding="UTF-8" -grails.converters.encoding="UTF-8" - -// enabled native2ascii conversion of i18n properties files -grails.enable.native2ascii = true - -// set per-environment serverURL stem for creating absolute links -environments { - production { - grails.serverURL = "http://localhost:8080/${appName}" - } - development { - grails.serverURL = "http://localhost:8080/${appName}" - } - test { - grails.serverURL = "http://localhost:8080/${appName}" - } - -} - -// log4j configuration -log4j = { - appenders { - rollingFile name:"logfile", maxFileSize:1000000, file:"/var/log/bigbluebutton/bbb-lti.log", layout:pattern(conversionPattern: '%d{[dd.MM.yy HH:mm:ss.SSS]} %-5p %c %x - %m%n') - console name:'console', layout:pattern(conversionPattern: '%d{[dd.MM.yy HH:mm:ss.SSS]} %-5p %c %x - %m%n') - 'null' name:'stacktrace' - } - debug logfile:"grails.app" - - error 'org.codehaus.groovy.grails.web.servlet', // controllers - 'org.codehaus.groovy.grails.web.pages', // GSP - 'org.codehaus.groovy.grails.web.sitemesh', // layouts - 'org.codehaus.groovy.grails.web.mapping.filter', // URL mapping - 'org.codehaus.groovy.grails.web.mapping', // URL mapping - 'org.codehaus.groovy.grails.commons', // core / classloading - 'org.codehaus.groovy.grails.plugins', // plugins - 'org.codehaus.groovy.grails.orm.hibernate', // hibernate integration - 'org.springframework', - 'org.hibernate' - - warn 'org.mortbay.log' -} - - - \ No newline at end of file +/* + BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ + + Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). + + This program is free software; you can redistribute it and/or modify it under the + terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 3.0 of the License, or (at your option) any later + version. + + BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along + with BigBlueButton; if not, see . +*/ + +// locations to search for config files that get merged into the main config; +// config files can be ConfigSlurper scripts, Java properties files, or classes +// in the classpath in ConfigSlurper format + +grails.config.locations = [ "classpath:lti.properties"] +// grails.config.locations = [ "classpath:${appName}-config.properties", +// "classpath:${appName}-config.groovy", +// "file:${userHome}/.grails/${appName}-config.properties", +// "file:${userHome}/.grails/${appName}-config.groovy"] + +// if (System.properties["${appName}.config.location"]) { +// grails.config.locations << "file:" + System.properties["${appName}.config.location"] +// } + +grails.project.groupId = appName // change this to alter the default package name and Maven publishing destination + +grails.mime.file.extensions = true // enables the parsing of file extensions from URLs into the request format +grails.mime.use.accept.header = false +// The ACCEPT header will not be used for content negotiation for user agents containing the following strings (defaults to the 4 major rendering engines) +grails.mime.disable.accept.header.userAgents = ['Gecko', 'WebKit', 'Presto', 'Trident'] +grails.mime.types = [ // the first one is the default format + all: '*/*', // 'all' maps to '*' or the first available format in withFormat + atom: 'application/atom+xml', + css: 'text/css', + csv: 'text/csv', + form: 'application/x-www-form-urlencoded', + html: ['text/html','application/xhtml+xml'], + js: 'text/javascript', + json: ['application/json', 'text/json'], + multipartForm: 'multipart/form-data', + rss: 'application/rss+xml', + text: 'text/plain', + hal: ['application/hal+json','application/hal+xml'], + xml: ['text/xml', 'application/xml'] +] + +// URL Mapping Cache Max Size, defaults to 5000 +//grails.urlmapping.cache.maxsize = 1000 + +// What URL patterns should be processed by the resources plugin +grails.resources.adhoc.patterns = ['/images/*', '/css/*', '/js/*', '/plugins/*'] +grails.resources.adhoc.excludes = ['/WEB-INF/**'] + +// Legacy setting for codec used to encode data with ${} +grails.views.default.codec = "html" + +// The default scope for controllers. May be prototype, session or singleton. +// If unspecified, controllers are prototype scoped. +grails.controllers.defaultScope = 'singleton' + +// GSP settings +grails { + views { + gsp { + encoding = 'UTF-8' + htmlcodec = 'xml' // use xml escaping instead of HTML4 escaping + codecs { + expression = 'html' // escapes values inside ${} + scriptlet = 'html' // escapes output from scriptlets in GSPs + taglib = 'none' // escapes output from taglibs + staticparts = 'none' // escapes output from static template parts + } + } + // escapes all not-encoded output at final stage of outputting + // filteringCodecForContentType.'text/html' = 'html' + } +} + + +grails.converters.encoding = "UTF-8" +// scaffolding templates configuration +grails.scaffolding.templates.domainSuffix = 'Instance' + +// Set to false to use the new Grails 1.2 JSONBuilder in the render method +grails.json.legacy.builder = false +// enabled native2ascii conversion of i18n properties files +grails.enable.native2ascii = true +// packages to include in Spring bean scanning +grails.spring.bean.packages = [] +// whether to disable processing of multi part requests +grails.web.disable.multipart=false + +// request parameters to mask when logging exceptions +grails.exceptionresolver.params.exclude = ['password'] + +// configure auto-caching of queries by default (if false you can cache individual queries with 'cache: true') +grails.hibernate.cache.queries = false + +environments { + development { + grails.logging.jul.usebridge = true + } + production { + grails.logging.jul.usebridge = false + } +} + +// log4j configuration +log4j = { + appenders { + rollingFile name:"logfile", maxFileSize:1000000, file:"/var/log/bigbluebutton/bbb-lti.log", layout:pattern(conversionPattern: '%d{[dd.MM.yy HH:mm:ss.SSS]} %-5p %c %x - %m%n') + console name:'console', layout:pattern(conversionPattern: '%d{[dd.MM.yy HH:mm:ss.SSS]} %-5p %c %x - %m%n') + 'null' name:'stacktrace' + } + debug logfile:"grails.app" + + error 'org.codehaus.groovy.grails.web.servlet', // controllers + 'org.codehaus.groovy.grails.web.pages', // GSP + 'org.codehaus.groovy.grails.web.sitemesh', // layouts + 'org.codehaus.groovy.grails.web.mapping.filter', // URL mapping + 'org.codehaus.groovy.grails.web.mapping', // URL mapping + 'org.codehaus.groovy.grails.commons', // core / classloading + 'org.codehaus.groovy.grails.plugins', // plugins + 'org.codehaus.groovy.grails.orm.hibernate', // hibernate integration + 'org.springframework', + 'org.hibernate', + 'net.sf.ehcache.hibernate' + + warn 'org.mortbay.log' + +} diff --git a/bbb-lti/grails-app/conf/DataSource.groovy b/bbb-lti/grails-app/conf/DataSource.groovy index f8aa019016..f961ac941f 100644 --- a/bbb-lti/grails-app/conf/DataSource.groovy +++ b/bbb-lti/grails-app/conf/DataSource.groovy @@ -17,34 +17,102 @@ */ dataSource { - pooled = true - driverClassName = "org.hsqldb.jdbcDriver" - username = "sa" - password = "" + pooled = true + jmxExport = true + driverClassName = "org.h2.Driver" + username = "sa" + password = "" } hibernate { - cache.use_second_level_cache=true - cache.use_query_cache=true - cache.provider_class='com.opensymphony.oscache.hibernate.OSCacheProvider' + cache.use_second_level_cache = true + cache.use_query_cache = false + cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory' // Hibernate 3 +// cache.region.factory_class = 'org.hibernate.cache.ehcache.EhCacheRegionFactory' // Hibernate 4 } + // environment specific settings environments { - development { - dataSource { - dbCreate = "create-drop" // one of 'create', 'create-drop','update' - url = "jdbc:hsqldb:mem:devDB" - } - } - test { - dataSource { - dbCreate = "update" - url = "jdbc:hsqldb:mem:testDb" - } - } - production { - dataSource { - dbCreate = "update" - url = "jdbc:hsqldb:mem:prodDb" - } - } -} \ No newline at end of file + development { + dataSource { + dbCreate = "create-drop" // one of 'create', 'create-drop', 'update', 'validate', '' + url = "jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE" + } + } + test { + dataSource { + dbCreate = "update" + url = "jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE" + } + } + production { + dataSource { + dbCreate = "update" + url = "jdbc:h2:prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE" + properties { + // Documentation for Tomcat JDBC Pool + // http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html#Common_Attributes + // https://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/tomcat/jdbc/pool/PoolConfiguration.html + jmxEnabled = true + initialSize = 5 + maxActive = 50 + minIdle = 5 + maxIdle = 25 + maxWait = 10000 + maxAge = 10 * 60000 + timeBetweenEvictionRunsMillis = 5000 + minEvictableIdleTimeMillis = 60000 + validationQuery = "SELECT 1" + validationQueryTimeout = 3 + validationInterval = 15000 + testOnBorrow = true + testWhileIdle = true + testOnReturn = false + ignoreExceptionOnPreLoad = true + // http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html#JDBC_interceptors + jdbcInterceptors = "ConnectionState;StatementCache(max=200)" + defaultTransactionIsolation = java.sql.Connection.TRANSACTION_READ_COMMITTED // safe default + // controls for leaked connections + abandonWhenPercentageFull = 100 // settings are active only when pool is full + removeAbandonedTimeout = 120000 + removeAbandoned = true + // use JMX console to change this setting at runtime + logAbandoned = false // causes stacktrace recording overhead, use only for debugging + /* + // JDBC driver properties + // Mysql as example + dbProperties { + // Mysql specific driver properties + // http://dev.mysql.com/doc/connector-j/en/connector-j-reference-configuration-properties.html + // let Tomcat JDBC Pool handle reconnecting + autoReconnect=false + // truncation behaviour + jdbcCompliantTruncation=false + // mysql 0-date conversion + zeroDateTimeBehavior='convertToNull' + // Tomcat JDBC Pool's StatementCache is used instead, so disable mysql driver's cache + cachePrepStmts=false + cacheCallableStmts=false + // Tomcat JDBC Pool's StatementFinalizer keeps track + dontTrackOpenResources=true + // performance optimization: reduce number of SQLExceptions thrown in mysql driver code + holdResultsOpenOverStatementClose=true + // enable MySQL query cache - using server prep stmts will disable query caching + useServerPrepStmts=false + // metadata caching + cacheServerConfiguration=true + cacheResultSetMetadata=true + metadataCacheSize=100 + // timeouts for TCP/IP + connectTimeout=15000 + socketTimeout=120000 + // timer tuning (disable) + maintainTimeStats=false + enableQueryTimeouts=false + // misc tuning + noDatetimeStringSync=true + } + */ + } + } + } +} diff --git a/bbb-lti/grails-app/conf/UrlMappings.groovy b/bbb-lti/grails-app/conf/UrlMappings.groovy index b83f5cc8fb..1eb88de377 100644 --- a/bbb-lti/grails-app/conf/UrlMappings.groovy +++ b/bbb-lti/grails-app/conf/UrlMappings.groovy @@ -17,13 +17,15 @@ */ class UrlMappings { - static mappings = { - "/$controller/$action?/$id?"{ - constraints { - // apply constraints here - } - } - "/"(view:"/index") - "500"(view:'/error') + + static mappings = { + "/$controller/$action?/$id"{ + constraints { + // apply constraints here + } + } + + "/"(view:"/index") + "500"(view:'/error') } } diff --git a/bbb-lti/grails-app/conf/lti.properties b/bbb-lti/grails-app/conf/lti.properties index 4e8c2ddc28..1580d2f149 100644 --- a/bbb-lti/grails-app/conf/lti.properties +++ b/bbb-lti/grails-app/conf/lti.properties @@ -31,7 +31,8 @@ bigbluebuttonSalt=bbb_salt ltiEndPoint=http://localhost/lti/tool # The list of consumers allowed to access this lti service. # Format: {consumerId1:sharedSecret1} -ltiConsumers=bbb:lti_secret +##ltiConsumers=bbb:bbb_salt +ltiConsumers=bbb:welcome # The mode used to interact with BigBlueButton # Format: [|extended] ltiMode=extended diff --git a/bbb-lti/grails-app/conf/spring/resources.groovy b/bbb-lti/grails-app/conf/spring/resources.groovy index a35b046ecb..fa950068bb 100644 --- a/bbb-lti/grails-app/conf/spring/resources.groovy +++ b/bbb-lti/grails-app/conf/spring/resources.groovy @@ -1,21 +1,3 @@ -/* - BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ - - Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). - - This program is free software; you can redistribute it and/or modify it under the - terms of the GNU Lesser General Public License as published by the Free Software - Foundation; either version 3.0 of the License, or (at your option) any later - version. - - BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License along - with BigBlueButton; if not, see . -*/ - +// Place your Spring DSL code here beans = { - -} \ No newline at end of file +} diff --git a/bbb-lti/grails-app/controllers/ToolController.groovy b/bbb-lti/grails-app/controllers/ToolController.groovy index e3ade24275..bf03b7a6a6 100644 --- a/bbb-lti/grails-app/controllers/ToolController.groovy +++ b/bbb-lti/grails-app/controllers/ToolController.groovy @@ -41,19 +41,20 @@ class ToolController { LtiService ltiService BigbluebuttonService bigbluebuttonService - def index = { + def index = { if( ltiService.consumerMap == null) ltiService.initConsumerMap() log.debug CONTROLLER_NAME + "#index" setLocalization(params) params.put(REQUEST_METHOD, request.getMethod().toUpperCase()) - log.debug "params: " + params + ltiService.logParameters(params) if( request.post ){ Map result = new HashMap() ArrayList missingParams = new ArrayList() log.debug "Checking for required parameters" + if (hasAllRequiredParams(params, missingParams)) { def sanitizedParams = sanitizePrametersForBaseString(params) def consumer = ltiService.getConsumer(params.get(Parameter.CONSUMER_ID)) @@ -74,6 +75,7 @@ class ToolController { } } else { + log.debug "The message has NOT a valid signature." result.put("resultMessageKey", "InvalidSignature") result.put("resultMessage", "Invalid signature (" + params.get(Parameter.OAUTH_SIGNATURE) + ").") } @@ -91,12 +93,11 @@ class ToolController { result.put("resultMessageKey", "MissingRequiredParameter") result.put("resultMessage", "Missing parameters [$missingStr]") } - - - if( result != null && result.containsKey("resultMessageKey") ) { + + if( result.containsKey("resultMessageKey") ) { log.debug "Error [resultMessageKey:'" + result.get("resultMessageKey") + "', resultMessage:'" + result.get("resultMessage") + "']" render(view: "error", model: ['resultMessageKey': result.get("resultMessageKey"), 'resultMessage': result.get("resultMessage")]) - + } else { session["params"] = params List recordings = bigbluebuttonService.getRecordings(params) @@ -110,23 +111,23 @@ class ToolController { /// Add duration recording.put("duration", duration ) } - + render(view: "index", model: ['params': params, 'recordingList': recordings, 'ismoderator': bigbluebuttonService.isModerator(params)]) } - + } else { render(text: getCartridgeXML(), contentType: "text/xml", encoding: "UTF-8") - + } } - + def join = { if( ltiService.consumerMap == null) ltiService.initConsumerMap() log.debug CONTROLLER_NAME + "#join" Map result - + def sessionParams = session["params"] - + if( sessionParams != null ) { log.debug "params: " + params log.debug "sessionParams: " + sessionParams @@ -136,7 +137,7 @@ class ToolController { result.put("resultMessageKey", "InvalidSession") result.put("resultMessage", "Invalid session. User can not execute this action.") } - + if( result.containsKey("resultMessageKey")) { log.debug "Error [resultMessageKey:'" + result.get("resultMessageKey") + "', resultMessage:'" + result.get("resultMessage") + "']" render(view: "error", model: ['resultMessageKey': result.get("resultMessageKey"), 'resultMessage': result.get("resultMessage")]) @@ -147,9 +148,9 @@ class ToolController { def publish = { log.debug CONTROLLER_NAME + "#publish" Map result - + def sessionParams = session["params"] - + if( sessionParams == null ) { result = new HashMap() result.put("resultMessageKey", "InvalidSession") @@ -165,7 +166,7 @@ class ToolController { //Execute the publish command result = bigbluebuttonService.doPublishRecordings(params) } - + if( result.containsKey("resultMessageKey")) { log.debug "Error [resultMessageKey:'" + result.get("resultMessageKey") + "', resultMessage:'" + result.get("resultMessage") + "']" render(view: "error", model: ['resultMessageKey': result.get("resultMessageKey"), 'resultMessage': result.get("resultMessage")]) @@ -183,7 +184,7 @@ class ToolController { } render(view: "index", model: ['params': sessionParams, 'recordingList': recordings, 'ismoderator': bigbluebuttonService.isModerator(sessionParams)]) - + } } @@ -191,9 +192,9 @@ class ToolController { def delete = { log.debug CONTROLLER_NAME + "#delete" Map result - + def sessionParams = session["params"] - + if( sessionParams == null ) { result = new HashMap() result.put("resultMessageKey", "InvalidSession") @@ -209,7 +210,7 @@ class ToolController { //Execute the delete command result = bigbluebuttonService.doDeleteRecordings(params) } - + if( result.containsKey("resultMessageKey")) { log.debug "Error [resultMessageKey:'" + result.get("resultMessageKey") + "', resultMessage:'" + result.get("resultMessage") + "']" render(view: "error", model: ['resultMessageKey': result.get("resultMessageKey"), 'resultMessage': result.get("resultMessage")]) @@ -225,14 +226,13 @@ class ToolController { /// Add duration recording.put("duration", duration ) } - + render(view: "index", model: ['params': sessionParams, 'recordingList': recordings, 'ismoderator': bigbluebuttonService.isModerator(sessionParams)]) } - } - + private void setLocalization(params){ - + String locale = params.get(Parameter.LAUNCH_LOCALE) locale = (locale == null || locale.equals("")?"en":locale) log.debug "Locale code =" + locale @@ -251,15 +251,28 @@ class ToolController { Map result = new HashMap() setLocalization(params) - String welcome = message(code: "bigbluebutton.welcome", args: ["\"{0}\"", "\"{1}\""]) + String welcome = message(code: "bigbluebutton.welcome.header", args: ["\"{0}\"", "\"{1}\""]) + "
" log.debug "Localized default welcome message: [" + welcome + "]" // Check for [custom_]welcome parameter being passed from the LTI if (params.get(Parameter.CUSTOM_WELCOME) != null) { - welcome = params.get(Parameter.CUSTOM_WELCOME) + welcome = params.get(Parameter.CUSTOM_WELCOME) + "
" log.debug "Overriding default welcome message with: [" + welcome + "]" } - + + if ( Boolean.parseBoolean(params.get(Parameter.CUSTOM_RECORD)) ) { + welcome += "
" + message(code: "bigbluebutton.welcome.record") + "
" + log.debug "Adding record warning to welcome message, welcome is now: [" + welcome + "]" + } + + if ( Integer.parseInt(params.get(Parameter.CUSTOM_DURATION)) > 0 ) { + welcome += "
" + message(code: "bigbluebutton.welcome.duration", args: [params.get(Parameter.CUSTOM_DURATION)]) + "
" + log.debug "Adding duration warning to welcome message, welcome is now: [" + welcome + "]" + } + + welcome += "
" + message(code: "bigbluebutton.welcome.footer") + "
" + log.debug "Localized default welcome message including footer: [" + welcome + "]" + String destinationURL = bigbluebuttonService.getJoinURL(params, welcome, ltiService.mode) log.debug "redirecting to " + destinationURL @@ -335,13 +348,16 @@ class ToolController { * @return - TRUE if the signatures matches the calculated signature */ private boolean checkValidSignature(String method, String URL, String conSecret, Object postProp, String signature) { - OAuthMessage oam = new OAuthMessage(method, URL, ((Properties)postProp).entrySet()); - HMAC_SHA1 hmac = new HMAC_SHA1(); - hmac.setConsumerSecret(conSecret); + log.debug( "Starting checkValidSignature()" ) + OAuthMessage oam = new OAuthMessage(method, URL, ((Properties)postProp).entrySet()) + log.debug( "OAuthMessage oam = " + oam.toString() ) + HMAC_SHA1 hmac = new HMAC_SHA1() + log.debug( "HMAC_SHA1 hmac = " + hmac.toString() ) + hmac.setConsumerSecret(conSecret) - log.debug("Base Message String = [ " + hmac.getBaseString(oam) + " ]\n"); + log.debug("Base Message String = [ " + hmac.getBaseString(oam) + " ]\n") String calculatedSignature = hmac.getSignature(hmac.getBaseString(oam)) - log.debug("Calculated: " + calculatedSignature + " Received: " + signature); + log.debug("Calculated: " + calculatedSignature + " Received: " + signature) return calculatedSignature.equals(signature) } diff --git a/bbb-lti/grails-app/i18n/messages.properties b/bbb-lti/grails-app/i18n/messages.properties index 61279d9055..1896008378 100644 --- a/bbb-lti/grails-app/i18n/messages.properties +++ b/bbb-lti/grails-app/i18n/messages.properties @@ -16,8 +16,14 @@ # with BigBlueButton; if not, see . # -bigbluebutton.welcome=
Welcome to {0}!

To understand how BigBlueButton works see our tutorial videos.

To join the audio bridge click the headset icon (upper-left hand corner). Please use a headset to avoid causing noise for others. +# The welcome.header can be static, however if you want the name of the activity (meeting) to be injected use {0} as part of the text +# {1} can be used to inject the name of the course +bigbluebutton.welcome.header=Welcome to {0}! +bigbluebutton.welcome.footer=To understand how BigBlueButton works see our tutorial videos.

To join the audio bridge click the headset icon (upper-left hand corner). Please use a headset to avoid causing noise for others. +bigbluebutton.welcome.record=This meeting is being recorded +bigbluebutton.welcome.duration=The maximum duration for this meeting is {0} minutes +tool.view.app=BigBlueButton tool.view.title=BigBlueButton LTI Interface tool.view.join=Join Meeting tool.view.recording=Recording diff --git a/bbb-lti/grails-app/i18n/messages_es.properties b/bbb-lti/grails-app/i18n/messages_es.properties index f59fb33c1d..1ac9c3b5b5 100644 --- a/bbb-lti/grails-app/i18n/messages_es.properties +++ b/bbb-lti/grails-app/i18n/messages_es.properties @@ -16,8 +16,12 @@ # with BigBlueButton; if not, see . # -bigbluebutton.welcome=
Bienvenido a {0}!

Para entender como funciona BigBlueButton consulte estos videos tutoriales.

Para activar el audio haga click en el icono de auricular (equina superior izquierda). Por favor utilice auricular para evitar causar ruido. +bigbluebutton.welcome.header=Bienvenido a {0}! +bigbluebutton.welcome.footer=Para entender como funciona BigBlueButton consulte estos videos tutoriales.

Para activar el audio haga click en el icono de auricular (equina superior izquierda). Por favor utilice auricular para evitar causar ruido. +bigbluebutton.welcome.record=Esta sesión esta siendo grabada +bigbluebutton.welcome.duration=La duración maxima para esta sesión es de {0} minutos +tool.view.app=BigBlueButton tool.view.title=Interface LTI para BigBlueButton tool.view.join=Ingresar a la sesión tool.view.recording=Grabación diff --git a/bbb-lti/grails-app/i18n/messages_fr.properties b/bbb-lti/grails-app/i18n/messages_fr.properties index 2f19c7b05c..1345ed6c4c 100644 --- a/bbb-lti/grails-app/i18n/messages_fr.properties +++ b/bbb-lti/grails-app/i18n/messages_fr.properties @@ -16,8 +16,10 @@ # with BigBlueButton; if not, see . # -bigbluebutton.welcome=
Bienvenue au {0}!

Pour comprendre comment fonctionne BigBlueButton, consultez les didacticiels vidéo.

Pour activer l'audio cliquez sur l'icône du casque à écouteurs (coin supérieur gauche). S'il vous plaît utiliser le casque pour éviter de causer du bruit. +bigbluebutton.welcome.header=
Bienvenue au {0}!
+bigbluebutton.welcome.footer=
Pour comprendre comment fonctionne BigBlueButton, consultez les didacticiels vidéo.

Pour activer l'audio cliquez sur l'icône du casque à écouteurs (coin supérieur gauche). S'il vous plaît utiliser le casque pour éviter de causer du bruit. +tool.view.app=BigBlueButton tool.view.title=LTI Interface pour BigBlueButton tool.view.join=Saisie de la réunion tool.view.recording=Enregistrement diff --git a/bbb-lti/grails-app/services/LtiService.groovy b/bbb-lti/grails-app/services/LtiService.groovy index 243d560967..4072dc9231 100644 --- a/bbb-lti/grails-app/services/LtiService.groovy +++ b/bbb-lti/grails-app/services/LtiService.groovy @@ -27,9 +27,9 @@ class LtiService { boolean transactional = false def endPoint = "http://localhost/lti/tool" - def consumers = "demo:welcome" def mode = "simple" + Map consumerMap def retrieveIconEndpoint() { @@ -88,4 +88,10 @@ class LtiService { private String encodeBase64(byte[] signBytes) { return Base64.encodeBase64URLSafeString(signBytes) } + + def logParameters(Object params) { + log.debug "----------------------------------" + for( param in params ) log.debug "${param.getKey()}=${param.getValue()}" + log.debug "----------------------------------" + } } diff --git a/bbb-lti/grails-app/views/error.gsp b/bbb-lti/grails-app/views/error.gsp index a912ff65d4..d85f57ba2b 100644 --- a/bbb-lti/grails-app/views/error.gsp +++ b/bbb-lti/grails-app/views/error.gsp @@ -1,54 +1,18 @@ + - - Runtime Exception - - - - -

Runtime Exception

-

Error Details

- -
- Error ${request.'javax.servlet.error.status_code'}: ${request.'javax.servlet.error.message'.encodeAsHTML()}
- Servlet: ${request.'javax.servlet.error.servlet_name'}
- URI: ${request.'javax.servlet.error.request_uri'}
- - Exception Message: ${exception.message?.encodeAsHTML()}
- Caused by: ${exception.cause?.message?.encodeAsHTML()}
- Class: ${exception.className}
- At Line: [${exception.lineNumber}]
- Code Snippet:
-
- - ${cs?.encodeAsHTML()}
- -
+ + <g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else> + + + + + + -
- -

Stack Trace

-
- 
${it.encodeAsHTML()}
-
- - - \ No newline at end of file + +
    +
  • An error has occurred
    • +
+ + + diff --git a/bbb-lti/grails-app/views/index.gsp b/bbb-lti/grails-app/views/index.gsp index cf7bc3ae18..ee53f42808 100644 --- a/bbb-lti/grails-app/views/index.gsp +++ b/bbb-lti/grails-app/views/index.gsp @@ -1 +1,123 @@ -<%response.sendRedirect(request.getContextPath()+"/tool");%> \ No newline at end of file + + + + + Welcome to Grails + + + + + + +
+

Welcome to Grails

+

Congratulations, you have successfully started your first Grails application! At the moment + this is the default page, feel free to modify it to either redirect to a controller or display whatever + content you may choose. Below is a list of controllers that are currently deployed in this application, + click on each to execute its default action:

+ + +
+ + diff --git a/bbb-lti/grails-app/views/layouts/internal.gsp b/bbb-lti/grails-app/views/layouts/internal.gsp deleted file mode 100644 index 8c70b3621b..0000000000 --- a/bbb-lti/grails-app/views/layouts/internal.gsp +++ /dev/null @@ -1,12 +0,0 @@ - - - <g:layoutTitle default="<g:message code="tool.view.title" />" /> - - - - - - - - - \ No newline at end of file diff --git a/bbb-lti/grails-app/views/layouts/main.gsp b/bbb-lti/grails-app/views/layouts/main.gsp index 0f4e7d6fc3..f79e49285e 100644 --- a/bbb-lti/grails-app/views/layouts/main.gsp +++ b/bbb-lti/grails-app/views/layouts/main.gsp @@ -1,16 +1,32 @@ - - - <g:layoutTitle default="<g:message code="tool.view.title" />" /> - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + <g:message code="tool.view.title" /> + + + + + + + + + + + + + + + + + + + + diff --git a/bbb-lti/grails-app/views/tool/error.gsp b/bbb-lti/grails-app/views/tool/error.gsp index 9ae14674d4..e599c94a97 100644 --- a/bbb-lti/grails-app/views/tool/error.gsp +++ b/bbb-lti/grails-app/views/tool/error.gsp @@ -7,6 +7,7 @@
+ ${resultMessage} @@ -14,12 +15,12 @@ Connection could not be established.
-

diff --git a/bbb-lti/grails-app/views/tool/index.gsp b/bbb-lti/grails-app/views/tool/index.gsp index a8892c96d1..08529c6af2 100644 --- a/bbb-lti/grails-app/views/tool/index.gsp +++ b/bbb-lti/grails-app/views/tool/index.gsp @@ -5,8 +5,10 @@ -

" class="btn btn-primary btn-large" href="${createLink(controller:'tool',action:'join')}">

+ +

" class="btn btn-primary btn-large" href="${createLink(controller:'tool', action:'join', id: '0')}">



+
@@ -16,7 +18,7 @@ - + @@ -34,14 +36,14 @@ - @@ -49,6 +51,6 @@
${new Date( Long.valueOf(r.startTime).longValue() )} ${r.duration} + - " class="action-icon" href="${createLink(controller:'tool',action:'publish')}?bbb_recording_published=${r.published}&bbb_recording_id=${r.recordID}">" alt="" class="smallicon" src="${resource(dir:'images',file:'hide.gif')}" /> + - " class="action-icon" href="${createLink(controller:'tool',action:'publish')}?bbb_recording_published=${r.published}&bbb_recording_id=${r.recordID}">" alt="" class="smallicon" src="${resource(dir:'images',file:'show.gif')}" /> + - " class="action-icon" onClick="if(confirm('')) window.location='${createLink(controller:'tool',action:'delete')}?bbb_recording_id=${r.recordID}'; return false;" href="#">" alt="" class="smallicon" src="${resource(dir:'images',file:'delete.gif')}" /> +
- +
\ No newline at end of file diff --git a/bbb-lti/src/java/org/bigbluebutton/api/Proxy.java b/bbb-lti/src/java/org/bigbluebutton/api/Proxy.java index 5b89418da0..27d222af50 100644 --- a/bbb-lti/src/java/org/bigbluebutton/api/Proxy.java +++ b/bbb-lti/src/java/org/bigbluebutton/api/Proxy.java @@ -59,7 +59,11 @@ public class Proxy { } public void setUrl(String url){ - this.url = url; + if( url.substring(url.length()-1).equals("/") ) + this.url = url.substring(0, url.length()-1); + else + this.url = url; + //this.url = url; } public void setSalt(String salt){ diff --git a/bbb-lti/web-app/WEB-INF/applicationContext.xml b/bbb-lti/web-app/WEB-INF/applicationContext.xml index 038251b2c2..a48dec085c 100644 --- a/bbb-lti/web-app/WEB-INF/applicationContext.xml +++ b/bbb-lti/web-app/WEB-INF/applicationContext.xml @@ -1,47 +1,34 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> Grails application factory bean - - + + A bean that manages Grails plugins - - + + - - - - + + + + + + - - - - - - + - - - + + + utf-8 + + - - - classpath*:**/grails-app/**/*.groovy - - - - - - utf-8 - - + \ No newline at end of file diff --git a/bbb-lti/web-app/WEB-INF/sitemesh.xml b/bbb-lti/web-app/WEB-INF/sitemesh.xml index 95943f1456..72399ceca6 100644 --- a/bbb-lti/web-app/WEB-INF/sitemesh.xml +++ b/bbb-lti/web-app/WEB-INF/sitemesh.xml @@ -1,11 +1,11 @@ + class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" /> + class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" /> + class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" /> diff --git a/bbb-lti/web-app/WEB-INF/tld/c.tld b/bbb-lti/web-app/WEB-INF/tld/c.tld index 22698c97dc..5e18236fef 100644 --- a/bbb-lti/web-app/WEB-INF/tld/c.tld +++ b/bbb-lti/web-app/WEB-INF/tld/c.tld @@ -1,13 +1,13 @@ - - - JSTL 1.1 core library + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" + version="2.1"> + + JSTL 1.2 core library JSTL core - 1.1 + 1.2 c http://java.sun.com/jsp/jstl/core @@ -74,7 +74,7 @@ not the body content should be processed. Name of the exported scoped variable for the resulting value of the test condition. The type -of the scoped variable is Boolean. +of the scoped variable is Boolean. var false @@ -174,6 +174,9 @@ Collection of items to iterate over. false true java.lang.Object + + java.lang.Object + @@ -253,6 +256,9 @@ String of tokens to iterate over. true true java.lang.String + + java.lang.String + @@ -322,7 +328,7 @@ visibility. Like <%= ... >, but for expressions. - + out org.apache.taglibs.standard.tag.rt.core.OutTag JSP @@ -467,6 +473,9 @@ Expression to be evaluated. value false true + + java.lang.Object + diff --git a/bbb-lti/web-app/WEB-INF/tld/fmt.tld b/bbb-lti/web-app/WEB-INF/tld/fmt.tld index 3b9a54a87d..2ae47762da 100644 --- a/bbb-lti/web-app/WEB-INF/tld/fmt.tld +++ b/bbb-lti/web-app/WEB-INF/tld/fmt.tld @@ -1,13 +1,13 @@ - - - JSTL 1.1 i18n-capable formatting library + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" + version="2.1"> + + JSTL 1.2 i18n-capable formatting library JSTL fmt - 1.1 + 1.2 fmt http://java.sun.com/jsp/jstl/fmt @@ -55,7 +55,7 @@ and may contain a two-letter (upper-case) country code (as defined by ISO-3166). Language and country codes must be separated by hyphen (-) or underscore -(_). +(_). value true @@ -496,7 +496,7 @@ Date and/or time to be formatted. Specifies whether the time, the date, or both the time and date components of the given -date are to be formatted. +date are to be formatted. type false diff --git a/bbb-lti/web-app/css/bootstrap.css b/bbb-lti/web-app/css/bootstrap.css index 8ab3cefcf7..7f36651961 100644 --- a/bbb-lti/web-app/css/bootstrap.css +++ b/bbb-lti/web-app/css/bootstrap.css @@ -1,13 +1,18 @@ /*! - * Bootstrap v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Bootstrap v3.1.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ +/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ +html { + font-family: sans-serif; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +body { + margin: 0; +} article, aside, details, @@ -16,40 +21,55 @@ figure, footer, header, hgroup, +main, nav, -section { +section, +summary { display: block; } - audio, canvas, +progress, video { display: inline-block; - *display: inline; - *zoom: 1; + vertical-align: baseline; } - audio:not([controls]) { display: none; + height: 0; } - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; +[hidden], +template { + display: none; } - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; +a { + background: transparent; } - -a:hover, -a:active { +a:active, +a:hover { outline: 0; } - +abbr[title] { + border-bottom: 1px dotted; +} +b, +strong { + font-weight: bold; +} +dfn { + font-style: italic; +} +h1 { + margin: .67em 0; + font-size: 2em; +} +mark { + color: #000; + background: #ff0; +} +small { + font-size: 80%; +} sub, sup { position: relative; @@ -57,86 +77,113 @@ sup { line-height: 0; vertical-align: baseline; } - sup { - top: -0.5em; + top: -.5em; } - sub { - bottom: -0.25em; + bottom: -.25em; } - img { - width: auto\9; - height: auto; - max-width: 100%; - vertical-align: middle; border: 0; - -ms-interpolation-mode: bicubic; } - -#map_canvas img, -.google-maps img { - max-width: none; +svg:not(:root) { + overflow: hidden; +} +figure { + margin: 1em 40px; +} +hr { + height: 0; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +pre { + overflow: auto; +} +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } - button, input, +optgroup, select, textarea { margin: 0; - font-size: 100%; - vertical-align: middle; + font: inherit; + color: inherit; +} +button { + overflow: visible; } - button, -input { - *overflow: visible; - line-height: normal; +select { + text-transform: none; +} +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} +button[disabled], +html input[disabled] { + cursor: default; } - button::-moz-focus-inner, input::-moz-focus-inner { padding: 0; border: 0; } - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; +input { + line-height: normal; } - -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + padding: 0; +} +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; } - input[type="search"] { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; -webkit-appearance: textfield; } - -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - +fieldset { + padding: .35em .625em .75em; + margin: 0 2px; + border: 1px solid #c0c0c0; +} +legend { + padding: 0; + border: 0; +} textarea { overflow: auto; - vertical-align: top; } - +optgroup { + font-weight: bold; +} +table { + border-spacing: 0; + border-collapse: collapse; +} +td, +th { + padding: 0; +} @media print { * { color: #000 !important; @@ -154,7 +201,6 @@ textarea { abbr[title]:after { content: " (" attr(title) ")"; } - .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; @@ -162,6 +208,7 @@ textarea { pre, blockquote { border: 1px solid #999; + page-break-inside: avoid; } thead { @@ -174,9 +221,6 @@ textarea { img { max-width: 100% !important; } - @page { - margin: 0.5cm; - } p, h2, h3 { @@ -187,2686 +231,2782 @@ textarea { h3 { page-break-after: avoid; } + select { + background: #fff !important; + } + .navbar { + display: none; + } + .table td, + .table th { + background-color: #fff !important; + } + .btn > .caret, + .dropup > .btn > .caret { + border-top-color: #000 !important; + } + .label { + border: 1px solid #000; + } + .table { + border-collapse: collapse !important; + } + .table-bordered th, + .table-bordered td { + border: 1px solid #ddd !important; + } } - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; +* { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +html { + font-size: 62.5%; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} body { - margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; - line-height: 20px; - color: #333333; - background-color: #ffffff; + line-height: 1.42857143; + color: #333; + background-color: #fff; +} +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; } - a { - color: #0088cc; + color: #428bca; text-decoration: none; } - -a:hover { - color: #005580; +a:hover, +a:focus { + color: #2a6496; text-decoration: underline; } - -.img-rounded { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; +a:focus { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } - -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +figure { + margin: 0; } - -.img-circle { - -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; +img { + vertical-align: middle; } - -.row { - margin-left: -20px; - *zoom: 1; -} - -.row:before, -.row:after { - display: table; - line-height: 0; - content: ""; -} - -.row:after { - clear: both; -} - -[class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; -} - -.container, -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.span12 { - width: 940px; -} - -.span11 { - width: 860px; -} - -.span10 { - width: 780px; -} - -.span9 { - width: 700px; -} - -.span8 { - width: 620px; -} - -.span7 { - width: 540px; -} - -.span6 { - width: 460px; -} - -.span5 { - width: 380px; -} - -.span4 { - width: 300px; -} - -.span3 { - width: 220px; -} - -.span2 { - width: 140px; -} - -.span1 { - width: 60px; -} - -.offset12 { - margin-left: 980px; -} - -.offset11 { - margin-left: 900px; -} - -.offset10 { - margin-left: 820px; -} - -.offset9 { - margin-left: 740px; -} - -.offset8 { - margin-left: 660px; -} - -.offset7 { - margin-left: 580px; -} - -.offset6 { - margin-left: 500px; -} - -.offset5 { - margin-left: 420px; -} - -.offset4 { - margin-left: 340px; -} - -.offset3 { - margin-left: 260px; -} - -.offset2 { - margin-left: 180px; -} - -.offset1 { - margin-left: 100px; -} - -.row-fluid { - width: 100%; - *zoom: 1; -} - -.row-fluid:before, -.row-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.row-fluid:after { - clear: both; -} - -.row-fluid [class*="span"] { +.img-responsive, +.thumbnail > img, +.thumbnail a > img, +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.127659574468085%; - *margin-left: 2.074468085106383%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + max-width: 100%; + height: auto; } - -.row-fluid [class*="span"]:first-child { - margin-left: 0; +.img-rounded { + border-radius: 6px; } - -.row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.127659574468085%; +.img-thumbnail { + display: inline-block; + max-width: 100%; + height: auto; + padding: 4px; + line-height: 1.42857143; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 4px; + -webkit-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; } - -.row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; +.img-circle { + border-radius: 50%; } - -.row-fluid .span11 { - width: 91.48936170212765%; - *width: 91.43617021276594%; -} - -.row-fluid .span10 { - width: 82.97872340425532%; - *width: 82.92553191489361%; -} - -.row-fluid .span9 { - width: 74.46808510638297%; - *width: 74.41489361702126%; -} - -.row-fluid .span8 { - width: 65.95744680851064%; - *width: 65.90425531914893%; -} - -.row-fluid .span7 { - width: 57.44680851063829%; - *width: 57.39361702127659%; -} - -.row-fluid .span6 { - width: 48.93617021276595%; - *width: 48.88297872340425%; -} - -.row-fluid .span5 { - width: 40.42553191489362%; - *width: 40.37234042553192%; -} - -.row-fluid .span4 { - width: 31.914893617021278%; - *width: 31.861702127659576%; -} - -.row-fluid .span3 { - width: 23.404255319148934%; - *width: 23.351063829787233%; -} - -.row-fluid .span2 { - width: 14.893617021276595%; - *width: 14.840425531914894%; -} - -.row-fluid .span1 { - width: 6.382978723404255%; - *width: 6.329787234042553%; -} - -.row-fluid .offset12 { - margin-left: 104.25531914893617%; - *margin-left: 104.14893617021275%; -} - -.row-fluid .offset12:first-child { - margin-left: 102.12765957446808%; - *margin-left: 102.02127659574467%; -} - -.row-fluid .offset11 { - margin-left: 95.74468085106382%; - *margin-left: 95.6382978723404%; -} - -.row-fluid .offset11:first-child { - margin-left: 93.61702127659574%; - *margin-left: 93.51063829787232%; -} - -.row-fluid .offset10 { - margin-left: 87.23404255319149%; - *margin-left: 87.12765957446807%; -} - -.row-fluid .offset10:first-child { - margin-left: 85.1063829787234%; - *margin-left: 84.99999999999999%; -} - -.row-fluid .offset9 { - margin-left: 78.72340425531914%; - *margin-left: 78.61702127659572%; -} - -.row-fluid .offset9:first-child { - margin-left: 76.59574468085106%; - *margin-left: 76.48936170212764%; -} - -.row-fluid .offset8 { - margin-left: 70.2127659574468%; - *margin-left: 70.10638297872339%; -} - -.row-fluid .offset8:first-child { - margin-left: 68.08510638297872%; - *margin-left: 67.9787234042553%; -} - -.row-fluid .offset7 { - margin-left: 61.70212765957446%; - *margin-left: 61.59574468085106%; -} - -.row-fluid .offset7:first-child { - margin-left: 59.574468085106375%; - *margin-left: 59.46808510638297%; -} - -.row-fluid .offset6 { - margin-left: 53.191489361702125%; - *margin-left: 53.085106382978715%; -} - -.row-fluid .offset6:first-child { - margin-left: 51.063829787234035%; - *margin-left: 50.95744680851063%; -} - -.row-fluid .offset5 { - margin-left: 44.68085106382979%; - *margin-left: 44.57446808510638%; -} - -.row-fluid .offset5:first-child { - margin-left: 42.5531914893617%; - *margin-left: 42.4468085106383%; -} - -.row-fluid .offset4 { - margin-left: 36.170212765957444%; - *margin-left: 36.06382978723405%; -} - -.row-fluid .offset4:first-child { - margin-left: 34.04255319148936%; - *margin-left: 33.93617021276596%; -} - -.row-fluid .offset3 { - margin-left: 27.659574468085104%; - *margin-left: 27.5531914893617%; -} - -.row-fluid .offset3:first-child { - margin-left: 25.53191489361702%; - *margin-left: 25.425531914893618%; -} - -.row-fluid .offset2 { - margin-left: 19.148936170212764%; - *margin-left: 19.04255319148936%; -} - -.row-fluid .offset2:first-child { - margin-left: 17.02127659574468%; - *margin-left: 16.914893617021278%; -} - -.row-fluid .offset1 { - margin-left: 10.638297872340425%; - *margin-left: 10.53191489361702%; -} - -.row-fluid .offset1:first-child { - margin-left: 8.51063829787234%; - *margin-left: 8.404255319148938%; -} - -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} - -.container { - margin-right: auto; - margin-left: auto; - *zoom: 1; -} - -.container:before, -.container:after { - display: table; - line-height: 0; - content: ""; -} - -.container:after { - clear: both; -} - -.container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; -} - -.container-fluid:before, -.container-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.container-fluid:after { - clear: both; -} - -p { - margin: 0 0 10px; -} - -.lead { +hr { + margin-top: 20px; margin-bottom: 20px; - font-size: 21px; - font-weight: 200; - line-height: 30px; + border: 0; + border-top: 1px solid #eee; } - -small { - font-size: 85%; +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; } - -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -cite { - font-style: normal; -} - -.muted { - color: #999999; -} - -a.muted:hover { - color: #808080; -} - -.text-warning { - color: #c09853; -} - -a.text-warning:hover { - color: #a47e3c; -} - -.text-error { - color: #b94a48; -} - -a.text-error:hover { - color: #953b39; -} - -.text-info { - color: #3a87ad; -} - -a.text-info:hover { - color: #2d6987; -} - -.text-success { - color: #468847; -} - -a.text-success:hover { - color: #356635; -} - h1, h2, h3, h4, h5, -h6 { - margin: 10px 0; +h6, +.h1, +.h2, +.h3, +.h4, +.h5, +.h6 { font-family: inherit; - font-weight: bold; - line-height: 20px; + font-weight: 500; + line-height: 1.1; color: inherit; - text-rendering: optimizelegibility; } - h1 small, h2 small, h3 small, h4 small, h5 small, -h6 small { +h6 small, +.h1 small, +.h2 small, +.h3 small, +.h4 small, +.h5 small, +.h6 small, +h1 .small, +h2 .small, +h3 .small, +h4 .small, +h5 .small, +h6 .small, +.h1 .small, +.h2 .small, +.h3 .small, +.h4 .small, +.h5 .small, +.h6 .small { font-weight: normal; line-height: 1; - color: #999999; + color: #999; } - h1, +.h1, h2, -h3 { - line-height: 40px; +.h2, +h3, +.h3 { + margin-top: 20px; + margin-bottom: 10px; } - -h1 { - font-size: 38.5px; +h1 small, +.h1 small, +h2 small, +.h2 small, +h3 small, +.h3 small, +h1 .small, +.h1 .small, +h2 .small, +.h2 .small, +h3 .small, +.h3 .small { + font-size: 65%; } - -h2 { - font-size: 31.5px; +h4, +.h4, +h5, +.h5, +h6, +.h6 { + margin-top: 10px; + margin-bottom: 10px; } - -h3 { - font-size: 24.5px; +h4 small, +.h4 small, +h5 small, +.h5 small, +h6 small, +.h6 small, +h4 .small, +.h4 .small, +h5 .small, +.h5 .small, +h6 .small, +.h6 .small { + font-size: 75%; } - -h4 { - font-size: 17.5px; +h1, +.h1 { + font-size: 36px; } - -h5 { +h2, +.h2 { + font-size: 30px; +} +h3, +.h3 { + font-size: 24px; +} +h4, +.h4 { + font-size: 18px; +} +h5, +.h5 { font-size: 14px; } - -h6 { - font-size: 11.9px; +h6, +.h6 { + font-size: 12px; } - -h1 small { - font-size: 24.5px; +p { + margin: 0 0 10px; } - -h2 small { - font-size: 17.5px; +.lead { + margin-bottom: 20px; + font-size: 16px; + font-weight: 200; + line-height: 1.4; } - -h3 small { - font-size: 14px; +@media (min-width: 768px) { + .lead { + font-size: 21px; + } } - -h4 small { - font-size: 14px; +small, +.small { + font-size: 85%; +} +cite { + font-style: normal; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; +} +.text-justify { + text-align: justify; +} +.text-muted { + color: #999; +} +.text-primary { + color: #428bca; +} +a.text-primary:hover { + color: #3071a9; +} +.text-success { + color: #3c763d; +} +a.text-success:hover { + color: #2b542c; +} +.text-info { + color: #31708f; +} +a.text-info:hover { + color: #245269; +} +.text-warning { + color: #8a6d3b; +} +a.text-warning:hover { + color: #66512c; +} +.text-danger { + color: #a94442; +} +a.text-danger:hover { + color: #843534; +} +.bg-primary { + color: #fff; + background-color: #428bca; +} +a.bg-primary:hover { + background-color: #3071a9; +} +.bg-success { + background-color: #dff0d8; +} +a.bg-success:hover { + background-color: #c1e2b3; +} +.bg-info { + background-color: #d9edf7; +} +a.bg-info:hover { + background-color: #afd9ee; +} +.bg-warning { + background-color: #fcf8e3; +} +a.bg-warning:hover { + background-color: #f7ecb5; +} +.bg-danger { + background-color: #f2dede; +} +a.bg-danger:hover { + background-color: #e4b9b9; } - .page-header { padding-bottom: 9px; - margin: 20px 0 30px; - border-bottom: 1px solid #eeeeee; + margin: 40px 0 20px; + border-bottom: 1px solid #eee; } - ul, ol { - padding: 0; - margin: 0 0 10px 25px; + margin-top: 0; + margin-bottom: 10px; } - ul ul, +ol ul, ul ol, -ol ol, -ol ul { +ol ol { margin-bottom: 0; } - -li { - line-height: 20px; -} - -ul.unstyled, -ol.unstyled { - margin-left: 0; +.list-unstyled { + padding-left: 0; list-style: none; } - -ul.inline, -ol.inline { - margin-left: 0; +.list-inline { + padding-left: 0; + margin-left: -5px; list-style: none; } - -ul.inline > li, -ol.inline > li { +.list-inline > li { display: inline-block; padding-right: 5px; padding-left: 5px; } - dl { + margin-top: 0; margin-bottom: 20px; } - dt, dd { - line-height: 20px; + line-height: 1.42857143; } - dt { font-weight: bold; } - dd { - margin-left: 10px; + margin-left: 0; } - -.dl-horizontal { - *zoom: 1; +@media (min-width: 768px) { + .dl-horizontal dt { + float: left; + width: 160px; + overflow: hidden; + clear: left; + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; + } + .dl-horizontal dd { + margin-left: 180px; + } } - -.dl-horizontal:before, -.dl-horizontal:after { - display: table; - line-height: 0; - content: ""; -} - -.dl-horizontal:after { - clear: both; -} - -.dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 180px; -} - -hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} - abbr[title], abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #999999; + border-bottom: 1px dotted #999; } - -abbr.initialism { +.initialism { font-size: 90%; text-transform: uppercase; } - blockquote { - padding: 0 0 0 15px; + padding: 10px 20px; margin: 0 0 20px; - border-left: 5px solid #eeeeee; + font-size: 17.5px; + border-left: 5px solid #eee; } - -blockquote p { +blockquote p:last-child, +blockquote ul:last-child, +blockquote ol:last-child { margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 25px; } - -blockquote small { +blockquote footer, +blockquote small, +blockquote .small { display: block; - line-height: 20px; - color: #999999; + font-size: 80%; + line-height: 1.42857143; + color: #999; } - -blockquote small:before { +blockquote footer:before, +blockquote small:before, +blockquote .small:before { content: '\2014 \00A0'; } - +.blockquote-reverse, blockquote.pull-right { - float: right; padding-right: 15px; padding-left: 0; - border-right: 5px solid #eeeeee; + text-align: right; + border-right: 5px solid #eee; border-left: 0; } - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -blockquote.pull-right small:before { +.blockquote-reverse footer:before, +blockquote.pull-right footer:before, +.blockquote-reverse small:before, +blockquote.pull-right small:before, +.blockquote-reverse .small:before, +blockquote.pull-right .small:before { content: ''; } - -blockquote.pull-right small:after { +.blockquote-reverse footer:after, +blockquote.pull-right footer:after, +.blockquote-reverse small:after, +blockquote.pull-right small:after, +.blockquote-reverse .small:after, +blockquote.pull-right .small:after { content: '\00A0 \2014'; } - -q:before, -q:after, blockquote:before, blockquote:after { content: ""; } - address { - display: block; margin-bottom: 20px; font-style: normal; - line-height: 20px; + line-height: 1.42857143; } - code, -pre { - padding: 0 3px 2px; - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +kbd, +pre, +samp { + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; } - code { padding: 2px 4px; - color: #d14; + font-size: 90%; + color: #c7254e; white-space: nowrap; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; + background-color: #f9f2f4; + border-radius: 4px; +} +kbd { + padding: 2px 4px; + font-size: 90%; + color: #fff; + background-color: #333; + border-radius: 3px; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); } - pre { display: block; padding: 9.5px; margin: 0 0 10px; font-size: 13px; - line-height: 20px; + line-height: 1.42857143; + color: #333; word-break: break-all; word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; background-color: #f5f5f5; border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; } - -pre.prettyprint { - margin-bottom: 20px; -} - pre code { padding: 0; + font-size: inherit; color: inherit; - white-space: pre; white-space: pre-wrap; background-color: transparent; - border: 0; + border-radius: 0; } - .pre-scrollable { max-height: 340px; overflow-y: scroll; } - -form { - margin: 0 0 20px; +.container { + padding-right: 15px; + padding-left: 15px; + margin-right: auto; + margin-left: auto; +} +@media (min-width: 768px) { + .container { + width: 750px; + } +} +@media (min-width: 992px) { + .container { + width: 970px; + } +} +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} +.container-fluid { + padding-right: 15px; + padding-left: 15px; + margin-right: auto; + margin-left: auto; +} +.row { + margin-right: -15px; + margin-left: -15px; +} +.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { + position: relative; + min-height: 1px; + padding-right: 15px; + padding-left: 15px; +} +.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { + float: left; +} +.col-xs-12 { + width: 100%; +} +.col-xs-11 { + width: 91.66666667%; +} +.col-xs-10 { + width: 83.33333333%; +} +.col-xs-9 { + width: 75%; +} +.col-xs-8 { + width: 66.66666667%; +} +.col-xs-7 { + width: 58.33333333%; +} +.col-xs-6 { + width: 50%; +} +.col-xs-5 { + width: 41.66666667%; +} +.col-xs-4 { + width: 33.33333333%; +} +.col-xs-3 { + width: 25%; +} +.col-xs-2 { + width: 16.66666667%; +} +.col-xs-1 { + width: 8.33333333%; +} +.col-xs-pull-12 { + right: 100%; +} +.col-xs-pull-11 { + right: 91.66666667%; +} +.col-xs-pull-10 { + right: 83.33333333%; +} +.col-xs-pull-9 { + right: 75%; +} +.col-xs-pull-8 { + right: 66.66666667%; +} +.col-xs-pull-7 { + right: 58.33333333%; +} +.col-xs-pull-6 { + right: 50%; +} +.col-xs-pull-5 { + right: 41.66666667%; +} +.col-xs-pull-4 { + right: 33.33333333%; +} +.col-xs-pull-3 { + right: 25%; +} +.col-xs-pull-2 { + right: 16.66666667%; +} +.col-xs-pull-1 { + right: 8.33333333%; +} +.col-xs-pull-0 { + right: 0; +} +.col-xs-push-12 { + left: 100%; +} +.col-xs-push-11 { + left: 91.66666667%; +} +.col-xs-push-10 { + left: 83.33333333%; +} +.col-xs-push-9 { + left: 75%; +} +.col-xs-push-8 { + left: 66.66666667%; +} +.col-xs-push-7 { + left: 58.33333333%; +} +.col-xs-push-6 { + left: 50%; +} +.col-xs-push-5 { + left: 41.66666667%; +} +.col-xs-push-4 { + left: 33.33333333%; +} +.col-xs-push-3 { + left: 25%; +} +.col-xs-push-2 { + left: 16.66666667%; +} +.col-xs-push-1 { + left: 8.33333333%; +} +.col-xs-push-0 { + left: 0; +} +.col-xs-offset-12 { + margin-left: 100%; +} +.col-xs-offset-11 { + margin-left: 91.66666667%; +} +.col-xs-offset-10 { + margin-left: 83.33333333%; +} +.col-xs-offset-9 { + margin-left: 75%; +} +.col-xs-offset-8 { + margin-left: 66.66666667%; +} +.col-xs-offset-7 { + margin-left: 58.33333333%; +} +.col-xs-offset-6 { + margin-left: 50%; +} +.col-xs-offset-5 { + margin-left: 41.66666667%; +} +.col-xs-offset-4 { + margin-left: 33.33333333%; +} +.col-xs-offset-3 { + margin-left: 25%; +} +.col-xs-offset-2 { + margin-left: 16.66666667%; +} +.col-xs-offset-1 { + margin-left: 8.33333333%; +} +.col-xs-offset-0 { + margin-left: 0; +} +@media (min-width: 768px) { + .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + float: left; + } + .col-sm-12 { + width: 100%; + } + .col-sm-11 { + width: 91.66666667%; + } + .col-sm-10 { + width: 83.33333333%; + } + .col-sm-9 { + width: 75%; + } + .col-sm-8 { + width: 66.66666667%; + } + .col-sm-7 { + width: 58.33333333%; + } + .col-sm-6 { + width: 50%; + } + .col-sm-5 { + width: 41.66666667%; + } + .col-sm-4 { + width: 33.33333333%; + } + .col-sm-3 { + width: 25%; + } + .col-sm-2 { + width: 16.66666667%; + } + .col-sm-1 { + width: 8.33333333%; + } + .col-sm-pull-12 { + right: 100%; + } + .col-sm-pull-11 { + right: 91.66666667%; + } + .col-sm-pull-10 { + right: 83.33333333%; + } + .col-sm-pull-9 { + right: 75%; + } + .col-sm-pull-8 { + right: 66.66666667%; + } + .col-sm-pull-7 { + right: 58.33333333%; + } + .col-sm-pull-6 { + right: 50%; + } + .col-sm-pull-5 { + right: 41.66666667%; + } + .col-sm-pull-4 { + right: 33.33333333%; + } + .col-sm-pull-3 { + right: 25%; + } + .col-sm-pull-2 { + right: 16.66666667%; + } + .col-sm-pull-1 { + right: 8.33333333%; + } + .col-sm-pull-0 { + right: 0; + } + .col-sm-push-12 { + left: 100%; + } + .col-sm-push-11 { + left: 91.66666667%; + } + .col-sm-push-10 { + left: 83.33333333%; + } + .col-sm-push-9 { + left: 75%; + } + .col-sm-push-8 { + left: 66.66666667%; + } + .col-sm-push-7 { + left: 58.33333333%; + } + .col-sm-push-6 { + left: 50%; + } + .col-sm-push-5 { + left: 41.66666667%; + } + .col-sm-push-4 { + left: 33.33333333%; + } + .col-sm-push-3 { + left: 25%; + } + .col-sm-push-2 { + left: 16.66666667%; + } + .col-sm-push-1 { + left: 8.33333333%; + } + .col-sm-push-0 { + left: 0; + } + .col-sm-offset-12 { + margin-left: 100%; + } + .col-sm-offset-11 { + margin-left: 91.66666667%; + } + .col-sm-offset-10 { + margin-left: 83.33333333%; + } + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-8 { + margin-left: 66.66666667%; + } + .col-sm-offset-7 { + margin-left: 58.33333333%; + } + .col-sm-offset-6 { + margin-left: 50%; + } + .col-sm-offset-5 { + margin-left: 41.66666667%; + } + .col-sm-offset-4 { + margin-left: 33.33333333%; + } + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-2 { + margin-left: 16.66666667%; + } + .col-sm-offset-1 { + margin-left: 8.33333333%; + } + .col-sm-offset-0 { + margin-left: 0; + } +} +@media (min-width: 992px) { + .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { + float: left; + } + .col-md-12 { + width: 100%; + } + .col-md-11 { + width: 91.66666667%; + } + .col-md-10 { + width: 83.33333333%; + } + .col-md-9 { + width: 75%; + } + .col-md-8 { + width: 66.66666667%; + } + .col-md-7 { + width: 58.33333333%; + } + .col-md-6 { + width: 50%; + } + .col-md-5 { + width: 41.66666667%; + } + .col-md-4 { + width: 33.33333333%; + } + .col-md-3 { + width: 25%; + } + .col-md-2 { + width: 16.66666667%; + } + .col-md-1 { + width: 8.33333333%; + } + .col-md-pull-12 { + right: 100%; + } + .col-md-pull-11 { + right: 91.66666667%; + } + .col-md-pull-10 { + right: 83.33333333%; + } + .col-md-pull-9 { + right: 75%; + } + .col-md-pull-8 { + right: 66.66666667%; + } + .col-md-pull-7 { + right: 58.33333333%; + } + .col-md-pull-6 { + right: 50%; + } + .col-md-pull-5 { + right: 41.66666667%; + } + .col-md-pull-4 { + right: 33.33333333%; + } + .col-md-pull-3 { + right: 25%; + } + .col-md-pull-2 { + right: 16.66666667%; + } + .col-md-pull-1 { + right: 8.33333333%; + } + .col-md-pull-0 { + right: 0; + } + .col-md-push-12 { + left: 100%; + } + .col-md-push-11 { + left: 91.66666667%; + } + .col-md-push-10 { + left: 83.33333333%; + } + .col-md-push-9 { + left: 75%; + } + .col-md-push-8 { + left: 66.66666667%; + } + .col-md-push-7 { + left: 58.33333333%; + } + .col-md-push-6 { + left: 50%; + } + .col-md-push-5 { + left: 41.66666667%; + } + .col-md-push-4 { + left: 33.33333333%; + } + .col-md-push-3 { + left: 25%; + } + .col-md-push-2 { + left: 16.66666667%; + } + .col-md-push-1 { + left: 8.33333333%; + } + .col-md-push-0 { + left: 0; + } + .col-md-offset-12 { + margin-left: 100%; + } + .col-md-offset-11 { + margin-left: 91.66666667%; + } + .col-md-offset-10 { + margin-left: 83.33333333%; + } + .col-md-offset-9 { + margin-left: 75%; + } + .col-md-offset-8 { + margin-left: 66.66666667%; + } + .col-md-offset-7 { + margin-left: 58.33333333%; + } + .col-md-offset-6 { + margin-left: 50%; + } + .col-md-offset-5 { + margin-left: 41.66666667%; + } + .col-md-offset-4 { + margin-left: 33.33333333%; + } + .col-md-offset-3 { + margin-left: 25%; + } + .col-md-offset-2 { + margin-left: 16.66666667%; + } + .col-md-offset-1 { + margin-left: 8.33333333%; + } + .col-md-offset-0 { + margin-left: 0; + } +} +@media (min-width: 1200px) { + .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { + float: left; + } + .col-lg-12 { + width: 100%; + } + .col-lg-11 { + width: 91.66666667%; + } + .col-lg-10 { + width: 83.33333333%; + } + .col-lg-9 { + width: 75%; + } + .col-lg-8 { + width: 66.66666667%; + } + .col-lg-7 { + width: 58.33333333%; + } + .col-lg-6 { + width: 50%; + } + .col-lg-5 { + width: 41.66666667%; + } + .col-lg-4 { + width: 33.33333333%; + } + .col-lg-3 { + width: 25%; + } + .col-lg-2 { + width: 16.66666667%; + } + .col-lg-1 { + width: 8.33333333%; + } + .col-lg-pull-12 { + right: 100%; + } + .col-lg-pull-11 { + right: 91.66666667%; + } + .col-lg-pull-10 { + right: 83.33333333%; + } + .col-lg-pull-9 { + right: 75%; + } + .col-lg-pull-8 { + right: 66.66666667%; + } + .col-lg-pull-7 { + right: 58.33333333%; + } + .col-lg-pull-6 { + right: 50%; + } + .col-lg-pull-5 { + right: 41.66666667%; + } + .col-lg-pull-4 { + right: 33.33333333%; + } + .col-lg-pull-3 { + right: 25%; + } + .col-lg-pull-2 { + right: 16.66666667%; + } + .col-lg-pull-1 { + right: 8.33333333%; + } + .col-lg-pull-0 { + right: 0; + } + .col-lg-push-12 { + left: 100%; + } + .col-lg-push-11 { + left: 91.66666667%; + } + .col-lg-push-10 { + left: 83.33333333%; + } + .col-lg-push-9 { + left: 75%; + } + .col-lg-push-8 { + left: 66.66666667%; + } + .col-lg-push-7 { + left: 58.33333333%; + } + .col-lg-push-6 { + left: 50%; + } + .col-lg-push-5 { + left: 41.66666667%; + } + .col-lg-push-4 { + left: 33.33333333%; + } + .col-lg-push-3 { + left: 25%; + } + .col-lg-push-2 { + left: 16.66666667%; + } + .col-lg-push-1 { + left: 8.33333333%; + } + .col-lg-push-0 { + left: 0; + } + .col-lg-offset-12 { + margin-left: 100%; + } + .col-lg-offset-11 { + margin-left: 91.66666667%; + } + .col-lg-offset-10 { + margin-left: 83.33333333%; + } + .col-lg-offset-9 { + margin-left: 75%; + } + .col-lg-offset-8 { + margin-left: 66.66666667%; + } + .col-lg-offset-7 { + margin-left: 58.33333333%; + } + .col-lg-offset-6 { + margin-left: 50%; + } + .col-lg-offset-5 { + margin-left: 41.66666667%; + } + .col-lg-offset-4 { + margin-left: 33.33333333%; + } + .col-lg-offset-3 { + margin-left: 25%; + } + .col-lg-offset-2 { + margin-left: 16.66666667%; + } + .col-lg-offset-1 { + margin-left: 8.33333333%; + } + .col-lg-offset-0 { + margin-left: 0; + } +} +table { + max-width: 100%; + background-color: transparent; +} +th { + text-align: left; +} +.table { + width: 100%; + margin-bottom: 20px; +} +.table > thead > tr > th, +.table > tbody > tr > th, +.table > tfoot > tr > th, +.table > thead > tr > td, +.table > tbody > tr > td, +.table > tfoot > tr > td { + padding: 8px; + line-height: 1.42857143; + vertical-align: top; + border-top: 1px solid #ddd; +} +.table > thead > tr > th { + vertical-align: bottom; + border-bottom: 2px solid #ddd; +} +.table > caption + thead > tr:first-child > th, +.table > colgroup + thead > tr:first-child > th, +.table > thead:first-child > tr:first-child > th, +.table > caption + thead > tr:first-child > td, +.table > colgroup + thead > tr:first-child > td, +.table > thead:first-child > tr:first-child > td { + border-top: 0; +} +.table > tbody + tbody { + border-top: 2px solid #ddd; +} +.table .table { + background-color: #fff; +} +.table-condensed > thead > tr > th, +.table-condensed > tbody > tr > th, +.table-condensed > tfoot > tr > th, +.table-condensed > thead > tr > td, +.table-condensed > tbody > tr > td, +.table-condensed > tfoot > tr > td { + padding: 5px; +} +.table-bordered { + border: 1px solid #ddd; +} +.table-bordered > thead > tr > th, +.table-bordered > tbody > tr > th, +.table-bordered > tfoot > tr > th, +.table-bordered > thead > tr > td, +.table-bordered > tbody > tr > td, +.table-bordered > tfoot > tr > td { + border: 1px solid #ddd; +} +.table-bordered > thead > tr > th, +.table-bordered > thead > tr > td { + border-bottom-width: 2px; +} +.table-striped > tbody > tr:nth-child(odd) > td, +.table-striped > tbody > tr:nth-child(odd) > th { + background-color: #f9f9f9; +} +.table-hover > tbody > tr:hover > td, +.table-hover > tbody > tr:hover > th { + background-color: #f5f5f5; +} +table col[class*="col-"] { + position: static; + display: table-column; + float: none; +} +table td[class*="col-"], +table th[class*="col-"] { + position: static; + display: table-cell; + float: none; +} +.table > thead > tr > td.active, +.table > tbody > tr > td.active, +.table > tfoot > tr > td.active, +.table > thead > tr > th.active, +.table > tbody > tr > th.active, +.table > tfoot > tr > th.active, +.table > thead > tr.active > td, +.table > tbody > tr.active > td, +.table > tfoot > tr.active > td, +.table > thead > tr.active > th, +.table > tbody > tr.active > th, +.table > tfoot > tr.active > th { + background-color: #f5f5f5; +} +.table-hover > tbody > tr > td.active:hover, +.table-hover > tbody > tr > th.active:hover, +.table-hover > tbody > tr.active:hover > td, +.table-hover > tbody > tr.active:hover > th { + background-color: #e8e8e8; +} +.table > thead > tr > td.success, +.table > tbody > tr > td.success, +.table > tfoot > tr > td.success, +.table > thead > tr > th.success, +.table > tbody > tr > th.success, +.table > tfoot > tr > th.success, +.table > thead > tr.success > td, +.table > tbody > tr.success > td, +.table > tfoot > tr.success > td, +.table > thead > tr.success > th, +.table > tbody > tr.success > th, +.table > tfoot > tr.success > th { + background-color: #dff0d8; +} +.table-hover > tbody > tr > td.success:hover, +.table-hover > tbody > tr > th.success:hover, +.table-hover > tbody > tr.success:hover > td, +.table-hover > tbody > tr.success:hover > th { + background-color: #d0e9c6; +} +.table > thead > tr > td.info, +.table > tbody > tr > td.info, +.table > tfoot > tr > td.info, +.table > thead > tr > th.info, +.table > tbody > tr > th.info, +.table > tfoot > tr > th.info, +.table > thead > tr.info > td, +.table > tbody > tr.info > td, +.table > tfoot > tr.info > td, +.table > thead > tr.info > th, +.table > tbody > tr.info > th, +.table > tfoot > tr.info > th { + background-color: #d9edf7; +} +.table-hover > tbody > tr > td.info:hover, +.table-hover > tbody > tr > th.info:hover, +.table-hover > tbody > tr.info:hover > td, +.table-hover > tbody > tr.info:hover > th { + background-color: #c4e3f3; +} +.table > thead > tr > td.warning, +.table > tbody > tr > td.warning, +.table > tfoot > tr > td.warning, +.table > thead > tr > th.warning, +.table > tbody > tr > th.warning, +.table > tfoot > tr > th.warning, +.table > thead > tr.warning > td, +.table > tbody > tr.warning > td, +.table > tfoot > tr.warning > td, +.table > thead > tr.warning > th, +.table > tbody > tr.warning > th, +.table > tfoot > tr.warning > th { + background-color: #fcf8e3; +} +.table-hover > tbody > tr > td.warning:hover, +.table-hover > tbody > tr > th.warning:hover, +.table-hover > tbody > tr.warning:hover > td, +.table-hover > tbody > tr.warning:hover > th { + background-color: #faf2cc; +} +.table > thead > tr > td.danger, +.table > tbody > tr > td.danger, +.table > tfoot > tr > td.danger, +.table > thead > tr > th.danger, +.table > tbody > tr > th.danger, +.table > tfoot > tr > th.danger, +.table > thead > tr.danger > td, +.table > tbody > tr.danger > td, +.table > tfoot > tr.danger > td, +.table > thead > tr.danger > th, +.table > tbody > tr.danger > th, +.table > tfoot > tr.danger > th { + background-color: #f2dede; +} +.table-hover > tbody > tr > td.danger:hover, +.table-hover > tbody > tr > th.danger:hover, +.table-hover > tbody > tr.danger:hover > td, +.table-hover > tbody > tr.danger:hover > th { + background-color: #ebcccc; +} +@media (max-width: 767px) { + .table-responsive { + width: 100%; + margin-bottom: 15px; + overflow-x: scroll; + overflow-y: hidden; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: -ms-autohiding-scrollbar; + border: 1px solid #ddd; + } + .table-responsive > .table { + margin-bottom: 0; + } + .table-responsive > .table > thead > tr > th, + .table-responsive > .table > tbody > tr > th, + .table-responsive > .table > tfoot > tr > th, + .table-responsive > .table > thead > tr > td, + .table-responsive > .table > tbody > tr > td, + .table-responsive > .table > tfoot > tr > td { + white-space: nowrap; + } + .table-responsive > .table-bordered { + border: 0; + } + .table-responsive > .table-bordered > thead > tr > th:first-child, + .table-responsive > .table-bordered > tbody > tr > th:first-child, + .table-responsive > .table-bordered > tfoot > tr > th:first-child, + .table-responsive > .table-bordered > thead > tr > td:first-child, + .table-responsive > .table-bordered > tbody > tr > td:first-child, + .table-responsive > .table-bordered > tfoot > tr > td:first-child { + border-left: 0; + } + .table-responsive > .table-bordered > thead > tr > th:last-child, + .table-responsive > .table-bordered > tbody > tr > th:last-child, + .table-responsive > .table-bordered > tfoot > tr > th:last-child, + .table-responsive > .table-bordered > thead > tr > td:last-child, + .table-responsive > .table-bordered > tbody > tr > td:last-child, + .table-responsive > .table-bordered > tfoot > tr > td:last-child { + border-right: 0; + } + .table-responsive > .table-bordered > tbody > tr:last-child > th, + .table-responsive > .table-bordered > tfoot > tr:last-child > th, + .table-responsive > .table-bordered > tbody > tr:last-child > td, + .table-responsive > .table-bordered > tfoot > tr:last-child > td { + border-bottom: 0; + } } - fieldset { + min-width: 0; padding: 0; margin: 0; border: 0; } - legend { display: block; width: 100%; padding: 0; margin-bottom: 20px; font-size: 21px; - line-height: 40px; - color: #333333; + line-height: inherit; + color: #333; border: 0; border-bottom: 1px solid #e5e5e5; } - -legend small { - font-size: 15px; - color: #999999; -} - -label, -input, -button, -select, -textarea { - font-size: 14px; - font-weight: normal; - line-height: 20px; -} - -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - label { - display: block; - margin-bottom: 5px; -} - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { display: inline-block; - height: 20px; - padding: 4px 6px; - margin-bottom: 10px; - font-size: 14px; - line-height: 20px; - color: #555555; - vertical-align: middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + margin-bottom: 5px; + font-weight: bold; } - -input, -textarea, -.uneditable-input { - width: 206px; +input[type="search"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - -textarea { - height: auto; -} - -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} - -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus, -.uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -} - input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; margin-top: 1px \9; - *margin-top: 0; + /* IE8-9 */ line-height: normal; } - -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; -} - -select, input[type="file"] { - height: 30px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 30px; + display: block; } - -select { - width: 220px; - background-color: #ffffff; - border: 1px solid #cccccc; +input[type="range"] { + display: block; + width: 100%; } - select[multiple], select[size] { height: auto; } - -select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } - -.uneditable-input, -.uneditable-textarea { - color: #999999; +output { + display: block; + padding-top: 7px; + font-size: 14px; + line-height: 1.42857143; + color: #555; +} +.form-control { + display: block; + width: 100%; + height: 34px; + padding: 6px 12px; + font-size: 14px; + line-height: 1.42857143; + color: #555; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; +} +.form-control:focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); +} +.form-control::-moz-placeholder { + color: #999; + opacity: 1; +} +.form-control:-ms-input-placeholder { + color: #999; +} +.form-control::-webkit-input-placeholder { + color: #999; +} +.form-control[disabled], +.form-control[readonly], +fieldset[disabled] .form-control { cursor: not-allowed; - background-color: #fcfcfc; - border-color: #cccccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + background-color: #eee; + opacity: 1; } - -.uneditable-input { - overflow: hidden; - white-space: nowrap; -} - -.uneditable-textarea { - width: auto; +textarea.form-control { height: auto; } - -input:-moz-placeholder, -textarea:-moz-placeholder { - color: #999999; +input[type="search"] { + -webkit-appearance: none; } - -input:-ms-input-placeholder, -textarea:-ms-input-placeholder { - color: #999999; +input[type="date"] { + line-height: 34px; } - -input::-webkit-input-placeholder, -textarea::-webkit-input-placeholder { - color: #999999; +.form-group { + margin-bottom: 15px; } - .radio, .checkbox { + display: block; min-height: 20px; padding-left: 20px; + margin-top: 10px; + margin-bottom: 10px; +} +.radio label, +.checkbox label { + display: inline; + font-weight: normal; + cursor: pointer; } - .radio input[type="radio"], -.checkbox input[type="checkbox"] { +.radio-inline input[type="radio"], +.checkbox input[type="checkbox"], +.checkbox-inline input[type="checkbox"] { float: left; margin-left: -20px; } - -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; +.radio + .radio, +.checkbox + .checkbox { + margin-top: -5px; } - -.radio.inline, -.checkbox.inline { +.radio-inline, +.checkbox-inline { display: inline-block; - padding-top: 5px; + padding-left: 20px; margin-bottom: 0; + font-weight: normal; vertical-align: middle; + cursor: pointer; } - -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { +.radio-inline + .radio-inline, +.checkbox-inline + .checkbox-inline { + margin-top: 0; margin-left: 10px; } - -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; -} - -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} - -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - -input, -textarea, -.uneditable-input { - margin-left: 0; -} - -.controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; -} - -input.span12, -textarea.span12, -.uneditable-input.span12 { - width: 926px; -} - -input.span11, -textarea.span11, -.uneditable-input.span11 { - width: 846px; -} - -input.span10, -textarea.span10, -.uneditable-input.span10 { - width: 766px; -} - -input.span9, -textarea.span9, -.uneditable-input.span9 { - width: 686px; -} - -input.span8, -textarea.span8, -.uneditable-input.span8 { - width: 606px; -} - -input.span7, -textarea.span7, -.uneditable-input.span7 { - width: 526px; -} - -input.span6, -textarea.span6, -.uneditable-input.span6 { - width: 446px; -} - -input.span5, -textarea.span5, -.uneditable-input.span5 { - width: 366px; -} - -input.span4, -textarea.span4, -.uneditable-input.span4 { - width: 286px; -} - -input.span3, -textarea.span3, -.uneditable-input.span3 { - width: 206px; -} - -input.span2, -textarea.span2, -.uneditable-input.span2 { - width: 126px; -} - -input.span1, -textarea.span1, -.uneditable-input.span1 { - width: 46px; -} - -.controls-row { - *zoom: 1; -} - -.controls-row:before, -.controls-row:after { - display: table; - line-height: 0; - content: ""; -} - -.controls-row:after { - clear: both; -} - -.controls-row [class*="span"], -.row-fluid .controls-row [class*="span"] { - float: left; -} - -.controls-row .checkbox[class*="span"], -.controls-row .radio[class*="span"] { - padding-top: 5px; -} - -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; -} - input[type="radio"][disabled], input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; +.radio[disabled], +.radio-inline[disabled], +.checkbox[disabled], +.checkbox-inline[disabled], +fieldset[disabled] input[type="radio"], +fieldset[disabled] input[type="checkbox"], +fieldset[disabled] .radio, +fieldset[disabled] .radio-inline, +fieldset[disabled] .checkbox, +fieldset[disabled] .checkbox-inline { + cursor: not-allowed; } - -.control-group.warning .control-label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; +.input-sm { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } - -.control-group.warning .checkbox, -.control-group.warning .radio, -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; +select.input-sm { + height: 30px; + line-height: 30px; } - -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - border-color: #c09853; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +textarea.input-sm, +select[multiple].input-sm { + height: auto; } - -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; +.input-lg { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; } - -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; +select.input-lg { + height: 46px; + line-height: 46px; } - -.control-group.error .control-label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; +textarea.input-lg, +select[multiple].input-lg { + height: auto; } - -.control-group.error .checkbox, -.control-group.error .radio, -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; +.has-feedback { + position: relative; } - -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +.has-feedback .form-control { + padding-right: 42.5px; } - -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; +.has-feedback .form-control-feedback { + position: absolute; + top: 25px; + right: 0; + display: block; + width: 34px; + height: 34px; + line-height: 34px; + text-align: center; } - -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; +.has-success .help-block, +.has-success .control-label, +.has-success .radio, +.has-success .checkbox, +.has-success .radio-inline, +.has-success .checkbox-inline { + color: #3c763d; } - -.control-group.success .control-label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; +.has-success .form-control { + border-color: #3c763d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); } - -.control-group.success .checkbox, -.control-group.success .radio, -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; +.has-success .form-control:focus { + border-color: #2b542c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168; } - -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -} - -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; +.has-success .input-group-addon { + color: #3c763d; background-color: #dff0d8; - border-color: #468847; + border-color: #3c763d; } - -.control-group.info .control-label, -.control-group.info .help-block, -.control-group.info .help-inline { - color: #3a87ad; +.has-success .form-control-feedback { + color: #3c763d; } - -.control-group.info .checkbox, -.control-group.info .radio, -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - color: #3a87ad; +.has-warning .help-block, +.has-warning .control-label, +.has-warning .radio, +.has-warning .checkbox, +.has-warning .radio-inline, +.has-warning .checkbox-inline { + color: #8a6d3b; } - -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - border-color: #3a87ad; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +.has-warning .form-control { + border-color: #8a6d3b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); } - -.control-group.info input:focus, -.control-group.info select:focus, -.control-group.info textarea:focus { - border-color: #2d6987; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; +.has-warning .form-control:focus { + border-color: #66512c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b; } - -.control-group.info .input-prepend .add-on, -.control-group.info .input-append .add-on { - color: #3a87ad; - background-color: #d9edf7; - border-color: #3a87ad; +.has-warning .input-group-addon { + color: #8a6d3b; + background-color: #fcf8e3; + border-color: #8a6d3b; } - -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; +.has-warning .form-control-feedback { + color: #8a6d3b; } - -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; +.has-error .help-block, +.has-error .control-label, +.has-error .radio, +.has-error .checkbox, +.has-error .radio-inline, +.has-error .checkbox-inline { + color: #a94442; } - -.form-actions { - padding: 19px 20px 20px; - margin-top: 20px; - margin-bottom: 20px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; - *zoom: 1; +.has-error .form-control { + border-color: #a94442; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); } - -.form-actions:before, -.form-actions:after { - display: table; - line-height: 0; - content: ""; +.has-error .form-control:focus { + border-color: #843534; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483; } - -.form-actions:after { - clear: both; +.has-error .input-group-addon { + color: #a94442; + background-color: #f2dede; + border-color: #a94442; } - -.help-block, -.help-inline { - color: #595959; +.has-error .form-control-feedback { + color: #a94442; +} +.form-control-static { + margin-bottom: 0; } - .help-block { display: block; + margin-top: 5px; margin-bottom: 10px; + color: #737373; } - -.help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; +@media (min-width: 768px) { + .form-inline .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .form-inline .form-control { + display: inline-block; + width: auto; + vertical-align: middle; + } + .form-inline .input-group > .form-control { + width: 100%; + } + .form-inline .control-label { + margin-bottom: 0; + vertical-align: middle; + } + .form-inline .radio, + .form-inline .checkbox { + display: inline-block; + padding-left: 0; + margin-top: 0; + margin-bottom: 0; + vertical-align: middle; + } + .form-inline .radio input[type="radio"], + .form-inline .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } + .form-inline .has-feedback .form-control-feedback { + top: 0; + } } - -.input-append, -.input-prepend { - margin-bottom: 5px; - font-size: 0; - white-space: nowrap; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input, -.input-append .dropdown-menu, -.input-prepend .dropdown-menu { - font-size: 14px; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input { - position: relative; +.form-horizontal .control-label, +.form-horizontal .radio, +.form-horizontal .checkbox, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { + padding-top: 7px; + margin-top: 0; margin-bottom: 0; - *margin-left: 0; - vertical-align: top; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; } - -.input-append input:focus, -.input-prepend input:focus, -.input-append select:focus, -.input-prepend select:focus, -.input-append .uneditable-input:focus, -.input-prepend .uneditable-input:focus { - z-index: 2; +.form-horizontal .radio, +.form-horizontal .checkbox { + min-height: 27px; } - -.input-append .add-on, -.input-prepend .add-on { +.form-horizontal .form-group { + margin-right: -15px; + margin-left: -15px; +} +.form-horizontal .form-control-static { + padding-top: 7px; +} +@media (min-width: 768px) { + .form-horizontal .control-label { + text-align: right; + } +} +.form-horizontal .has-feedback .form-control-feedback { + top: 0; + right: 15px; +} +.btn { display: inline-block; - width: auto; - height: 20px; - min-width: 16px; - padding: 4px 5px; + padding: 6px 12px; + margin-bottom: 0; font-size: 14px; font-weight: normal; - line-height: 20px; + line-height: 1.42857143; text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #eeeeee; - border: 1px solid #ccc; -} - -.input-append .add-on, -.input-prepend .add-on, -.input-append .btn, -.input-prepend .btn, -.input-append .btn-group > .dropdown-toggle, -.input-prepend .btn-group > .dropdown-toggle { - vertical-align: top; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-append .active, -.input-prepend .active { - background-color: #a9dba9; - border-color: #46a546; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input + .btn-group .btn:last-child, -.input-append select + .btn-group .btn:last-child, -.input-append .uneditable-input + .btn-group .btn:last-child { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append .add-on, -.input-append .btn, -.input-append .btn-group { - margin-left: -1px; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child, -.input-append .btn-group:last-child > .dropdown-toggle { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend.input-append input + .btn-group .btn, -.input-prepend.input-append select + .btn-group .btn, -.input-prepend.input-append .uneditable-input + .btn-group .btn { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .btn-group:first-child { - margin-left: 0; -} - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ - - margin-bottom: 0; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -/* Allow for input prepend/append in search forms */ - -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.form-search .input-append .search-query { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search .input-append .btn { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .search-query { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .btn { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; + white-space: nowrap; vertical-align: middle; - *zoom: 1; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + background-image: none; + border: 1px solid transparent; + border-radius: 4px; } - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { +.btn:focus, +.btn:active:focus, +.btn.active:focus { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.btn:hover, +.btn:focus { + color: #333; + text-decoration: none; +} +.btn:active, +.btn.active { + background-image: none; + outline: 0; + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); +} +.btn.disabled, +.btn[disabled], +fieldset[disabled] .btn { + pointer-events: none; + cursor: not-allowed; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + box-shadow: none; + opacity: .65; +} +.btn-default { + color: #333; + background-color: #fff; + border-color: #ccc; +} +.btn-default:hover, +.btn-default:focus, +.btn-default:active, +.btn-default.active, +.open .dropdown-toggle.btn-default { + color: #333; + background-color: #ebebeb; + border-color: #adadad; +} +.btn-default:active, +.btn-default.active, +.open .dropdown-toggle.btn-default { + background-image: none; +} +.btn-default.disabled, +.btn-default[disabled], +fieldset[disabled] .btn-default, +.btn-default.disabled:hover, +.btn-default[disabled]:hover, +fieldset[disabled] .btn-default:hover, +.btn-default.disabled:focus, +.btn-default[disabled]:focus, +fieldset[disabled] .btn-default:focus, +.btn-default.disabled:active, +.btn-default[disabled]:active, +fieldset[disabled] .btn-default:active, +.btn-default.disabled.active, +.btn-default[disabled].active, +fieldset[disabled] .btn-default.active { + background-color: #fff; + border-color: #ccc; +} +.btn-default .badge { + color: #fff; + background-color: #333; +} +.btn-primary { + color: #fff; + background-color: #428bca; + border-color: #357ebd; +} +.btn-primary:hover, +.btn-primary:focus, +.btn-primary:active, +.btn-primary.active, +.open .dropdown-toggle.btn-primary { + color: #fff; + background-color: #3276b1; + border-color: #285e8e; +} +.btn-primary:active, +.btn-primary.active, +.open .dropdown-toggle.btn-primary { + background-image: none; +} +.btn-primary.disabled, +.btn-primary[disabled], +fieldset[disabled] .btn-primary, +.btn-primary.disabled:hover, +.btn-primary[disabled]:hover, +fieldset[disabled] .btn-primary:hover, +.btn-primary.disabled:focus, +.btn-primary[disabled]:focus, +fieldset[disabled] .btn-primary:focus, +.btn-primary.disabled:active, +.btn-primary[disabled]:active, +fieldset[disabled] .btn-primary:active, +.btn-primary.disabled.active, +.btn-primary[disabled].active, +fieldset[disabled] .btn-primary.active { + background-color: #428bca; + border-color: #357ebd; +} +.btn-primary .badge { + color: #428bca; + background-color: #fff; +} +.btn-success { + color: #fff; + background-color: #5cb85c; + border-color: #4cae4c; +} +.btn-success:hover, +.btn-success:focus, +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + color: #fff; + background-color: #47a447; + border-color: #398439; +} +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + background-image: none; +} +.btn-success.disabled, +.btn-success[disabled], +fieldset[disabled] .btn-success, +.btn-success.disabled:hover, +.btn-success[disabled]:hover, +fieldset[disabled] .btn-success:hover, +.btn-success.disabled:focus, +.btn-success[disabled]:focus, +fieldset[disabled] .btn-success:focus, +.btn-success.disabled:active, +.btn-success[disabled]:active, +fieldset[disabled] .btn-success:active, +.btn-success.disabled.active, +.btn-success[disabled].active, +fieldset[disabled] .btn-success.active { + background-color: #5cb85c; + border-color: #4cae4c; +} +.btn-success .badge { + color: #5cb85c; + background-color: #fff; +} +.btn-info { + color: #fff; + background-color: #5bc0de; + border-color: #46b8da; +} +.btn-info:hover, +.btn-info:focus, +.btn-info:active, +.btn-info.active, +.open .dropdown-toggle.btn-info { + color: #fff; + background-color: #39b3d7; + border-color: #269abc; +} +.btn-info:active, +.btn-info.active, +.open .dropdown-toggle.btn-info { + background-image: none; +} +.btn-info.disabled, +.btn-info[disabled], +fieldset[disabled] .btn-info, +.btn-info.disabled:hover, +.btn-info[disabled]:hover, +fieldset[disabled] .btn-info:hover, +.btn-info.disabled:focus, +.btn-info[disabled]:focus, +fieldset[disabled] .btn-info:focus, +.btn-info.disabled:active, +.btn-info[disabled]:active, +fieldset[disabled] .btn-info:active, +.btn-info.disabled.active, +.btn-info[disabled].active, +fieldset[disabled] .btn-info.active { + background-color: #5bc0de; + border-color: #46b8da; +} +.btn-info .badge { + color: #5bc0de; + background-color: #fff; +} +.btn-warning { + color: #fff; + background-color: #f0ad4e; + border-color: #eea236; +} +.btn-warning:hover, +.btn-warning:focus, +.btn-warning:active, +.btn-warning.active, +.open .dropdown-toggle.btn-warning { + color: #fff; + background-color: #ed9c28; + border-color: #d58512; +} +.btn-warning:active, +.btn-warning.active, +.open .dropdown-toggle.btn-warning { + background-image: none; +} +.btn-warning.disabled, +.btn-warning[disabled], +fieldset[disabled] .btn-warning, +.btn-warning.disabled:hover, +.btn-warning[disabled]:hover, +fieldset[disabled] .btn-warning:hover, +.btn-warning.disabled:focus, +.btn-warning[disabled]:focus, +fieldset[disabled] .btn-warning:focus, +.btn-warning.disabled:active, +.btn-warning[disabled]:active, +fieldset[disabled] .btn-warning:active, +.btn-warning.disabled.active, +.btn-warning[disabled].active, +fieldset[disabled] .btn-warning.active { + background-color: #f0ad4e; + border-color: #eea236; +} +.btn-warning .badge { + color: #f0ad4e; + background-color: #fff; +} +.btn-danger { + color: #fff; + background-color: #d9534f; + border-color: #d43f3a; +} +.btn-danger:hover, +.btn-danger:focus, +.btn-danger:active, +.btn-danger.active, +.open .dropdown-toggle.btn-danger { + color: #fff; + background-color: #d2322d; + border-color: #ac2925; +} +.btn-danger:active, +.btn-danger.active, +.open .dropdown-toggle.btn-danger { + background-image: none; +} +.btn-danger.disabled, +.btn-danger[disabled], +fieldset[disabled] .btn-danger, +.btn-danger.disabled:hover, +.btn-danger[disabled]:hover, +fieldset[disabled] .btn-danger:hover, +.btn-danger.disabled:focus, +.btn-danger[disabled]:focus, +fieldset[disabled] .btn-danger:focus, +.btn-danger.disabled:active, +.btn-danger[disabled]:active, +fieldset[disabled] .btn-danger:active, +.btn-danger.disabled.active, +.btn-danger[disabled].active, +fieldset[disabled] .btn-danger.active { + background-color: #d9534f; + border-color: #d43f3a; +} +.btn-danger .badge { + color: #d9534f; + background-color: #fff; +} +.btn-link { + font-weight: normal; + color: #428bca; + cursor: pointer; + border-radius: 0; +} +.btn-link, +.btn-link:active, +.btn-link[disabled], +fieldset[disabled] .btn-link { + background-color: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-link, +.btn-link:hover, +.btn-link:focus, +.btn-link:active { + border-color: transparent; +} +.btn-link:hover, +.btn-link:focus { + color: #2a6496; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +fieldset[disabled] .btn-link:hover, +.btn-link[disabled]:focus, +fieldset[disabled] .btn-link:focus { + color: #999; + text-decoration: none; +} +.btn-lg, +.btn-group-lg > .btn { + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +.btn-sm, +.btn-group-sm > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.btn-xs, +.btn-group-xs > .btn { + padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.btn-block { + display: block; + width: 100%; + padding-right: 0; + padding-left: 0; +} +.btn-block + .btn-block { + margin-top: 5px; +} +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; +} +.fade { + opacity: 0; + -webkit-transition: opacity .15s linear; + transition: opacity .15s linear; +} +.fade.in { + opacity: 1; +} +.collapse { display: none; } - -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; +.collapse.in { + display: block; } - -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} - -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 10px; -} - -legend + .control-group { - margin-top: 20px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 20px; - *zoom: 1; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - line-height: 0; - content: ""; -} - -.form-horizontal .control-group:after { - clear: both; -} - -.form-horizontal .control-label { - float: left; - width: 160px; - padding-top: 5px; - text-align: right; -} - -.form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 180px; - *margin-left: 0; -} - -.form-horizontal .controls:first-child { - *padding-left: 180px; -} - -.form-horizontal .help-block { - margin-bottom: 0; -} - -.form-horizontal input + .help-block, -.form-horizontal select + .help-block, -.form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block, -.form-horizontal .input-prepend + .help-block, -.form-horizontal .input-append + .help-block { - margin-top: 10px; -} - -.form-horizontal .form-actions { - padding-left: 180px; -} - -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; -} - -.table { - width: 100%; - margin-bottom: 20px; -} - -.table th, -.table td { - padding: 8px; - line-height: 20px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table th { - font-weight: bold; -} - -.table thead th { - vertical-align: bottom; -} - -.table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table .table { - background-color: #ffffff; -} - -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} - -.table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapse; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} - -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} - -.table-bordered thead:first-child tr:first-child > th:first-child, -.table-bordered tbody:first-child tr:first-child > td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered thead:first-child tr:first-child > th:last-child, -.table-bordered tbody:first-child tr:first-child > td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:first-child, -.table-bordered tbody:last-child tr:last-child > td:first-child, -.table-bordered tfoot:last-child tr:last-child > td:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:last-child, -.table-bordered tbody:last-child tr:last-child > td:last-child, -.table-bordered tfoot:last-child tr:last-child > td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomleft: 0; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -moz-border-radius-bottomright: 0; -} - -.table-bordered caption + thead tr:first-child th:first-child, -.table-bordered caption + tbody tr:first-child td:first-child, -.table-bordered colgroup + thead tr:first-child th:first-child, -.table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered caption + thead tr:first-child th:last-child, -.table-bordered caption + tbody tr:first-child td:last-child, -.table-bordered colgroup + thead tr:first-child th:last-child, -.table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-striped tbody > tr:nth-child(odd) > td, -.table-striped tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; -} - -.table-hover tbody tr:hover td, -.table-hover tbody tr:hover th { - background-color: #f5f5f5; -} - -table td[class*="span"], -table th[class*="span"], -.row-fluid table td[class*="span"], -.row-fluid table th[class*="span"] { - display: table-cell; - float: none; - margin-left: 0; -} - -.table td.span1, -.table th.span1 { - float: none; - width: 44px; - margin-left: 0; -} - -.table td.span2, -.table th.span2 { - float: none; - width: 124px; - margin-left: 0; -} - -.table td.span3, -.table th.span3 { - float: none; - width: 204px; - margin-left: 0; -} - -.table td.span4, -.table th.span4 { - float: none; - width: 284px; - margin-left: 0; -} - -.table td.span5, -.table th.span5 { - float: none; - width: 364px; - margin-left: 0; -} - -.table td.span6, -.table th.span6 { - float: none; - width: 444px; - margin-left: 0; -} - -.table td.span7, -.table th.span7 { - float: none; - width: 524px; - margin-left: 0; -} - -.table td.span8, -.table th.span8 { - float: none; - width: 604px; - margin-left: 0; -} - -.table td.span9, -.table th.span9 { - float: none; - width: 684px; - margin-left: 0; -} - -.table td.span10, -.table th.span10 { - float: none; - width: 764px; - margin-left: 0; -} - -.table td.span11, -.table th.span11 { - float: none; - width: 844px; - margin-left: 0; -} - -.table td.span12, -.table th.span12 { - float: none; - width: 924px; - margin-left: 0; -} - -.table tbody tr.success td { - background-color: #dff0d8; -} - -.table tbody tr.error td { - background-color: #f2dede; -} - -.table tbody tr.warning td { - background-color: #fcf8e3; -} - -.table tbody tr.info td { - background-color: #d9edf7; -} - -.table-hover tbody tr.success:hover td { - background-color: #d0e9c6; -} - -.table-hover tbody tr.error:hover td { - background-color: #ebcccc; -} - -.table-hover tbody tr.warning:hover td { - background-color: #faf2cc; -} - -.table-hover tbody tr.info:hover td { - background-color: #c4e3f3; -} - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; -} - -/* White icons with optional class, or on hover/active states of certain elements */ - -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.icon-glass { - background-position: 0 0; -} - -.icon-music { - background-position: -24px 0; -} - -.icon-search { - background-position: -48px 0; -} - -.icon-envelope { - background-position: -72px 0; -} - -.icon-heart { - background-position: -96px 0; -} - -.icon-star { - background-position: -120px 0; -} - -.icon-star-empty { - background-position: -144px 0; -} - -.icon-user { - background-position: -168px 0; -} - -.icon-film { - background-position: -192px 0; -} - -.icon-th-large { - background-position: -216px 0; -} - -.icon-th { - background-position: -240px 0; -} - -.icon-th-list { - background-position: -264px 0; -} - -.icon-ok { - background-position: -288px 0; -} - -.icon-remove { - background-position: -312px 0; -} - -.icon-zoom-in { - background-position: -336px 0; -} - -.icon-zoom-out { - background-position: -360px 0; -} - -.icon-off { - background-position: -384px 0; -} - -.icon-signal { - background-position: -408px 0; -} - -.icon-cog { - background-position: -432px 0; -} - -.icon-trash { - background-position: -456px 0; -} - -.icon-home { - background-position: 0 -24px; -} - -.icon-file { - background-position: -24px -24px; -} - -.icon-time { - background-position: -48px -24px; -} - -.icon-road { - background-position: -72px -24px; -} - -.icon-download-alt { - background-position: -96px -24px; -} - -.icon-download { - background-position: -120px -24px; -} - -.icon-upload { - background-position: -144px -24px; -} - -.icon-inbox { - background-position: -168px -24px; -} - -.icon-play-circle { - background-position: -192px -24px; -} - -.icon-repeat { - background-position: -216px -24px; -} - -.icon-refresh { - background-position: -240px -24px; -} - -.icon-list-alt { - background-position: -264px -24px; -} - -.icon-lock { - background-position: -287px -24px; -} - -.icon-flag { - background-position: -312px -24px; -} - -.icon-headphones { - background-position: -336px -24px; -} - -.icon-volume-off { - background-position: -360px -24px; -} - -.icon-volume-down { - background-position: -384px -24px; -} - -.icon-volume-up { - background-position: -408px -24px; -} - -.icon-qrcode { - background-position: -432px -24px; -} - -.icon-barcode { - background-position: -456px -24px; -} - -.icon-tag { - background-position: 0 -48px; -} - -.icon-tags { - background-position: -25px -48px; -} - -.icon-book { - background-position: -48px -48px; -} - -.icon-bookmark { - background-position: -72px -48px; -} - -.icon-print { - background-position: -96px -48px; -} - -.icon-camera { - background-position: -120px -48px; -} - -.icon-font { - background-position: -144px -48px; -} - -.icon-bold { - background-position: -167px -48px; -} - -.icon-italic { - background-position: -192px -48px; -} - -.icon-text-height { - background-position: -216px -48px; -} - -.icon-text-width { - background-position: -240px -48px; -} - -.icon-align-left { - background-position: -264px -48px; -} - -.icon-align-center { - background-position: -288px -48px; -} - -.icon-align-right { - background-position: -312px -48px; -} - -.icon-align-justify { - background-position: -336px -48px; -} - -.icon-list { - background-position: -360px -48px; -} - -.icon-indent-left { - background-position: -384px -48px; -} - -.icon-indent-right { - background-position: -408px -48px; -} - -.icon-facetime-video { - background-position: -432px -48px; -} - -.icon-picture { - background-position: -456px -48px; -} - -.icon-pencil { - background-position: 0 -72px; -} - -.icon-map-marker { - background-position: -24px -72px; -} - -.icon-adjust { - background-position: -48px -72px; -} - -.icon-tint { - background-position: -72px -72px; -} - -.icon-edit { - background-position: -96px -72px; -} - -.icon-share { - background-position: -120px -72px; -} - -.icon-check { - background-position: -144px -72px; -} - -.icon-move { - background-position: -168px -72px; -} - -.icon-step-backward { - background-position: -192px -72px; -} - -.icon-fast-backward { - background-position: -216px -72px; -} - -.icon-backward { - background-position: -240px -72px; -} - -.icon-play { - background-position: -264px -72px; -} - -.icon-pause { - background-position: -288px -72px; -} - -.icon-stop { - background-position: -312px -72px; -} - -.icon-forward { - background-position: -336px -72px; -} - -.icon-fast-forward { - background-position: -360px -72px; -} - -.icon-step-forward { - background-position: -384px -72px; -} - -.icon-eject { - background-position: -408px -72px; -} - -.icon-chevron-left { - background-position: -432px -72px; -} - -.icon-chevron-right { - background-position: -456px -72px; -} - -.icon-plus-sign { - background-position: 0 -96px; -} - -.icon-minus-sign { - background-position: -24px -96px; -} - -.icon-remove-sign { - background-position: -48px -96px; -} - -.icon-ok-sign { - background-position: -72px -96px; -} - -.icon-question-sign { - background-position: -96px -96px; -} - -.icon-info-sign { - background-position: -120px -96px; -} - -.icon-screenshot { - background-position: -144px -96px; -} - -.icon-remove-circle { - background-position: -168px -96px; -} - -.icon-ok-circle { - background-position: -192px -96px; -} - -.icon-ban-circle { - background-position: -216px -96px; -} - -.icon-arrow-left { - background-position: -240px -96px; -} - -.icon-arrow-right { - background-position: -264px -96px; -} - -.icon-arrow-up { - background-position: -289px -96px; -} - -.icon-arrow-down { - background-position: -312px -96px; -} - -.icon-share-alt { - background-position: -336px -96px; -} - -.icon-resize-full { - background-position: -360px -96px; -} - -.icon-resize-small { - background-position: -384px -96px; -} - -.icon-plus { - background-position: -408px -96px; -} - -.icon-minus { - background-position: -433px -96px; -} - -.icon-asterisk { - background-position: -456px -96px; -} - -.icon-exclamation-sign { - background-position: 0 -120px; -} - -.icon-gift { - background-position: -24px -120px; -} - -.icon-leaf { - background-position: -48px -120px; -} - -.icon-fire { - background-position: -72px -120px; -} - -.icon-eye-open { - background-position: -96px -120px; -} - -.icon-eye-close { - background-position: -120px -120px; -} - -.icon-warning-sign { - background-position: -144px -120px; -} - -.icon-plane { - background-position: -168px -120px; -} - -.icon-calendar { - background-position: -192px -120px; -} - -.icon-random { - width: 16px; - background-position: -216px -120px; -} - -.icon-comment { - background-position: -240px -120px; -} - -.icon-magnet { - background-position: -264px -120px; -} - -.icon-chevron-up { - background-position: -288px -120px; -} - -.icon-chevron-down { - background-position: -313px -119px; -} - -.icon-retweet { - background-position: -336px -120px; -} - -.icon-shopping-cart { - background-position: -360px -120px; -} - -.icon-folder-close { - background-position: -384px -120px; -} - -.icon-folder-open { - width: 16px; - background-position: -408px -120px; -} - -.icon-resize-vertical { - background-position: -432px -119px; -} - -.icon-resize-horizontal { - background-position: -456px -118px; -} - -.icon-hdd { - background-position: 0 -144px; -} - -.icon-bullhorn { - background-position: -24px -144px; -} - -.icon-bell { - background-position: -48px -144px; -} - -.icon-certificate { - background-position: -72px -144px; -} - -.icon-thumbs-up { - background-position: -96px -144px; -} - -.icon-thumbs-down { - background-position: -120px -144px; -} - -.icon-hand-right { - background-position: -144px -144px; -} - -.icon-hand-left { - background-position: -168px -144px; -} - -.icon-hand-up { - background-position: -192px -144px; -} - -.icon-hand-down { - background-position: -216px -144px; -} - -.icon-circle-arrow-right { - background-position: -240px -144px; -} - -.icon-circle-arrow-left { - background-position: -264px -144px; -} - -.icon-circle-arrow-up { - background-position: -288px -144px; -} - -.icon-circle-arrow-down { - background-position: -312px -144px; -} - -.icon-globe { - background-position: -336px -144px; -} - -.icon-wrench { - background-position: -360px -144px; -} - -.icon-tasks { - background-position: -384px -144px; -} - -.icon-filter { - background-position: -408px -144px; -} - -.icon-briefcase { - background-position: -432px -144px; -} - -.icon-fullscreen { - background-position: -456px -144px; -} - -.dropup, -.dropdown { +.collapsing { position: relative; + height: 0; + overflow: hidden; + -webkit-transition: height .35s ease; + transition: height .35s ease; } +@font-face { + font-family: 'Glyphicons Halflings'; -.dropdown-toggle { - *margin-bottom: -3px; + src: url('../fonts/glyphicons-halflings-regular.eot'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } +.glyphicon { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +.glyphicon-asterisk:before { + content: "\2a"; +} +.glyphicon-plus:before { + content: "\2b"; +} +.glyphicon-euro:before { + content: "\20ac"; +} +.glyphicon-minus:before { + content: "\2212"; +} +.glyphicon-cloud:before { + content: "\2601"; +} +.glyphicon-envelope:before { + content: "\2709"; +} +.glyphicon-pencil:before { + content: "\270f"; +} +.glyphicon-glass:before { + content: "\e001"; +} +.glyphicon-music:before { + content: "\e002"; +} +.glyphicon-search:before { + content: "\e003"; +} +.glyphicon-heart:before { + content: "\e005"; +} +.glyphicon-star:before { + content: "\e006"; +} +.glyphicon-star-empty:before { + content: "\e007"; +} +.glyphicon-user:before { + content: "\e008"; +} +.glyphicon-film:before { + content: "\e009"; +} +.glyphicon-th-large:before { + content: "\e010"; +} +.glyphicon-th:before { + content: "\e011"; +} +.glyphicon-th-list:before { + content: "\e012"; +} +.glyphicon-ok:before { + content: "\e013"; +} +.glyphicon-remove:before { + content: "\e014"; +} +.glyphicon-zoom-in:before { + content: "\e015"; +} +.glyphicon-zoom-out:before { + content: "\e016"; +} +.glyphicon-off:before { + content: "\e017"; +} +.glyphicon-signal:before { + content: "\e018"; +} +.glyphicon-cog:before { + content: "\e019"; +} +.glyphicon-trash:before { + content: "\e020"; +} +.glyphicon-home:before { + content: "\e021"; +} +.glyphicon-file:before { + content: "\e022"; +} +.glyphicon-time:before { + content: "\e023"; +} +.glyphicon-road:before { + content: "\e024"; +} +.glyphicon-download-alt:before { + content: "\e025"; +} +.glyphicon-download:before { + content: "\e026"; +} +.glyphicon-upload:before { + content: "\e027"; +} +.glyphicon-inbox:before { + content: "\e028"; +} +.glyphicon-play-circle:before { + content: "\e029"; +} +.glyphicon-repeat:before { + content: "\e030"; +} +.glyphicon-refresh:before { + content: "\e031"; +} +.glyphicon-list-alt:before { + content: "\e032"; +} +.glyphicon-lock:before { + content: "\e033"; +} +.glyphicon-flag:before { + content: "\e034"; +} +.glyphicon-headphones:before { + content: "\e035"; +} +.glyphicon-volume-off:before { + content: "\e036"; +} +.glyphicon-volume-down:before { + content: "\e037"; +} +.glyphicon-volume-up:before { + content: "\e038"; +} +.glyphicon-qrcode:before { + content: "\e039"; +} +.glyphicon-barcode:before { + content: "\e040"; +} +.glyphicon-tag:before { + content: "\e041"; +} +.glyphicon-tags:before { + content: "\e042"; +} +.glyphicon-book:before { + content: "\e043"; +} +.glyphicon-bookmark:before { + content: "\e044"; +} +.glyphicon-print:before { + content: "\e045"; +} +.glyphicon-camera:before { + content: "\e046"; +} +.glyphicon-font:before { + content: "\e047"; +} +.glyphicon-bold:before { + content: "\e048"; +} +.glyphicon-italic:before { + content: "\e049"; +} +.glyphicon-text-height:before { + content: "\e050"; +} +.glyphicon-text-width:before { + content: "\e051"; +} +.glyphicon-align-left:before { + content: "\e052"; +} +.glyphicon-align-center:before { + content: "\e053"; +} +.glyphicon-align-right:before { + content: "\e054"; +} +.glyphicon-align-justify:before { + content: "\e055"; +} +.glyphicon-list:before { + content: "\e056"; +} +.glyphicon-indent-left:before { + content: "\e057"; +} +.glyphicon-indent-right:before { + content: "\e058"; +} +.glyphicon-facetime-video:before { + content: "\e059"; +} +.glyphicon-picture:before { + content: "\e060"; +} +.glyphicon-map-marker:before { + content: "\e062"; +} +.glyphicon-adjust:before { + content: "\e063"; +} +.glyphicon-tint:before { + content: "\e064"; +} +.glyphicon-edit:before { + content: "\e065"; +} +.glyphicon-share:before { + content: "\e066"; +} +.glyphicon-check:before { + content: "\e067"; +} +.glyphicon-move:before { + content: "\e068"; +} +.glyphicon-step-backward:before { + content: "\e069"; +} +.glyphicon-fast-backward:before { + content: "\e070"; +} +.glyphicon-backward:before { + content: "\e071"; +} +.glyphicon-play:before { + content: "\e072"; +} +.glyphicon-pause:before { + content: "\e073"; +} +.glyphicon-stop:before { + content: "\e074"; +} +.glyphicon-forward:before { + content: "\e075"; +} +.glyphicon-fast-forward:before { + content: "\e076"; +} +.glyphicon-step-forward:before { + content: "\e077"; +} +.glyphicon-eject:before { + content: "\e078"; +} +.glyphicon-chevron-left:before { + content: "\e079"; +} +.glyphicon-chevron-right:before { + content: "\e080"; +} +.glyphicon-plus-sign:before { + content: "\e081"; +} +.glyphicon-minus-sign:before { + content: "\e082"; +} +.glyphicon-remove-sign:before { + content: "\e083"; +} +.glyphicon-ok-sign:before { + content: "\e084"; +} +.glyphicon-question-sign:before { + content: "\e085"; +} +.glyphicon-info-sign:before { + content: "\e086"; +} +.glyphicon-screenshot:before { + content: "\e087"; +} +.glyphicon-remove-circle:before { + content: "\e088"; +} +.glyphicon-ok-circle:before { + content: "\e089"; +} +.glyphicon-ban-circle:before { + content: "\e090"; +} +.glyphicon-arrow-left:before { + content: "\e091"; +} +.glyphicon-arrow-right:before { + content: "\e092"; +} +.glyphicon-arrow-up:before { + content: "\e093"; +} +.glyphicon-arrow-down:before { + content: "\e094"; +} +.glyphicon-share-alt:before { + content: "\e095"; +} +.glyphicon-resize-full:before { + content: "\e096"; +} +.glyphicon-resize-small:before { + content: "\e097"; +} +.glyphicon-exclamation-sign:before { + content: "\e101"; +} +.glyphicon-gift:before { + content: "\e102"; +} +.glyphicon-leaf:before { + content: "\e103"; +} +.glyphicon-fire:before { + content: "\e104"; +} +.glyphicon-eye-open:before { + content: "\e105"; +} +.glyphicon-eye-close:before { + content: "\e106"; +} +.glyphicon-warning-sign:before { + content: "\e107"; +} +.glyphicon-plane:before { + content: "\e108"; +} +.glyphicon-calendar:before { + content: "\e109"; +} +.glyphicon-random:before { + content: "\e110"; +} +.glyphicon-comment:before { + content: "\e111"; +} +.glyphicon-magnet:before { + content: "\e112"; +} +.glyphicon-chevron-up:before { + content: "\e113"; +} +.glyphicon-chevron-down:before { + content: "\e114"; +} +.glyphicon-retweet:before { + content: "\e115"; +} +.glyphicon-shopping-cart:before { + content: "\e116"; +} +.glyphicon-folder-close:before { + content: "\e117"; +} +.glyphicon-folder-open:before { + content: "\e118"; +} +.glyphicon-resize-vertical:before { + content: "\e119"; +} +.glyphicon-resize-horizontal:before { + content: "\e120"; +} +.glyphicon-hdd:before { + content: "\e121"; +} +.glyphicon-bullhorn:before { + content: "\e122"; +} +.glyphicon-bell:before { + content: "\e123"; +} +.glyphicon-certificate:before { + content: "\e124"; +} +.glyphicon-thumbs-up:before { + content: "\e125"; +} +.glyphicon-thumbs-down:before { + content: "\e126"; +} +.glyphicon-hand-right:before { + content: "\e127"; +} +.glyphicon-hand-left:before { + content: "\e128"; +} +.glyphicon-hand-up:before { + content: "\e129"; +} +.glyphicon-hand-down:before { + content: "\e130"; +} +.glyphicon-circle-arrow-right:before { + content: "\e131"; +} +.glyphicon-circle-arrow-left:before { + content: "\e132"; +} +.glyphicon-circle-arrow-up:before { + content: "\e133"; +} +.glyphicon-circle-arrow-down:before { + content: "\e134"; +} +.glyphicon-globe:before { + content: "\e135"; +} +.glyphicon-wrench:before { + content: "\e136"; +} +.glyphicon-tasks:before { + content: "\e137"; +} +.glyphicon-filter:before { + content: "\e138"; +} +.glyphicon-briefcase:before { + content: "\e139"; +} +.glyphicon-fullscreen:before { + content: "\e140"; +} +.glyphicon-dashboard:before { + content: "\e141"; +} +.glyphicon-paperclip:before { + content: "\e142"; +} +.glyphicon-heart-empty:before { + content: "\e143"; +} +.glyphicon-link:before { + content: "\e144"; +} +.glyphicon-phone:before { + content: "\e145"; +} +.glyphicon-pushpin:before { + content: "\e146"; +} +.glyphicon-usd:before { + content: "\e148"; +} +.glyphicon-gbp:before { + content: "\e149"; +} +.glyphicon-sort:before { + content: "\e150"; +} +.glyphicon-sort-by-alphabet:before { + content: "\e151"; +} +.glyphicon-sort-by-alphabet-alt:before { + content: "\e152"; +} +.glyphicon-sort-by-order:before { + content: "\e153"; +} +.glyphicon-sort-by-order-alt:before { + content: "\e154"; +} +.glyphicon-sort-by-attributes:before { + content: "\e155"; +} +.glyphicon-sort-by-attributes-alt:before { + content: "\e156"; +} +.glyphicon-unchecked:before { + content: "\e157"; +} +.glyphicon-expand:before { + content: "\e158"; +} +.glyphicon-collapse-down:before { + content: "\e159"; +} +.glyphicon-collapse-up:before { + content: "\e160"; +} +.glyphicon-log-in:before { + content: "\e161"; +} +.glyphicon-flash:before { + content: "\e162"; +} +.glyphicon-log-out:before { + content: "\e163"; +} +.glyphicon-new-window:before { + content: "\e164"; +} +.glyphicon-record:before { + content: "\e165"; +} +.glyphicon-save:before { + content: "\e166"; +} +.glyphicon-open:before { + content: "\e167"; +} +.glyphicon-saved:before { + content: "\e168"; +} +.glyphicon-import:before { + content: "\e169"; +} +.glyphicon-export:before { + content: "\e170"; +} +.glyphicon-send:before { + content: "\e171"; +} +.glyphicon-floppy-disk:before { + content: "\e172"; +} +.glyphicon-floppy-saved:before { + content: "\e173"; +} +.glyphicon-floppy-remove:before { + content: "\e174"; +} +.glyphicon-floppy-save:before { + content: "\e175"; +} +.glyphicon-floppy-open:before { + content: "\e176"; +} +.glyphicon-credit-card:before { + content: "\e177"; +} +.glyphicon-transfer:before { + content: "\e178"; +} +.glyphicon-cutlery:before { + content: "\e179"; +} +.glyphicon-header:before { + content: "\e180"; +} +.glyphicon-compressed:before { + content: "\e181"; +} +.glyphicon-earphone:before { + content: "\e182"; +} +.glyphicon-phone-alt:before { + content: "\e183"; +} +.glyphicon-tower:before { + content: "\e184"; +} +.glyphicon-stats:before { + content: "\e185"; +} +.glyphicon-sd-video:before { + content: "\e186"; +} +.glyphicon-hd-video:before { + content: "\e187"; +} +.glyphicon-subtitles:before { + content: "\e188"; +} +.glyphicon-sound-stereo:before { + content: "\e189"; +} +.glyphicon-sound-dolby:before { + content: "\e190"; +} +.glyphicon-sound-5-1:before { + content: "\e191"; +} +.glyphicon-sound-6-1:before { + content: "\e192"; +} +.glyphicon-sound-7-1:before { + content: "\e193"; +} +.glyphicon-copyright-mark:before { + content: "\e194"; +} +.glyphicon-registration-mark:before { + content: "\e195"; +} +.glyphicon-cloud-download:before { + content: "\e197"; +} +.glyphicon-cloud-upload:before { + content: "\e198"; +} +.glyphicon-tree-conifer:before { + content: "\e199"; +} +.glyphicon-tree-deciduous:before { + content: "\e200"; } - .caret { display: inline-block; width: 0; height: 0; - vertical-align: top; - border-top: 4px solid #000000; + margin-left: 2px; + vertical-align: middle; + border-top: 4px solid; border-right: 4px solid transparent; border-left: 4px solid transparent; - content: ""; } - -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; +.dropdown { + position: relative; +} +.dropdown-toggle:focus { + outline: 0; } - .dropdown-menu { position: absolute; top: 100%; @@ -2877,2759 +3017,1486 @@ table th[class*="span"], min-width: 160px; padding: 5px 0; margin: 2px 0 0; + font-size: 14px; list-style: none; - background-color: #ffffff; + background-color: #fff; + background-clip: padding-box; border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + border: 1px solid rgba(0, 0, 0, .15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); + box-shadow: 0 6px 12px rgba(0, 0, 0, .175); } - .dropdown-menu.pull-right { right: 0; left: auto; } - .dropdown-menu .divider { - *width: 100%; height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; + margin: 9px 0; overflow: hidden; background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; } - -.dropdown-menu li > a { +.dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; font-weight: normal; - line-height: 20px; - color: #333333; + line-height: 1.42857143; + color: #333; white-space: nowrap; } - -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { - color: #ffffff; +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus { + color: #262626; text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); + background-color: #f5f5f5; } - -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { + color: #fff; text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; + background-color: #428bca; outline: 0; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } - -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { - color: #999999; +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999; } - -.dropdown-menu .disabled > a:hover { +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { text-decoration: none; - cursor: default; + cursor: not-allowed; background-color: transparent; background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } - -.open { - *z-index: 1000; -} - .open > .dropdown-menu { display: block; } - +.open > a { + outline: 0; +} +.dropdown-menu-right { + right: 0; + left: auto; +} +.dropdown-menu-left { + right: auto; + left: 0; +} +.dropdown-header { + display: block; + padding: 3px 20px; + font-size: 12px; + line-height: 1.42857143; + color: #999; +} +.dropdown-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 990; +} .pull-right > .dropdown-menu { right: 0; left: auto; } - .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; content: ""; + border-top: 0; + border-bottom: 4px solid; } - .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 1px; } - -.dropdown-submenu { - position: relative; -} - -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} - -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; -} - -.dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; -} - -.dropdown-submenu:hover > a:after { - border-left-color: #ffffff; -} - -.dropdown-submenu.pull-left { - float: none; -} - -.dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; -} - -.typeahead { - z-index: 1051; - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -.collapse.in { - height: auto; -} - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 20px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.btn { - display: inline-block; - *display: inline; - padding: 4px 12px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 14px; - line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #bbbbbb; - *border: 0; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #333333; - background-color: #e6e6e6; - *background-color: #d9d9d9; -} - -.btn:active, -.btn.active { - background-color: #cccccc \9; -} - -.btn:first-child { - *margin-left: 0; -} - -.btn:hover { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn.active, -.btn:active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-large { - padding: 11px 19px; - font-size: 17.5px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { - margin-top: 4px; -} - -.btn-small { - padding: 2px 10px; - font-size: 11.9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} - -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { - margin-top: -1px; -} - -.btn-mini { - padding: 0 6px; - font-size: 10.5px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.btn-block + .btn-block { - margin-top: 5px; -} - -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width: 100%; -} - -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); -} - -.btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; - *background-color: #0044cc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #0044cc; - *background-color: #003bb3; -} - -.btn-primary:active, -.btn-primary.active { - background-color: #003399 \9; -} - -.btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - *background-color: #f89406; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #f89406; - *background-color: #df8505; -} - -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} - -.btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - *background-color: #bd362f; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; -} - -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} - -.btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - *background-color: #51a351; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #51a351; - *background-color: #499249; -} - -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} - -.btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #363636; - *background-color: #222222; - background-image: -moz-linear-gradient(top, #444444, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); - background-image: -webkit-linear-gradient(top, #444444, #222222); - background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #222222; - *background-color: #151515; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} - -button.btn, -input[type="submit"].btn { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} - -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} - -.btn-link, -.btn-link:active, -.btn-link[disabled] { - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-link { - color: #0088cc; - cursor: pointer; - border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-link:hover { - color: #005580; - text-decoration: underline; - background-color: transparent; -} - -.btn-link[disabled]:hover { - color: #333333; - text-decoration: none; -} - -.btn-group { +@media (min-width: 768px) { + .navbar-right .dropdown-menu { + right: 0; + left: auto; + } + .navbar-right .dropdown-menu-left { + right: auto; + left: 0; + } +} +.btn-group, +.btn-group-vertical { position: relative; display: inline-block; - *display: inline; - *margin-left: .3em; - font-size: 0; - white-space: nowrap; vertical-align: middle; - *zoom: 1; } - -.btn-group:first-child { - *margin-left: 0; -} - -.btn-group + .btn-group { - margin-left: 5px; -} - -.btn-toolbar { - margin-top: 10px; - margin-bottom: 10px; - font-size: 0; -} - -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group { - margin-left: 5px; -} - -.btn-group > .btn { - position: relative; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group > .btn + .btn { - margin-left: -1px; -} - .btn-group > .btn, -.btn-group > .dropdown-menu, -.btn-group > .popover { - font-size: 14px; +.btn-group-vertical > .btn { + position: relative; + float: left; } - -.btn-group > .btn-mini { - font-size: 10.5px; -} - -.btn-group > .btn-small { - font-size: 11.9px; -} - -.btn-group > .btn-large { - font-size: 17.5px; -} - -.btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - .btn-group > .btn:hover, +.btn-group-vertical > .btn:hover, .btn-group > .btn:focus, +.btn-group-vertical > .btn:focus, .btn-group > .btn:active, -.btn-group > .btn.active { +.btn-group-vertical > .btn:active, +.btn-group > .btn.active, +.btn-group-vertical > .btn.active { z-index: 2; } - +.btn-group > .btn:focus, +.btn-group-vertical > .btn:focus { + outline: none; +} +.btn-group .btn + .btn, +.btn-group .btn + .btn-group, +.btn-group .btn-group + .btn, +.btn-group .btn-group + .btn-group { + margin-left: -1px; +} +.btn-toolbar { + margin-left: -5px; +} +.btn-toolbar .btn-group, +.btn-toolbar .input-group { + float: left; +} +.btn-toolbar > .btn, +.btn-toolbar > .btn-group, +.btn-toolbar > .input-group { + margin-left: 5px; +} +.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { + border-radius: 0; +} +.btn-group > .btn:first-child { + margin-left: 0; +} +.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.btn-group > .btn:last-child:not(:first-child), +.btn-group > .dropdown-toggle:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} +.btn-group > .btn-group { + float: left; +} +.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.btn-group > .btn-group:first-child > .btn:last-child, +.btn-group > .btn-group:first-child > .dropdown-toggle { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.btn-group > .btn-group:last-child > .btn:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0; } - .btn-group > .btn + .dropdown-toggle { - *padding-top: 5px; padding-right: 8px; - *padding-bottom: 5px; padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } - -.btn-group > .btn-mini + .dropdown-toggle { - *padding-top: 2px; - padding-right: 5px; - *padding-bottom: 2px; - padding-left: 5px; -} - -.btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; -} - -.btn-group > .btn-large + .dropdown-toggle { - *padding-top: 7px; +.btn-group > .btn-lg + .dropdown-toggle { padding-right: 12px; - *padding-bottom: 7px; padding-left: 12px; } - .btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); } - -.btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; +.btn-group.open .dropdown-toggle.btn-link { + -webkit-box-shadow: none; + box-shadow: none; } - -.btn-group.open .btn-primary.dropdown-toggle { - background-color: #0044cc; -} - -.btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; -} - -.btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; -} - -.btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; -} - -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - .btn .caret { - margin-top: 8px; margin-left: 0; } - -.btn-mini .caret, -.btn-small .caret, -.btn-large .caret { - margin-top: 6px; +.btn-lg .caret { + border-width: 5px 5px 0; + border-bottom-width: 0; } - -.btn-large .caret { - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; +.dropup .btn-lg .caret { + border-width: 0 5px 5px; } - -.dropup .btn-large .caret { - border-bottom-width: 5px; -} - -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.btn-group-vertical { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-group-vertical > .btn { +.btn-group-vertical > .btn, +.btn-group-vertical > .btn-group, +.btn-group-vertical > .btn-group > .btn { display: block; float: none; + width: 100%; max-width: 100%; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; } - -.btn-group-vertical > .btn + .btn { +.btn-group-vertical > .btn-group > .btn { + float: none; +} +.btn-group-vertical > .btn + .btn, +.btn-group-vertical > .btn + .btn-group, +.btn-group-vertical > .btn-group + .btn, +.btn-group-vertical > .btn-group + .btn-group { margin-top: -1px; margin-left: 0; } - -.btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; +.btn-group-vertical > .btn:not(:first-child):not(:last-child) { + border-radius: 0; } - -.btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; +.btn-group-vertical > .btn:first-child:not(:last-child) { + border-top-right-radius: 4px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; } - -.btn-group-vertical > .btn-large:first-child { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; +.btn-group-vertical > .btn:last-child:not(:first-child) { + border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-left-radius: 4px; } - -.btn-group-vertical > .btn-large:last-child { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; +.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; } - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, +.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; } - -.alert, -.alert h4 { - color: #c09853; +.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { + border-top-left-radius: 0; + border-top-right-radius: 0; } - -.alert h4 { - margin: 0; +.btn-group-justified { + display: table; + width: 100%; + table-layout: fixed; + border-collapse: separate; } - -.alert .close { +.btn-group-justified > .btn, +.btn-group-justified > .btn-group { + display: table-cell; + float: none; + width: 1%; +} +.btn-group-justified > .btn-group .btn { + width: 100%; +} +[data-toggle="buttons"] > .btn > input[type="radio"], +[data-toggle="buttons"] > .btn > input[type="checkbox"] { + display: none; +} +.input-group { position: relative; - top: -2px; - right: -21px; - line-height: 20px; + display: table; + border-collapse: separate; } - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; +.input-group[class*="col-"] { + float: none; + padding-right: 0; + padding-left: 0; } - -.alert-success h4 { - color: #468847; -} - -.alert-danger, -.alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-danger h4, -.alert-error h4 { - color: #b94a48; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-info h4 { - color: #3a87ad; -} - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} - -.alert-block > p, -.alert-block > ul { +.input-group .form-control { + position: relative; + z-index: 2; + float: left; + width: 100%; margin-bottom: 0; } - -.alert-block p + p { - margin-top: 5px; +.input-group-lg > .form-control, +.input-group-lg > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +select.input-group-lg > .form-control, +select.input-group-lg > .input-group-addon, +select.input-group-lg > .input-group-btn > .btn { + height: 46px; + line-height: 46px; +} +textarea.input-group-lg > .form-control, +textarea.input-group-lg > .input-group-addon, +textarea.input-group-lg > .input-group-btn > .btn, +select[multiple].input-group-lg > .form-control, +select[multiple].input-group-lg > .input-group-addon, +select[multiple].input-group-lg > .input-group-btn > .btn { + height: auto; +} +.input-group-sm > .form-control, +.input-group-sm > .input-group-addon, +.input-group-sm > .input-group-btn > .btn { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.input-group-sm > .form-control, +select.input-group-sm > .input-group-addon, +select.input-group-sm > .input-group-btn > .btn { + height: 30px; + line-height: 30px; +} +textarea.input-group-sm > .form-control, +textarea.input-group-sm > .input-group-addon, +textarea.input-group-sm > .input-group-btn > .btn, +select[multiple].input-group-sm > .form-control, +select[multiple].input-group-sm > .input-group-addon, +select[multiple].input-group-sm > .input-group-btn > .btn { + height: auto; +} +.input-group-addon, +.input-group-btn, +.input-group .form-control { + display: table-cell; +} +.input-group-addon:not(:first-child):not(:last-child), +.input-group-btn:not(:first-child):not(:last-child), +.input-group .form-control:not(:first-child):not(:last-child) { + border-radius: 0; +} +.input-group-addon, +.input-group-btn { + width: 1%; + white-space: nowrap; + vertical-align: middle; +} +.input-group-addon { + padding: 6px 12px; + font-size: 14px; + font-weight: normal; + line-height: 1; + color: #555; + text-align: center; + background-color: #eee; + border: 1px solid #ccc; + border-radius: 4px; +} +.input-group-addon.input-sm { + padding: 5px 10px; + font-size: 12px; + border-radius: 3px; +} +.input-group-addon.input-lg { + padding: 10px 16px; + font-size: 18px; + border-radius: 6px; +} +.input-group-addon input[type="radio"], +.input-group-addon input[type="checkbox"] { + margin-top: 0; +} +.input-group .form-control:first-child, +.input-group-addon:first-child, +.input-group-btn:first-child > .btn, +.input-group-btn:first-child > .btn-group > .btn, +.input-group-btn:first-child > .dropdown-toggle, +.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), +.input-group-btn:last-child > .btn-group:not(:last-child) > .btn { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.input-group-addon:first-child { + border-right: 0; +} +.input-group .form-control:last-child, +.input-group-addon:last-child, +.input-group-btn:last-child > .btn, +.input-group-btn:last-child > .btn-group > .btn, +.input-group-btn:last-child > .dropdown-toggle, +.input-group-btn:first-child > .btn:not(:first-child), +.input-group-btn:first-child > .btn-group:not(:first-child) > .btn { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} +.input-group-addon:last-child { + border-left: 0; +} +.input-group-btn { + position: relative; + font-size: 0; + white-space: nowrap; +} +.input-group-btn > .btn { + position: relative; +} +.input-group-btn > .btn + .btn { + margin-left: -1px; +} +.input-group-btn > .btn:hover, +.input-group-btn > .btn:focus, +.input-group-btn > .btn:active { + z-index: 2; +} +.input-group-btn:first-child > .btn, +.input-group-btn:first-child > .btn-group { + margin-right: -1px; +} +.input-group-btn:last-child > .btn, +.input-group-btn:last-child > .btn-group { + margin-left: -1px; } - .nav { - margin-bottom: 20px; - margin-left: 0; + padding-left: 0; + margin-bottom: 0; list-style: none; } - -.nav > li > a { +.nav > li { + position: relative; display: block; } - -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; +.nav > li > a { + position: relative; + display: block; + padding: 10px 15px; +} +.nav > li > a:hover, +.nav > li > a:focus { + text-decoration: none; + background-color: #eee; +} +.nav > li.disabled > a { + color: #999; +} +.nav > li.disabled > a:hover, +.nav > li.disabled > a:focus { + color: #999; + text-decoration: none; + cursor: not-allowed; + background-color: transparent; +} +.nav .open > a, +.nav .open > a:hover, +.nav .open > a:focus { + background-color: #eee; + border-color: #428bca; +} +.nav .nav-divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; } - .nav > li > a > img { max-width: none; } - -.nav > .pull-right { - float: right; -} - -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 20px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - -.nav li + .nav-header { - margin-top: 9px; -} - -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - margin-right: 2px; -} - -.nav-list .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.nav-tabs, -.nav-pills { - *zoom: 1; -} - -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - line-height: 0; - content: ""; -} - -.nav-tabs:after, -.nav-pills:after { - clear: both; -} - -.nav-tabs > li, -.nav-pills > li { - float: left; -} - -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} - .nav-tabs { border-bottom: 1px solid #ddd; } - .nav-tabs > li { + float: left; margin-bottom: -1px; } - .nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 20px; + margin-right: 2px; + line-height: 1.42857143; border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; } - .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; + border-color: #eee #eee #ddd; } - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; +.nav-tabs > li.active > a, +.nav-tabs > li.active > a:hover, +.nav-tabs > li.active > a:focus { + color: #555; cursor: default; - background-color: #ffffff; + background-color: #fff; border: 1px solid #ddd; border-bottom-color: transparent; } - +.nav-tabs.nav-justified { + width: 100%; + border-bottom: 0; +} +.nav-tabs.nav-justified > li { + float: none; +} +.nav-tabs.nav-justified > li > a { + margin-bottom: 5px; + text-align: center; +} +.nav-tabs.nav-justified > .dropdown .dropdown-menu { + top: auto; + left: auto; +} +@media (min-width: 768px) { + .nav-tabs.nav-justified > li { + display: table-cell; + width: 1%; + } + .nav-tabs.nav-justified > li > a { + margin-bottom: 0; + } +} +.nav-tabs.nav-justified > li > a { + margin-right: 0; + border-radius: 4px; +} +.nav-tabs.nav-justified > .active > a, +.nav-tabs.nav-justified > .active > a:hover, +.nav-tabs.nav-justified > .active > a:focus { + border: 1px solid #ddd; +} +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #ddd; + border-radius: 4px 4px 0 0; + } + .nav-tabs.nav-justified > .active > a, + .nav-tabs.nav-justified > .active > a:hover, + .nav-tabs.nav-justified > .active > a:focus { + border-bottom-color: #fff; + } +} +.nav-pills > li { + float: left; +} .nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + border-radius: 4px; } - -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; +.nav-pills > li + li { + margin-left: 2px; +} +.nav-pills > li.active > a, +.nav-pills > li.active > a:hover, +.nav-pills > li.active > a:focus { + color: #fff; + background-color: #428bca; } - .nav-stacked > li { float: none; } - -.nav-stacked > li > a { - margin-right: 0; +.nav-stacked > li + li { + margin-top: 2px; + margin-left: 0; } - -.nav-tabs.nav-stacked { - border-bottom: 0; +.nav-justified { + width: 100%; } - -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-topleft: 4px; -} - -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.nav-tabs.nav-stacked > li > a:hover { - z-index: 2; - border-color: #ddd; -} - -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} - -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} - -.nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.nav-pills .dropdown-menu { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.nav .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; -} - -.nav .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} - -/* move down carets for tabs */ - -.nav-tabs .dropdown-toggle .caret { - margin-top: 8px; -} - -.nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} - -.nav-tabs .active .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.nav > .dropdown.active > a:hover { - cursor: pointer; -} - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} - -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} - -.tabs-stacked .open > a:hover { - border-color: #999999; -} - -.tabbable { - *zoom: 1; -} - -.tabbable:before, -.tabbable:after { - display: table; - line-height: 0; - content: ""; -} - -.tabbable:after { - clear: both; -} - -.tab-content { - overflow: auto; -} - -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} - -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} - -.tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.tabs-below > .nav-tabs > li > a:hover { - border-top-color: #ddd; - border-bottom-color: transparent; -} - -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { +.nav-justified > li { float: none; } - -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; +.nav-justified > li > a { + margin-bottom: 5px; + text-align: center; +} +.nav-justified > .dropdown .dropdown-menu { + top: auto; + left: auto; +} +@media (min-width: 768px) { + .nav-justified > li { + display: table-cell; + width: 1%; + } + .nav-justified > li > a { + margin-bottom: 0; + } +} +.nav-tabs-justified { + border-bottom: 0; +} +.nav-tabs-justified > li > a { margin-right: 0; - margin-bottom: 3px; + border-radius: 4px; } - -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; +.nav-tabs-justified > .active > a, +.nav-tabs-justified > .active > a:hover, +.nav-tabs-justified > .active > a:focus { + border: 1px solid #ddd; } - -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +@media (min-width: 768px) { + .nav-tabs-justified > li > a { + border-bottom: 1px solid #ddd; + border-radius: 4px 4px 0 0; + } + .nav-tabs-justified > .active > a, + .nav-tabs-justified > .active > a:hover, + .nav-tabs-justified > .active > a:focus { + border-bottom-color: #fff; + } } - -.tabs-left > .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; +.tab-content > .tab-pane { + display: none; } - -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} - -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} - -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.tabs-right > .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} - -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} - -.nav > .disabled > a { - color: #999999; -} - -.nav > .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; -} - -.navbar { - *position: relative; - *z-index: 2; - margin-bottom: 20px; - overflow: visible; -} - -.navbar-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #fafafa; - background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); - background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); - background-repeat: repeat-x; - border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -} - -.navbar-inner:before, -.navbar-inner:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-inner:after { - clear: both; -} - -.navbar .container { - width: auto; -} - -.nav-collapse.collapse { - height: auto; - overflow: visible; -} - -.navbar .brand { +.tab-content > .active { display: block; - float: left; - padding: 10px 20px 10px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - color: #777777; - text-shadow: 0 1px 0 #ffffff; } - -.navbar .brand:hover { - text-decoration: none; +.nav-tabs .dropdown-menu { + margin-top: -1px; + border-top-left-radius: 0; + border-top-right-radius: 0; } - -.navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #777777; -} - -.navbar-link { - color: #777777; -} - -.navbar-link:hover { - color: #333333; -} - -.navbar .divider-vertical { - height: 40px; - margin: 0 9px; - border-right: 1px solid #ffffff; - border-left: 1px solid #f2f2f2; -} - -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} - -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn { - margin-top: 0; -} - -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} - -.navbar-form:before, -.navbar-form:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-form:after { - clear: both; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .btn { - display: inline-block; - margin-bottom: 0; -} - -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} - -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 5px; - white-space: nowrap; -} - -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} - -.navbar-search { +.navbar { position: relative; - float: left; - margin-top: 5px; - margin-bottom: 0; + min-height: 50px; + margin-bottom: 20px; + border: 1px solid transparent; } - -.navbar-search .search-query { - padding: 4px 14px; - margin-bottom: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; +@media (min-width: 768px) { + .navbar { + border-radius: 4px; + } +} +@media (min-width: 768px) { + .navbar-header { + float: left; + } +} +.navbar-collapse { + max-height: 340px; + padding-right: 15px; + padding-left: 15px; + overflow-x: visible; + -webkit-overflow-scrolling: touch; + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1); +} +.navbar-collapse.in { + overflow-y: auto; +} +@media (min-width: 768px) { + .navbar-collapse { + width: auto; + border-top: 0; + box-shadow: none; + } + .navbar-collapse.collapse { + display: block !important; + height: auto !important; + padding-bottom: 0; + overflow: visible !important; + } + .navbar-collapse.in { + overflow-y: visible; + } + .navbar-fixed-top .navbar-collapse, + .navbar-static-top .navbar-collapse, + .navbar-fixed-bottom .navbar-collapse { + padding-right: 0; + padding-left: 0; + } +} +.container > .navbar-header, +.container-fluid > .navbar-header, +.container > .navbar-collapse, +.container-fluid > .navbar-collapse { + margin-right: -15px; + margin-left: -15px; +} +@media (min-width: 768px) { + .container > .navbar-header, + .container-fluid > .navbar-header, + .container > .navbar-collapse, + .container-fluid > .navbar-collapse { + margin-right: 0; + margin-left: 0; + } } - .navbar-static-top { - position: static; - margin-bottom: 0; + z-index: 1000; + border-width: 0 0 1px; } - -.navbar-static-top .navbar-inner { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +@media (min-width: 768px) { + .navbar-static-top { + border-radius: 0; + } } - .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; right: 0; left: 0; z-index: 1030; - margin-bottom: 0; } - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - border-width: 0 0 1px; +@media (min-width: 768px) { + .navbar-fixed-top, + .navbar-fixed-bottom { + border-radius: 0; + } } - -.navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - .navbar-fixed-top { top: 0; + border-width: 0 0 1px; } - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -} - .navbar-fixed-bottom { bottom: 0; + margin-bottom: 0; + border-width: 1px 0 0; } - -.navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); +.navbar-brand { + float: left; + height: 50px; + padding: 15px 15px; + font-size: 18px; + line-height: 20px; } - -.navbar .nav { +.navbar-brand:hover, +.navbar-brand:focus { + text-decoration: none; +} +@media (min-width: 768px) { + .navbar > .container .navbar-brand, + .navbar > .container-fluid .navbar-brand { + margin-left: -15px; + } +} +.navbar-toggle { position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} - -.navbar .nav.pull-right { float: right; - margin-right: 0; -} - -.navbar .nav > li { - float: left; -} - -.navbar .nav > li > a { - float: none; - padding: 10px 15px 10px; - color: #777777; - text-decoration: none; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .nav .dropdown-toggle .caret { + padding: 9px 10px; margin-top: 8px; -} - -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - color: #333333; - text-decoration: none; + margin-right: 15px; + margin-bottom: 8px; background-color: transparent; + background-image: none; + border: 1px solid transparent; + border-radius: 4px; } - -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: #555555; - text-decoration: none; - background-color: #e5e5e5; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); +.navbar-toggle:focus { + outline: none; } - -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - *background-color: #e5e5e5; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} - -.navbar .btn-navbar:hover, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; - *background-color: #d9d9d9; -} - -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #cccccc \9; -} - -.navbar .btn-navbar .icon-bar { +.navbar-toggle .icon-bar { display: block; - width: 18px; + width: 22px; height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + border-radius: 1px; } - -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; +.navbar-toggle .icon-bar + .icon-bar { + margin-top: 4px; } - -.navbar .nav > li > .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; +@media (min-width: 768px) { + .navbar-toggle { + display: none; + } } - -.navbar .nav > li > .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; +.navbar-nav { + margin: 7.5px -15px; } - -.navbar-fixed-bottom .nav > li > .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); +.navbar-nav > li > a { + padding-top: 10px; + padding-bottom: 10px; + line-height: 20px; } - -.navbar-fixed-bottom .nav > li > .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; +@media (max-width: 767px) { + .navbar-nav .open .dropdown-menu { + position: static; + float: none; + width: auto; + margin-top: 0; + background-color: transparent; + border: 0; + box-shadow: none; + } + .navbar-nav .open .dropdown-menu > li > a, + .navbar-nav .open .dropdown-menu .dropdown-header { + padding: 5px 15px 5px 25px; + } + .navbar-nav .open .dropdown-menu > li > a { + line-height: 20px; + } + .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-nav .open .dropdown-menu > li > a:focus { + background-image: none; + } } - -.navbar .nav li.dropdown > a:hover .caret { - border-top-color: #555555; - border-bottom-color: #555555; +@media (min-width: 768px) { + .navbar-nav { + float: left; + margin: 0; + } + .navbar-nav > li { + float: left; + } + .navbar-nav > li > a { + padding-top: 15px; + padding-bottom: 15px; + } + .navbar-nav.navbar-right:last-child { + margin-right: -15px; + } } - -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - color: #555555; - background-color: #e5e5e5; +@media (min-width: 768px) { + .navbar-left { + float: left !important; + } + .navbar-right { + float: right !important; + } } - -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; +.navbar-form { + padding: 10px 15px; + margin-top: 8px; + margin-right: -15px; + margin-bottom: 8px; + margin-left: -15px; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); } - -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; +@media (min-width: 768px) { + .navbar-form .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .navbar-form .form-control { + display: inline-block; + width: auto; + vertical-align: middle; + } + .navbar-form .input-group > .form-control { + width: 100%; + } + .navbar-form .control-label { + margin-bottom: 0; + vertical-align: middle; + } + .navbar-form .radio, + .navbar-form .checkbox { + display: inline-block; + padding-left: 0; + margin-top: 0; + margin-bottom: 0; + vertical-align: middle; + } + .navbar-form .radio input[type="radio"], + .navbar-form .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } + .navbar-form .has-feedback .form-control-feedback { + top: 0; + } } - -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; +@media (max-width: 767px) { + .navbar-form .form-group { + margin-bottom: 5px; + } } - -.navbar .pull-right > li > .dropdown-menu:before, -.navbar .nav > li > .dropdown-menu.pull-right:before { - right: 12px; - left: auto; +@media (min-width: 768px) { + .navbar-form { + width: auto; + padding-top: 0; + padding-bottom: 0; + margin-right: 0; + margin-left: 0; + border: 0; + -webkit-box-shadow: none; + box-shadow: none; + } + .navbar-form.navbar-right:last-child { + margin-right: -15px; + } } - -.navbar .pull-right > li > .dropdown-menu:after, -.navbar .nav > li > .dropdown-menu.pull-right:after { - right: 13px; - left: auto; +.navbar-nav > li > .dropdown-menu { + margin-top: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; } - -.navbar .pull-right > li > .dropdown-menu .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { - right: 100%; - left: auto; - margin-right: -1px; - margin-left: 0; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; +.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; } - -.navbar-inverse .navbar-inner { - background-color: #1b1b1b; - background-image: -moz-linear-gradient(top, #222222, #111111); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); - background-image: -webkit-linear-gradient(top, #222222, #111111); - background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); - background-repeat: repeat-x; - border-color: #252525; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); +.navbar-btn { + margin-top: 8px; + margin-bottom: 8px; } - -.navbar-inverse .brand, -.navbar-inverse .nav > li > a { - color: #999999; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.navbar-btn.btn-sm { + margin-top: 10px; + margin-bottom: 10px; } - -.navbar-inverse .brand:hover, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; +.navbar-btn.btn-xs { + margin-top: 14px; + margin-bottom: 14px; } - -.navbar-inverse .brand { - color: #999999; +.navbar-text { + margin-top: 15px; + margin-bottom: 15px; } - -.navbar-inverse .navbar-text { - color: #999999; +@media (min-width: 768px) { + .navbar-text { + float: left; + margin-right: 15px; + margin-left: 15px; + } + .navbar-text.navbar-right:last-child { + margin-right: 0; + } } - -.navbar-inverse .nav > li > a:focus, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; +.navbar-default { + background-color: #f8f8f8; + border-color: #e7e7e7; +} +.navbar-default .navbar-brand { + color: #777; +} +.navbar-default .navbar-brand:hover, +.navbar-default .navbar-brand:focus { + color: #5e5e5e; background-color: transparent; } - -.navbar-inverse .nav .active > a, -.navbar-inverse .nav .active > a:hover, -.navbar-inverse .nav .active > a:focus { - color: #ffffff; - background-color: #111111; +.navbar-default .navbar-text { + color: #777; +} +.navbar-default .navbar-nav > li > a { + color: #777; +} +.navbar-default .navbar-nav > li > a:hover, +.navbar-default .navbar-nav > li > a:focus { + color: #333; + background-color: transparent; +} +.navbar-default .navbar-nav > .active > a, +.navbar-default .navbar-nav > .active > a:hover, +.navbar-default .navbar-nav > .active > a:focus { + color: #555; + background-color: #e7e7e7; +} +.navbar-default .navbar-nav > .disabled > a, +.navbar-default .navbar-nav > .disabled > a:hover, +.navbar-default .navbar-nav > .disabled > a:focus { + color: #ccc; + background-color: transparent; +} +.navbar-default .navbar-toggle { + border-color: #ddd; +} +.navbar-default .navbar-toggle:hover, +.navbar-default .navbar-toggle:focus { + background-color: #ddd; +} +.navbar-default .navbar-toggle .icon-bar { + background-color: #888; +} +.navbar-default .navbar-collapse, +.navbar-default .navbar-form { + border-color: #e7e7e7; +} +.navbar-default .navbar-nav > .open > a, +.navbar-default .navbar-nav > .open > a:hover, +.navbar-default .navbar-nav > .open > a:focus { + color: #555; + background-color: #e7e7e7; +} +@media (max-width: 767px) { + .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #777; + } + .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + color: #333; + background-color: transparent; + } + .navbar-default .navbar-nav .open .dropdown-menu > .active > a, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #555; + background-color: #e7e7e7; + } + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #ccc; + background-color: transparent; + } +} +.navbar-default .navbar-link { + color: #777; +} +.navbar-default .navbar-link:hover { + color: #333; +} +.navbar-inverse { + background-color: #222; + border-color: #080808; +} +.navbar-inverse .navbar-brand { + color: #999; +} +.navbar-inverse .navbar-brand:hover, +.navbar-inverse .navbar-brand:focus { + color: #fff; + background-color: transparent; +} +.navbar-inverse .navbar-text { + color: #999; +} +.navbar-inverse .navbar-nav > li > a { + color: #999; +} +.navbar-inverse .navbar-nav > li > a:hover, +.navbar-inverse .navbar-nav > li > a:focus { + color: #fff; + background-color: transparent; +} +.navbar-inverse .navbar-nav > .active > a, +.navbar-inverse .navbar-nav > .active > a:hover, +.navbar-inverse .navbar-nav > .active > a:focus { + color: #fff; + background-color: #080808; +} +.navbar-inverse .navbar-nav > .disabled > a, +.navbar-inverse .navbar-nav > .disabled > a:hover, +.navbar-inverse .navbar-nav > .disabled > a:focus { + color: #444; + background-color: transparent; +} +.navbar-inverse .navbar-toggle { + border-color: #333; +} +.navbar-inverse .navbar-toggle:hover, +.navbar-inverse .navbar-toggle:focus { + background-color: #333; +} +.navbar-inverse .navbar-toggle .icon-bar { + background-color: #fff; +} +.navbar-inverse .navbar-collapse, +.navbar-inverse .navbar-form { + border-color: #101010; +} +.navbar-inverse .navbar-nav > .open > a, +.navbar-inverse .navbar-nav > .open > a:hover, +.navbar-inverse .navbar-nav > .open > a:focus { + color: #fff; + background-color: #080808; +} +@media (max-width: 767px) { + .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { + border-color: #080808; + } + .navbar-inverse .navbar-nav .open .dropdown-menu .divider { + background-color: #080808; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { + color: #999; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { + color: #fff; + background-color: transparent; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #fff; + background-color: #080808; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #444; + background-color: transparent; + } } - .navbar-inverse .navbar-link { - color: #999999; + color: #999; } - .navbar-inverse .navbar-link:hover { - color: #ffffff; + color: #fff; } - -.navbar-inverse .divider-vertical { - border-right-color: #222222; - border-left-color: #111111; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .nav li.dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-search .search-query { - color: #ffffff; - background-color: #515151; - border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; -} - -.navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:focus, -.navbar-inverse .navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - -.navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - *background-color: #040404; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-repeat: repeat-x; - border-color: #040404 #040404 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; - *background-color: #000000; -} - -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active { - background-color: #000000 \9; -} - .breadcrumb { padding: 8px 15px; - margin: 0 0 20px; + margin-bottom: 20px; list-style: none; background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; } - .breadcrumb > li { display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; } - -.breadcrumb > li > .divider { +.breadcrumb > li + li:before { padding: 0 5px; color: #ccc; + content: "/\00a0"; } - .breadcrumb > .active { - color: #999999; + color: #999; } - .pagination { - margin: 20px 0; -} - -.pagination ul { display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + padding-left: 0; + margin: 20px 0; + border-radius: 4px; } - -.pagination ul > li { +.pagination > li { display: inline; } - -.pagination ul > li > a, -.pagination ul > li > span { +.pagination > li > a, +.pagination > li > span { + position: relative; float: left; - padding: 4px 12px; - line-height: 20px; + padding: 6px 12px; + margin-left: -1px; + line-height: 1.42857143; + color: #428bca; text-decoration: none; - background-color: #ffffff; - border: 1px solid #dddddd; - border-left-width: 0; + background-color: #fff; + border: 1px solid #ddd; } - -.pagination ul > li > a:hover, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: #f5f5f5; +.pagination > li:first-child > a, +.pagination > li:first-child > span { + margin-left: 0; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } - -.pagination ul > .active > a, -.pagination ul > .active > span { - color: #999999; +.pagination > li:last-child > a, +.pagination > li:last-child > span { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} +.pagination > li > a:hover, +.pagination > li > span:hover, +.pagination > li > a:focus, +.pagination > li > span:focus { + color: #2a6496; + background-color: #eee; + border-color: #ddd; +} +.pagination > .active > a, +.pagination > .active > span, +.pagination > .active > a:hover, +.pagination > .active > span:hover, +.pagination > .active > a:focus, +.pagination > .active > span:focus { + z-index: 2; + color: #fff; cursor: default; + background-color: #428bca; + border-color: #428bca; } - -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover { - color: #999999; - cursor: default; - background-color: transparent; +.pagination > .disabled > span, +.pagination > .disabled > span:hover, +.pagination > .disabled > span:focus, +.pagination > .disabled > a, +.pagination > .disabled > a:hover, +.pagination > .disabled > a:focus { + color: #999; + cursor: not-allowed; + background-color: #fff; + border-color: #ddd; } - -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; +.pagination-lg > li > a, +.pagination-lg > li > span { + padding: 10px 16px; + font-size: 18px; } - -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; +.pagination-lg > li:first-child > a, +.pagination-lg > li:first-child > span { + border-top-left-radius: 6px; + border-bottom-left-radius: 6px; } - -.pagination-centered { - text-align: center; +.pagination-lg > li:last-child > a, +.pagination-lg > li:last-child > span { + border-top-right-radius: 6px; + border-bottom-right-radius: 6px; } - -.pagination-right { - text-align: right; +.pagination-sm > li > a, +.pagination-sm > li > span { + padding: 5px 10px; + font-size: 12px; } - -.pagination-large ul > li > a, -.pagination-large ul > li > span { - padding: 11px 19px; - font-size: 17.5px; +.pagination-sm > li:first-child > a, +.pagination-sm > li:first-child > span { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; } - -.pagination-large ul > li:first-child > a, -.pagination-large ul > li:first-child > span { - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; +.pagination-sm > li:last-child > a, +.pagination-sm > li:last-child > span { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; } - -.pagination-large ul > li:last-child > a, -.pagination-large ul > li:last-child > span { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.pagination-mini ul > li:first-child > a, -.pagination-small ul > li:first-child > a, -.pagination-mini ul > li:first-child > span, -.pagination-small ul > li:first-child > span { - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-topleft: 3px; -} - -.pagination-mini ul > li:last-child > a, -.pagination-small ul > li:last-child > a, -.pagination-mini ul > li:last-child > span, -.pagination-small ul > li:last-child > span { - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; -} - -.pagination-small ul > li > a, -.pagination-small ul > li > span { - padding: 2px 10px; - font-size: 11.9px; -} - -.pagination-mini ul > li > a, -.pagination-mini ul > li > span { - padding: 0 6px; - font-size: 10.5px; -} - .pager { + padding-left: 0; margin: 20px 0; text-align: center; list-style: none; - *zoom: 1; } - -.pager:before, -.pager:after { - display: table; - line-height: 0; - content: ""; -} - -.pager:after { - clear: both; -} - .pager li { display: inline; } - .pager li > a, .pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; + border-radius: 15px; } - -.pager li > a:hover { +.pager li > a:hover, +.pager li > a:focus { text-decoration: none; - background-color: #f5f5f5; + background-color: #eee; } - .pager .next > a, .pager .next > span { float: right; } - .pager .previous > a, .pager .previous > span { float: left; } - .pager .disabled > a, .pager .disabled > a:hover, +.pager .disabled > a:focus, .pager .disabled > span { - color: #999999; - cursor: default; + color: #999; + cursor: not-allowed; background-color: #fff; } - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.modal { - position: fixed; - top: 10%; - left: 50%; - z-index: 1050; - width: 560px; - margin-left: -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 10%; -} - -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} - -.modal-header .close { - margin-top: 2px; -} - -.modal-header h3 { - margin: 0; - line-height: 30px; -} - -.modal-body { - position: relative; - max-height: 400px; - padding: 15px; - overflow-y: auto; -} - -.modal-form { - margin-bottom: 0; -} - -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - line-height: 0; - content: ""; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.modal-footer .btn-block + .btn-block { - margin-left: 0; -} - -.tooltip { - position: absolute; - z-index: 1030; - display: block; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.tooltip.top { - margin-top: -3px; -} - -.tooltip.right { - margin-left: 3px; -} - -.tooltip.bottom { - margin-top: 3px; -} - -.tooltip.left { - margin-left: -3px; -} - -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-right-color: #000000; - border-width: 5px 5px 5px 0; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-left-color: #000000; - border-width: 5px 0 5px 5px; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - width: 236px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.popover.top { - margin-top: -10px; -} - -.popover.right { - margin-left: 10px; -} - -.popover.bottom { - margin-top: 10px; -} - -.popover.left { - margin-left: -10px; -} - -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -.popover-content { - padding: 9px 14px; -} - -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.popover .arrow { - border-width: 11px; -} - -.popover .arrow:after { - border-width: 10px; - content: ""; -} - -.popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #999; - border-top-color: rgba(0, 0, 0, 0.25); - border-bottom-width: 0; -} - -.popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - border-top-color: #ffffff; - border-bottom-width: 0; -} - -.popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #999; - border-right-color: rgba(0, 0, 0, 0.25); - border-left-width: 0; -} - -.popover.right .arrow:after { - bottom: -10px; - left: 1px; - border-right-color: #ffffff; - border-left-width: 0; -} - -.popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-bottom-color: #999; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-top-width: 0; -} - -.popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - border-bottom-color: #ffffff; - border-top-width: 0; -} - -.popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-left-color: #999; - border-left-color: rgba(0, 0, 0, 0.25); - border-right-width: 0; -} - -.popover.left .arrow:after { - right: 1px; - bottom: -10px; - border-left-color: #ffffff; - border-right-width: 0; -} - -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} - -.thumbnails:before, -.thumbnails:after { - display: table; - line-height: 0; - content: ""; -} - -.thumbnails:after { - clear: both; -} - -.row-fluid .thumbnails { - margin-left: 0; -} - -.thumbnails > li { - float: left; - margin-bottom: 20px; - margin-left: 20px; -} - -.thumbnail { - display: block; - padding: 4px; - line-height: 20px; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} - -.thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; - color: #555555; -} - -.media, -.media-body { - overflow: hidden; - *overflow: visible; - zoom: 1; -} - -.media, -.media .media { - margin-top: 15px; -} - -.media:first-child { - margin-top: 0; -} - -.media-object { - display: block; -} - -.media-heading { - margin: 0 0 5px; -} - -.media .pull-left { - margin-right: 10px; -} - -.media .pull-right { - margin-left: 10px; -} - -.media-list { - margin-left: 0; - list-style: none; -} - -.label, -.badge { - display: inline-block; - padding: 2px 4px; - font-size: 11.844px; +.label { + display: inline; + padding: .2em .6em .3em; + font-size: 75%; font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + line-height: 1; + color: #fff; + text-align: center; white-space: nowrap; vertical-align: baseline; - background-color: #999999; + border-radius: .25em; } - -.label { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.badge { - padding-right: 9px; - padding-left: 9px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} - -.label:empty, -.badge:empty { - display: none; -} - -a.label:hover, -a.badge:hover { - color: #ffffff; +.label[href]:hover, +.label[href]:focus { + color: #fff; text-decoration: none; cursor: pointer; } - -.label-important, -.badge-important { - background-color: #b94a48; +.label:empty { + display: none; } - -.label-important[href], -.badge-important[href] { - background-color: #953b39; +.btn .label { + position: relative; + top: -1px; } - -.label-warning, -.badge-warning { - background-color: #f89406; +.label-default { + background-color: #999; } - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; +.label-default[href]:hover, +.label-default[href]:focus { + background-color: #808080; } - -.label-success, -.badge-success { - background-color: #468847; +.label-primary { + background-color: #428bca; } - -.label-success[href], -.badge-success[href] { - background-color: #356635; +.label-primary[href]:hover, +.label-primary[href]:focus { + background-color: #3071a9; } - -.label-info, -.badge-info { - background-color: #3a87ad; +.label-success { + background-color: #5cb85c; } - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; +.label-success[href]:hover, +.label-success[href]:focus { + background-color: #449d44; } - -.label-inverse, -.badge-inverse { - background-color: #333333; +.label-info { + background-color: #5bc0de; } - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; +.label-info[href]:hover, +.label-info[href]:focus { + background-color: #31b0d5; +} +.label-warning { + background-color: #f0ad4e; +} +.label-warning[href]:hover, +.label-warning[href]:focus { + background-color: #ec971f; +} +.label-danger { + background-color: #d9534f; +} +.label-danger[href]:hover, +.label-danger[href]:focus { + background-color: #c9302c; +} +.badge { + display: inline-block; + min-width: 10px; + padding: 3px 7px; + font-size: 12px; + font-weight: bold; + line-height: 1; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + background-color: #999; + border-radius: 10px; +} +.badge:empty { + display: none; } - -.btn .label, .btn .badge { position: relative; top: -1px; } - -.btn-mini .label, -.btn-mini .badge { +.btn-xs .badge { top: 0; + padding: 1px 5px; +} +a.badge:hover, +a.badge:focus { + color: #fff; + text-decoration: none; + cursor: pointer; +} +a.list-group-item.active > .badge, +.nav-pills > .active > a > .badge { + color: #428bca; + background-color: #fff; +} +.nav-pills > li > a > .badge { + margin-left: 3px; +} +.jumbotron { + padding: 30px; + margin-bottom: 30px; + color: inherit; + background-color: #eee; +} +.jumbotron h1, +.jumbotron .h1 { + color: inherit; +} +.jumbotron p { + margin-bottom: 15px; + font-size: 21px; + font-weight: 200; +} +.container .jumbotron { + border-radius: 6px; +} +.jumbotron .container { + max-width: 100%; +} +@media screen and (min-width: 768px) { + .jumbotron { + padding-top: 48px; + padding-bottom: 48px; + } + .container .jumbotron { + padding-right: 60px; + padding-left: 60px; + } + .jumbotron h1, + .jumbotron .h1 { + font-size: 63px; + } +} +.thumbnail { + display: block; + padding: 4px; + margin-bottom: 20px; + line-height: 1.42857143; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 4px; + -webkit-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; +} +.thumbnail > img, +.thumbnail a > img { + margin-right: auto; + margin-left: auto; +} +a.thumbnail:hover, +a.thumbnail:focus, +a.thumbnail.active { + border-color: #428bca; +} +.thumbnail .caption { + padding: 9px; + color: #333; +} +.alert { + padding: 15px; + margin-bottom: 20px; + border: 1px solid transparent; + border-radius: 4px; +} +.alert h4 { + margin-top: 0; + color: inherit; +} +.alert .alert-link { + font-weight: bold; +} +.alert > p, +.alert > ul { + margin-bottom: 0; +} +.alert > p + p { + margin-top: 5px; +} +.alert-dismissable { + padding-right: 35px; +} +.alert-dismissable .close { + position: relative; + top: -2px; + right: -21px; + color: inherit; +} +.alert-success { + color: #3c763d; + background-color: #dff0d8; + border-color: #d6e9c6; +} +.alert-success hr { + border-top-color: #c9e2b3; +} +.alert-success .alert-link { + color: #2b542c; +} +.alert-info { + color: #31708f; + background-color: #d9edf7; + border-color: #bce8f1; +} +.alert-info hr { + border-top-color: #a6e1ec; +} +.alert-info .alert-link { + color: #245269; +} +.alert-warning { + color: #8a6d3b; + background-color: #fcf8e3; + border-color: #faebcc; +} +.alert-warning hr { + border-top-color: #f7e1b5; +} +.alert-warning .alert-link { + color: #66512c; +} +.alert-danger { + color: #a94442; + background-color: #f2dede; + border-color: #ebccd1; +} +.alert-danger hr { + border-top-color: #e4b9c0; +} +.alert-danger .alert-link { + color: #843534; } - @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0; @@ -5638,34 +4505,6 @@ a.badge:hover { background-position: 0 0; } } - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - @keyframes progress-bar-stripes { from { background-position: 40px 0; @@ -5674,366 +4513,1273 @@ a.badge:hover { background-position: 0 0; } } - .progress { height: 20px; margin-bottom: 20px; overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + background-color: #f5f5f5; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); } - -.progress .bar { +.progress-bar { float: left; width: 0; height: 100%; font-size: 12px; - color: #ffffff; + line-height: 20px; + color: #fff; text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; + background-color: #428bca; + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); + -webkit-transition: width .6s ease; + transition: width .6s ease; } - -.progress .bar + .bar { - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); +.progress-striped .progress-bar { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-size: 40px 40px; } - -.progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} - -.progress.active .bar { +.progress.active .progress-bar { -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } - -.progress-danger .bar, -.progress .bar-danger { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); +.progress-bar-success { + background-color: #5cb85c; } - -.progress-danger.progress-striped .bar, -.progress-striped .bar-danger { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +.progress-striped .progress-bar-success { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); } - -.progress-success .bar, -.progress .bar-success { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(to bottom, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); -} - -.progress-success.progress-striped .bar, -.progress-striped .bar-success { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-info .bar, -.progress .bar-info { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); -} - -.progress-info.progress-striped .bar, -.progress-striped .bar-info { +.progress-bar-info { background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } - -.progress-warning .bar, -.progress .bar-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); +.progress-striped .progress-bar-info { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); } - -.progress-warning.progress-striped .bar, -.progress-striped .bar-warning { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +.progress-bar-warning { + background-color: #f0ad4e; } - -.accordion { +.progress-striped .progress-bar-warning { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); +} +.progress-bar-danger { + background-color: #d9534f; +} +.progress-striped .progress-bar-danger { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); +} +.media, +.media-body { + overflow: hidden; + zoom: 1; +} +.media, +.media .media { + margin-top: 15px; +} +.media:first-child { + margin-top: 0; +} +.media-object { + display: block; +} +.media-heading { + margin: 0 0 5px; +} +.media > .pull-left { + margin-right: 10px; +} +.media > .pull-right { + margin-left: 10px; +} +.media-list { + padding-left: 0; + list-style: none; +} +.list-group { + padding-left: 0; margin-bottom: 20px; } - -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +.list-group-item { + position: relative; + display: block; + padding: 10px 15px; + margin-bottom: -1px; + background-color: #fff; + border: 1px solid #ddd; } - -.accordion-heading { +.list-group-item:first-child { + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} +.list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} +.list-group-item > .badge { + float: right; +} +.list-group-item > .badge + .badge { + margin-right: 5px; +} +a.list-group-item { + color: #555; +} +a.list-group-item .list-group-item-heading { + color: #333; +} +a.list-group-item:hover, +a.list-group-item:focus { + text-decoration: none; + background-color: #f5f5f5; +} +a.list-group-item.active, +a.list-group-item.active:hover, +a.list-group-item.active:focus { + z-index: 2; + color: #fff; + background-color: #428bca; + border-color: #428bca; +} +a.list-group-item.active .list-group-item-heading, +a.list-group-item.active:hover .list-group-item-heading, +a.list-group-item.active:focus .list-group-item-heading { + color: inherit; +} +a.list-group-item.active .list-group-item-text, +a.list-group-item.active:hover .list-group-item-text, +a.list-group-item.active:focus .list-group-item-text { + color: #e1edf7; +} +.list-group-item-success { + color: #3c763d; + background-color: #dff0d8; +} +a.list-group-item-success { + color: #3c763d; +} +a.list-group-item-success .list-group-item-heading { + color: inherit; +} +a.list-group-item-success:hover, +a.list-group-item-success:focus { + color: #3c763d; + background-color: #d0e9c6; +} +a.list-group-item-success.active, +a.list-group-item-success.active:hover, +a.list-group-item-success.active:focus { + color: #fff; + background-color: #3c763d; + border-color: #3c763d; +} +.list-group-item-info { + color: #31708f; + background-color: #d9edf7; +} +a.list-group-item-info { + color: #31708f; +} +a.list-group-item-info .list-group-item-heading { + color: inherit; +} +a.list-group-item-info:hover, +a.list-group-item-info:focus { + color: #31708f; + background-color: #c4e3f3; +} +a.list-group-item-info.active, +a.list-group-item-info.active:hover, +a.list-group-item-info.active:focus { + color: #fff; + background-color: #31708f; + border-color: #31708f; +} +.list-group-item-warning { + color: #8a6d3b; + background-color: #fcf8e3; +} +a.list-group-item-warning { + color: #8a6d3b; +} +a.list-group-item-warning .list-group-item-heading { + color: inherit; +} +a.list-group-item-warning:hover, +a.list-group-item-warning:focus { + color: #8a6d3b; + background-color: #faf2cc; +} +a.list-group-item-warning.active, +a.list-group-item-warning.active:hover, +a.list-group-item-warning.active:focus { + color: #fff; + background-color: #8a6d3b; + border-color: #8a6d3b; +} +.list-group-item-danger { + color: #a94442; + background-color: #f2dede; +} +a.list-group-item-danger { + color: #a94442; +} +a.list-group-item-danger .list-group-item-heading { + color: inherit; +} +a.list-group-item-danger:hover, +a.list-group-item-danger:focus { + color: #a94442; + background-color: #ebcccc; +} +a.list-group-item-danger.active, +a.list-group-item-danger.active:hover, +a.list-group-item-danger.active:focus { + color: #fff; + background-color: #a94442; + border-color: #a94442; +} +.list-group-item-heading { + margin-top: 0; + margin-bottom: 5px; +} +.list-group-item-text { + margin-bottom: 0; + line-height: 1.3; +} +.panel { + margin-bottom: 20px; + background-color: #fff; + border: 1px solid transparent; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: 0 1px 1px rgba(0, 0, 0, .05); +} +.panel-body { + padding: 15px; +} +.panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} +.panel-heading > .dropdown .dropdown-toggle { + color: inherit; +} +.panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: 16px; + color: inherit; +} +.panel-title > a { + color: inherit; +} +.panel-footer { + padding: 10px 15px; + background-color: #f5f5f5; + border-top: 1px solid #ddd; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} +.panel > .list-group { + margin-bottom: 0; +} +.panel > .list-group .list-group-item { + border-width: 1px 0; + border-radius: 0; +} +.panel > .list-group:first-child .list-group-item:first-child { + border-top: 0; + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} +.panel > .list-group:last-child .list-group-item:last-child { + border-bottom: 0; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} +.panel-heading + .list-group .list-group-item:first-child { + border-top-width: 0; +} +.panel > .table, +.panel > .table-responsive > .table { + margin-bottom: 0; +} +.panel > .table:first-child, +.panel > .table-responsive:first-child > .table:first-child { + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} +.panel > .table:first-child > thead:first-child > tr:first-child td:first-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, +.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, +.panel > .table:first-child > thead:first-child > tr:first-child th:first-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, +.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { + border-top-left-radius: 3px; +} +.panel > .table:first-child > thead:first-child > tr:first-child td:last-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, +.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, +.panel > .table:first-child > thead:first-child > tr:first-child th:last-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, +.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { + border-top-right-radius: 3px; +} +.panel > .table:last-child, +.panel > .table-responsive:last-child > .table:last-child { + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} +.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, +.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { + border-bottom-left-radius: 3px; +} +.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, +.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { + border-bottom-right-radius: 3px; +} +.panel > .panel-body + .table, +.panel > .panel-body + .table-responsive { + border-top: 1px solid #ddd; +} +.panel > .table > tbody:first-child > tr:first-child th, +.panel > .table > tbody:first-child > tr:first-child td { + border-top: 0; +} +.panel > .table-bordered, +.panel > .table-responsive > .table-bordered { + border: 0; +} +.panel > .table-bordered > thead > tr > th:first-child, +.panel > .table-responsive > .table-bordered > thead > tr > th:first-child, +.panel > .table-bordered > tbody > tr > th:first-child, +.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, +.panel > .table-bordered > tfoot > tr > th:first-child, +.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, +.panel > .table-bordered > thead > tr > td:first-child, +.panel > .table-responsive > .table-bordered > thead > tr > td:first-child, +.panel > .table-bordered > tbody > tr > td:first-child, +.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, +.panel > .table-bordered > tfoot > tr > td:first-child, +.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { + border-left: 0; +} +.panel > .table-bordered > thead > tr > th:last-child, +.panel > .table-responsive > .table-bordered > thead > tr > th:last-child, +.panel > .table-bordered > tbody > tr > th:last-child, +.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, +.panel > .table-bordered > tfoot > tr > th:last-child, +.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, +.panel > .table-bordered > thead > tr > td:last-child, +.panel > .table-responsive > .table-bordered > thead > tr > td:last-child, +.panel > .table-bordered > tbody > tr > td:last-child, +.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, +.panel > .table-bordered > tfoot > tr > td:last-child, +.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { + border-right: 0; +} +.panel > .table-bordered > thead > tr:first-child > td, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > td, +.panel > .table-bordered > tbody > tr:first-child > td, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, +.panel > .table-bordered > thead > tr:first-child > th, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, +.panel > .table-bordered > tbody > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th { border-bottom: 0; } - -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; +.panel > .table-bordered > tbody > tr:last-child > td, +.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, +.panel > .table-bordered > tfoot > tr:last-child > td, +.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td, +.panel > .table-bordered > tbody > tr:last-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, +.panel > .table-bordered > tfoot > tr:last-child > th, +.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th { + border-bottom: 0; } - -.accordion-toggle { +.panel > .table-responsive { + margin-bottom: 0; + border: 0; +} +.panel-group { + margin-bottom: 20px; +} +.panel-group .panel { + margin-bottom: 0; + overflow: hidden; + border-radius: 4px; +} +.panel-group .panel + .panel { + margin-top: 5px; +} +.panel-group .panel-heading { + border-bottom: 0; +} +.panel-group .panel-heading + .panel-collapse .panel-body { + border-top: 1px solid #ddd; +} +.panel-group .panel-footer { + border-top: 0; +} +.panel-group .panel-footer + .panel-collapse .panel-body { + border-bottom: 1px solid #ddd; +} +.panel-default { + border-color: #ddd; +} +.panel-default > .panel-heading { + color: #333; + background-color: #f5f5f5; + border-color: #ddd; +} +.panel-default > .panel-heading + .panel-collapse .panel-body { + border-top-color: #ddd; +} +.panel-default > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #ddd; +} +.panel-primary { + border-color: #428bca; +} +.panel-primary > .panel-heading { + color: #fff; + background-color: #428bca; + border-color: #428bca; +} +.panel-primary > .panel-heading + .panel-collapse .panel-body { + border-top-color: #428bca; +} +.panel-primary > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #428bca; +} +.panel-success { + border-color: #d6e9c6; +} +.panel-success > .panel-heading { + color: #3c763d; + background-color: #dff0d8; + border-color: #d6e9c6; +} +.panel-success > .panel-heading + .panel-collapse .panel-body { + border-top-color: #d6e9c6; +} +.panel-success > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #d6e9c6; +} +.panel-info { + border-color: #bce8f1; +} +.panel-info > .panel-heading { + color: #31708f; + background-color: #d9edf7; + border-color: #bce8f1; +} +.panel-info > .panel-heading + .panel-collapse .panel-body { + border-top-color: #bce8f1; +} +.panel-info > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #bce8f1; +} +.panel-warning { + border-color: #faebcc; +} +.panel-warning > .panel-heading { + color: #8a6d3b; + background-color: #fcf8e3; + border-color: #faebcc; +} +.panel-warning > .panel-heading + .panel-collapse .panel-body { + border-top-color: #faebcc; +} +.panel-warning > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #faebcc; +} +.panel-danger { + border-color: #ebccd1; +} +.panel-danger > .panel-heading { + color: #a94442; + background-color: #f2dede; + border-color: #ebccd1; +} +.panel-danger > .panel-heading + .panel-collapse .panel-body { + border-top-color: #ebccd1; +} +.panel-danger > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #ebccd1; +} +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); +} +.well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, .15); +} +.well-lg { + padding: 24px; + border-radius: 6px; +} +.well-sm { + padding: 9px; + border-radius: 3px; +} +.close { + float: right; + font-size: 21px; + font-weight: bold; + line-height: 1; + color: #000; + text-shadow: 0 1px 0 #fff; + filter: alpha(opacity=20); + opacity: .2; +} +.close:hover, +.close:focus { + color: #000; + text-decoration: none; cursor: pointer; + filter: alpha(opacity=50); + opacity: .5; } - -.accordion-inner { - padding: 9px 15px; +button.close { + -webkit-appearance: none; + padding: 0; + cursor: pointer; + background: transparent; + border: 0; +} +.modal-open { + overflow: hidden; +} +.modal { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1050; + display: none; + overflow: auto; + overflow-y: scroll; + -webkit-overflow-scrolling: touch; + outline: 0; +} +.modal.fade .modal-dialog { + -webkit-transition: -webkit-transform .3s ease-out; + -moz-transition: -moz-transform .3s ease-out; + -o-transition: -o-transform .3s ease-out; + transition: transform .3s ease-out; + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + transform: translate(0, -25%); +} +.modal.in .modal-dialog { + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); +} +.modal-dialog { + position: relative; + width: auto; + margin: 10px; +} +.modal-content { + position: relative; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, .2); + border-radius: 6px; + outline: none; + -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5); + box-shadow: 0 3px 9px rgba(0, 0, 0, .5); +} +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + background-color: #000; +} +.modal-backdrop.fade { + filter: alpha(opacity=0); + opacity: 0; +} +.modal-backdrop.in { + filter: alpha(opacity=50); + opacity: .5; +} +.modal-header { + min-height: 16.42857143px; + padding: 15px; + border-bottom: 1px solid #e5e5e5; +} +.modal-header .close { + margin-top: -2px; +} +.modal-title { + margin: 0; + line-height: 1.42857143; +} +.modal-body { + position: relative; + padding: 20px; +} +.modal-footer { + padding: 19px 20px 20px; + margin-top: 15px; + text-align: right; border-top: 1px solid #e5e5e5; } - +.modal-footer .btn + .btn { + margin-bottom: 0; + margin-left: 5px; +} +.modal-footer .btn-group .btn + .btn { + margin-left: -1px; +} +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} +@media (min-width: 768px) { + .modal-dialog { + width: 600px; + margin: 30px auto; + } + .modal-content { + -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5); + box-shadow: 0 5px 15px rgba(0, 0, 0, .5); + } + .modal-sm { + width: 300px; + } +} +@media (min-width: 992px) { + .modal-lg { + width: 900px; + } +} +.tooltip { + position: absolute; + z-index: 1030; + display: block; + font-size: 12px; + line-height: 1.4; + visibility: visible; + filter: alpha(opacity=0); + opacity: 0; +} +.tooltip.in { + filter: alpha(opacity=90); + opacity: .9; +} +.tooltip.top { + padding: 5px 0; + margin-top: -3px; +} +.tooltip.right { + padding: 0 5px; + margin-left: 3px; +} +.tooltip.bottom { + padding: 5px 0; + margin-top: 3px; +} +.tooltip.left { + padding: 0 5px; + margin-left: -3px; +} +.tooltip-inner { + max-width: 200px; + padding: 3px 8px; + color: #fff; + text-align: center; + text-decoration: none; + background-color: #000; + border-radius: 4px; +} +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.tooltip.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.top-left .tooltip-arrow { + bottom: 0; + left: 5px; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.top-right .tooltip-arrow { + right: 5px; + bottom: 0; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-width: 5px 5px 5px 0; + border-right-color: #000; +} +.tooltip.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-width: 5px 0 5px 5px; + border-left-color: #000; +} +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.tooltip.bottom-left .tooltip-arrow { + top: 0; + left: 5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.tooltip.bottom-right .tooltip-arrow { + top: 0; + right: 5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; + display: none; + max-width: 276px; + padding: 1px; + text-align: left; + white-space: normal; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, .2); + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); + box-shadow: 0 5px 10px rgba(0, 0, 0, .2); +} +.popover.top { + margin-top: -10px; +} +.popover.right { + margin-left: 10px; +} +.popover.bottom { + margin-top: 10px; +} +.popover.left { + margin-left: -10px; +} +.popover-title { + padding: 8px 14px; + margin: 0; + font-size: 14px; + font-weight: normal; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + border-radius: 5px 5px 0 0; +} +.popover-content { + padding: 9px 14px; +} +.popover > .arrow, +.popover > .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.popover > .arrow { + border-width: 11px; +} +.popover > .arrow:after { + content: ""; + border-width: 10px; +} +.popover.top > .arrow { + bottom: -11px; + left: 50%; + margin-left: -11px; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, .25); + border-bottom-width: 0; +} +.popover.top > .arrow:after { + bottom: 1px; + margin-left: -10px; + content: " "; + border-top-color: #fff; + border-bottom-width: 0; +} +.popover.right > .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, .25); + border-left-width: 0; +} +.popover.right > .arrow:after { + bottom: -10px; + left: 1px; + content: " "; + border-right-color: #fff; + border-left-width: 0; +} +.popover.bottom > .arrow { + top: -11px; + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, .25); +} +.popover.bottom > .arrow:after { + top: 1px; + margin-left: -10px; + content: " "; + border-top-width: 0; + border-bottom-color: #fff; +} +.popover.left > .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, .25); +} +.popover.left > .arrow:after { + right: 1px; + bottom: -10px; + content: " "; + border-right-width: 0; + border-left-color: #fff; +} .carousel { position: relative; - margin-bottom: 20px; - line-height: 1; } - .carousel-inner { position: relative; width: 100%; overflow: hidden; } - .carousel-inner > .item { position: relative; display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; + -webkit-transition: .6s ease-in-out left; + transition: .6s ease-in-out left; } - -.carousel-inner > .item > img { - display: block; +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { line-height: 1; } - .carousel-inner > .active, .carousel-inner > .next, .carousel-inner > .prev { display: block; } - .carousel-inner > .active { left: 0; } - .carousel-inner > .next, .carousel-inner > .prev { position: absolute; top: 0; width: 100%; } - .carousel-inner > .next { left: 100%; } - .carousel-inner > .prev { left: -100%; } - .carousel-inner > .next.left, .carousel-inner > .prev.right { left: 0; } - .carousel-inner > .active.left { left: -100%; } - .carousel-inner > .active.right { left: 100%; } - .carousel-control { position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.right { - right: 15px; - left: auto; -} - -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-caption { - position: absolute; - right: 0; + top: 0; bottom: 0; left: 0; - padding: 15px; - background: #333333; - background: rgba(0, 0, 0, 0.75); + width: 15%; + font-size: 20px; + color: #fff; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, .6); + filter: alpha(opacity=50); + opacity: .5; } - -.carousel-caption h4, -.carousel-caption p { - line-height: 20px; - color: #ffffff; +.carousel-control.left { + background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .5) 0%), color-stop(rgba(0, 0, 0, .0001) 100%)); + background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); + background-repeat: repeat-x; } - -.carousel-caption h4 { - margin: 0 0 5px; +.carousel-control.right { + right: 0; + left: auto; + background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .0001) 0%), color-stop(rgba(0, 0, 0, .5) 100%)); + background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); + background-repeat: repeat-x; } - -.carousel-caption p { - margin-bottom: 0; +.carousel-control:hover, +.carousel-control:focus { + color: #fff; + text-decoration: none; + filter: alpha(opacity=90); + outline: none; + opacity: .9; } - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - font-size: 18px; - font-weight: 200; - line-height: 30px; - color: inherit; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; +.carousel-control .icon-prev, +.carousel-control .icon-next, +.carousel-control .glyphicon-chevron-left, +.carousel-control .glyphicon-chevron-right { + position: absolute; + top: 50%; + z-index: 5; + display: inline-block; } - -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; +.carousel-control .icon-prev, +.carousel-control .glyphicon-chevron-left { + left: 50%; } - -.hero-unit li { - line-height: 30px; +.carousel-control .icon-next, +.carousel-control .glyphicon-chevron-right { + right: 50%; } - -.pull-right { - float: right; +.carousel-control .icon-prev, +.carousel-control .icon-next { + width: 20px; + height: 20px; + margin-top: -10px; + margin-left: -10px; + font-family: serif; } - -.pull-left { - float: left; +.carousel-control .icon-prev:before { + content: '\2039'; } - -.hide { - display: none; +.carousel-control .icon-next:before { + content: '\203a'; } - -.show { +.carousel-indicators { + position: absolute; + bottom: 10px; + left: 50%; + z-index: 15; + width: 60%; + padding-left: 0; + margin-left: -30%; + text-align: center; + list-style: none; +} +.carousel-indicators li { + display: inline-block; + width: 10px; + height: 10px; + margin: 1px; + text-indent: -999px; + cursor: pointer; + background-color: #000 \9; + background-color: rgba(0, 0, 0, 0); + border: 1px solid #fff; + border-radius: 10px; +} +.carousel-indicators .active { + width: 12px; + height: 12px; + margin: 0; + background-color: #fff; +} +.carousel-caption { + position: absolute; + right: 15%; + bottom: 20px; + left: 15%; + z-index: 10; + padding-top: 20px; + padding-bottom: 20px; + color: #fff; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, .6); +} +.carousel-caption .btn { + text-shadow: none; +} +@media screen and (min-width: 768px) { + .carousel-control .glyphicon-chevron-left, + .carousel-control .glyphicon-chevron-right, + .carousel-control .icon-prev, + .carousel-control .icon-next { + width: 30px; + height: 30px; + margin-top: -15px; + margin-left: -15px; + font-size: 30px; + } + .carousel-caption { + right: 20%; + left: 20%; + padding-bottom: 30px; + } + .carousel-indicators { + bottom: 20px; + } +} +.clearfix:before, +.clearfix:after, +.container:before, +.container:after, +.container-fluid:before, +.container-fluid:after, +.row:before, +.row:after, +.form-horizontal .form-group:before, +.form-horizontal .form-group:after, +.btn-toolbar:before, +.btn-toolbar:after, +.btn-group-vertical > .btn-group:before, +.btn-group-vertical > .btn-group:after, +.nav:before, +.nav:after, +.navbar:before, +.navbar:after, +.navbar-header:before, +.navbar-header:after, +.navbar-collapse:before, +.navbar-collapse:after, +.pager:before, +.pager:after, +.panel-body:before, +.panel-body:after, +.modal-footer:before, +.modal-footer:after { + display: table; + content: " "; +} +.clearfix:after, +.container:after, +.container-fluid:after, +.row:after, +.form-horizontal .form-group:after, +.btn-toolbar:after, +.btn-group-vertical > .btn-group:after, +.nav:after, +.navbar:after, +.navbar-header:after, +.navbar-collapse:after, +.pager:after, +.panel-body:after, +.modal-footer:after { + clear: both; +} +.center-block { display: block; + margin-right: auto; + margin-left: auto; +} +.pull-right { + float: right !important; +} +.pull-left { + float: left !important; +} +.hide { + display: none !important; +} +.show { + display: block !important; } - .invisible { visibility: hidden; } - +.text-hide { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} +.hidden { + display: none !important; + visibility: hidden !important; +} .affix { position: fixed; } +@-ms-viewport { + width: device-width; +} +.visible-xs, +.visible-sm, +.visible-md, +.visible-lg { + display: none !important; +} +@media (max-width: 767px) { + .visible-xs { + display: block !important; + } + table.visible-xs { + display: table; + } + tr.visible-xs { + display: table-row !important; + } + th.visible-xs, + td.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-sm { + display: block !important; + } + table.visible-sm { + display: table; + } + tr.visible-sm { + display: table-row !important; + } + th.visible-sm, + td.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-md { + display: block !important; + } + table.visible-md { + display: table; + } + tr.visible-md { + display: table-row !important; + } + th.visible-md, + td.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-lg { + display: block !important; + } + table.visible-lg { + display: table; + } + tr.visible-lg { + display: table-row !important; + } + th.visible-lg, + td.visible-lg { + display: table-cell !important; + } +} +@media (max-width: 767px) { + .hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-lg { + display: none !important; + } +} +.visible-print { + display: none !important; +} +@media print { + .visible-print { + display: block !important; + } + table.visible-print { + display: table; + } + tr.visible-print { + display: table-row !important; + } + th.visible-print, + td.visible-print { + display: table-cell !important; + } +} +@media print { + .hidden-print { + display: none !important; + } +} +/*# sourceMappingURL=bootstrap.css.map */ diff --git a/bbb-lti/web-app/css/errors.css b/bbb-lti/web-app/css/errors.css new file mode 100644 index 0000000000..bdb58bcca8 --- /dev/null +++ b/bbb-lti/web-app/css/errors.css @@ -0,0 +1,109 @@ +h1, h2 { + margin: 10px 25px 5px; +} + +h2 { + font-size: 1.1em; +} + +.filename { + font-style: italic; +} + +.exceptionMessage { + margin: 10px; + border: 1px solid #000; + padding: 5px; + background-color: #E9E9E9; +} + +.stack, +.snippet { + margin: 0 25px 10px; +} + +.stack, +.snippet { + border: 1px solid #ccc; + -mox-box-shadow: 0 0 2px rgba(0,0,0,0.2); + -webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2); + box-shadow: 0 0 2px rgba(0,0,0,0.2); +} + +/* error details */ +.error-details { + border-top: 1px solid #FFAAAA; + -mox-box-shadow: 0 0 2px rgba(0,0,0,0.2); + -webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2); + box-shadow: 0 0 2px rgba(0,0,0,0.2); + border-bottom: 1px solid #FFAAAA; + -mox-box-shadow: 0 0 2px rgba(0,0,0,0.2); + -webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2); + box-shadow: 0 0 2px rgba(0,0,0,0.2); + background-color:#FFF3F3; + line-height: 1.5; + overflow: hidden; + padding: 5px; + padding-left:25px; +} + +.error-details dt { + clear: left; + float: left; + font-weight: bold; + margin-right: 5px; +} + +.error-details dt:after { + content: ":"; +} + +.error-details dd { + display: block; +} + +/* stack trace */ +.stack { + padding: 5px; + overflow: auto; + height: 150px; +} + +/* code snippet */ +.snippet { + background-color: #fff; + font-family: monospace; +} + +.snippet .line { + display: block; +} + +.snippet .lineNumber { + background-color: #ddd; + color: #999; + display: inline-block; + margin-right: 5px; + padding: 0 3px; + text-align: right; + width: 3em; +} + +.snippet .error { + background-color: #fff3f3; + font-weight: bold; +} + +.snippet .error .lineNumber { + background-color: #faa; + color: #333; + font-weight: bold; +} + +.snippet .line:first-child .lineNumber { + padding-top: 5px; +} + +.snippet .line:last-child .lineNumber { + padding-bottom: 5px; +} \ No newline at end of file diff --git a/bbb-lti/web-app/css/main.css b/bbb-lti/web-app/css/main.css index fb173c859e..a55945d159 100644 --- a/bbb-lti/web-app/css/main.css +++ b/bbb-lti/web-app/css/main.css @@ -1,267 +1,596 @@ +/* FONT STACK */ +body, +input, select, textarea { + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; +} + +h1, h2, h3, h4, h5, h6 { + line-height: 1.1; +} + +/* BASE LAYOUT */ + +html { + background-color: #ddd; + background-image: -moz-linear-gradient(center top, #aaa, #ddd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #aaa), color-stop(1, #ddd)); + background-image: linear-gradient(top, #aaa, #ddd); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr = '#aaaaaa', EndColorStr = '#dddddd'); + background-repeat: no-repeat; + height: 100%; + /* change the box model to exclude the padding from the calculation of 100% height (IE8+) */ + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +html.no-cssgradients { + background-color: #aaa; +} + +.ie6 html { + height: 100%; +} + html * { - margin: 0; - /*padding: 0; SELECT NOT DISPLAYED CORRECTLY IN FIREFOX */ + margin: 0; +} + +body { + background: #ffffff; + color: #333333; + margin: 0 auto; + max-width: 960px; + overflow-x: hidden; /* prevents box-shadow causing a horizontal scrollbar in firefox when viewport < 960px wide */ + -moz-box-shadow: 0 0 0.3em #255b17; + -webkit-box-shadow: 0 0 0.3em #255b17; + box-shadow: 0 0 0.3em #255b17; +} + +#grailsLogo { + background-color: #abbf78; +} + +/* replace with .no-boxshadow body if you have modernizr available */ +.ie6 body, +.ie7 body, +.ie8 body { + border-color: #255b17; + border-style: solid; + border-width: 0 1px; +} + +.ie6 body { + height: 100%; +} + +a:link, a:visited, a:hover { + color: #48802c; +} + +a:hover, a:active { + outline: none; /* prevents outline in webkit on active links but retains it for tab focus */ +} + +h1 { + color: #48802c; + font-weight: normal; + font-size: 1.25em; + margin: 0.8em 0 0.3em 0; +} + +ul { + padding: 0; +} + +img { + border: 0; } /* GENERAL */ +#grailsLogo a { + display: inline-block; + margin: 1em; +} + +.content { +} + +.content h1 { + border-bottom: 1px solid #CCCCCC; + margin: 0.8em 1em 0.3em; + padding: 0 0.25em; +} + +.scaffold-list h1 { + border: none; +} + +.footer { + background: #abbf78; + color: #000; + clear: both; + font-size: 0.8em; + margin-top: 1.5em; + padding: 1em; + min-height: 1em; +} + +.footer a { + color: #255b17; +} + .spinner { - padding: 5px; + background: url(../images/spinner.gif) 50% 50% no-repeat transparent; + height: 16px; + width: 16px; + padding: 0.5em; position: absolute; right: 0; -} - -body { - background: #fff; - color: #333; - font: 11px verdana, arial, helvetica, sans-serif; -} - -a:link, a:visited, a:hover { - color: #666; - font-weight: bold; - text-decoration: none; -} - -h1 { - color: #006dba; - font-weight: normal; - font-size: 16px; - margin: .8em 0 .3em 0; -} - -ul { - padding-left: 15px; -} - -input, select, textarea { - background-color: #fcfcfc; - border: 1px solid #ccc; - font: 11px verdana, arial, helvetica, sans-serif; - margin: 2px 0; - padding: 2px 4px; -} -select { - padding: 2px 2px 2px 0; -} -textarea { - width: 250px; - height: 150px; - vertical-align: top; -} - -input:focus, select:focus, textarea:focus { - border: 1px solid #b2d1ff; -} - -.body { - float: left; - margin: 0 15px 10px 15px; + top: 0; + text-indent: -9999px; } /* NAVIGATION MENU */ .nav { - background: #fff url(../images/skin/shadow.jpg) bottom repeat-x; - border: 1px solid #ccc; - border-style: solid none solid none; - margin-top: 5px; - padding: 7px 12px; + background-color: #efefef; + padding: 0.5em 0.75em; + -moz-box-shadow: 0 0 3px 1px #aaaaaa; + -webkit-box-shadow: 0 0 3px 1px #aaaaaa; + box-shadow: 0 0 3px 1px #aaaaaa; + zoom: 1; } -.menuButton { - font-size: 10px; - padding: 0 5px; +.nav ul { + overflow: hidden; + padding-left: 0; + zoom: 1; } -.menuButton a { - color: #333; - padding: 4px 6px; + +.nav li { + display: block; + float: left; + list-style-type: none; + margin-right: 0.5em; + padding: 0; } -.menuButton a.home { - background: url(../images/skin/house.png) center left no-repeat; - color: #333; - padding-left: 25px; + +.nav a { + color: #666666; + display: block; + padding: 0.25em 0.7em; + text-decoration: none; + -moz-border-radius: 0.3em; + -webkit-border-radius: 0.3em; + border-radius: 0.3em; } -.menuButton a.list { - background: url(../images/skin/database_table.png) center left no-repeat; - color: #333; - padding-left: 25px; + +.nav a:active, .nav a:visited { + color: #666666; } -.menuButton a.create { - background: url(../images/skin/database_add.png) center left no-repeat; - color: #333; - padding-left: 25px; + +.nav a:focus, .nav a:hover { + background-color: #999999; + color: #ffffff; + outline: none; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.8); +} + +.no-borderradius .nav a:focus, .no-borderradius .nav a:hover { + background-color: transparent; + color: #444444; + text-decoration: underline; +} + +.nav a.home, .nav a.list, .nav a.create { + background-position: 0.7em center; + background-repeat: no-repeat; + text-indent: 25px; +} + +.nav a.home { + background-image: url(../images/skin/house.png); +} + +.nav a.list { + background-image: url(../images/skin/database_table.png); +} + +.nav a.create { + background-image: url(../images/skin/database_add.png); +} + +/* CREATE/EDIT FORMS AND SHOW PAGES */ + +fieldset, +.property-list { + margin: 0.6em 1.25em 0 1.25em; + padding: 0.3em 1.8em 1.25em; + position: relative; + zoom: 1; + border: none; +} + +.property-list .fieldcontain { + list-style: none; + overflow: hidden; + zoom: 1; +} + +.fieldcontain { + margin-top: 1em; +} + +.fieldcontain label, +.fieldcontain .property-label { + color: #666666; + text-align: right; + width: 25%; +} + +.fieldcontain .property-label { + float: left; +} + +.fieldcontain .property-value { + display: block; + margin-left: 27%; +} + +label { + cursor: pointer; + display: inline-block; + margin: 0 0.25em 0 0; +} + +input, select, textarea { + background-color: #fcfcfc; + border: 1px solid #cccccc; + font-size: 1em; + padding: 0.2em 0.4em; +} + +select { + padding: 0.2em 0.2em 0.2em 0; +} + +select[multiple] { + vertical-align: top; +} + +textarea { + width: 250px; + height: 150px; + overflow: auto; /* IE always renders vertical scrollbar without this */ + vertical-align: top; +} + +input[type=checkbox], input[type=radio] { + background-color: transparent; + border: 0; + padding: 0; +} + +input:focus, select:focus, textarea:focus { + background-color: #ffffff; + border: 1px solid #eeeeee; + outline: 0; + -moz-box-shadow: 0 0 0.5em #ffffff; + -webkit-box-shadow: 0 0 0.5em #ffffff; + box-shadow: 0 0 0.5em #ffffff; +} + +.required-indicator { + color: #48802C; + display: inline-block; + font-weight: bold; + margin-left: 0.3em; + position: relative; + top: 0.1em; +} + +ul.one-to-many { + display: inline-block; + list-style-position: inside; + vertical-align: top; +} + +.ie6 ul.one-to-many, .ie7 ul.one-to-many { + display: inline; + zoom: 1; +} + +ul.one-to-many li.add { + list-style-type: none; +} + +/* EMBEDDED PROPERTIES */ + +fieldset.embedded { + background-color: transparent; + border: 1px solid #CCCCCC; + margin-left: 0; + margin-right: 0; + padding-left: 0; + padding-right: 0; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +fieldset.embedded legend { + margin: 0 1em; } /* MESSAGES AND ERRORS */ +.errors, .message { - background: #f3f8fc url(../images/skin/information.png) 8px 50% no-repeat; - border: 1px solid #b2d1ff; - color: #006dba; - margin: 10px 0 5px 0; - padding: 5px 5px 5px 30px + font-size: 0.8em; + line-height: 2; + margin: 1em 2em; + padding: 0.25em; } -div.errors { - background: #fff3f3; - border: 1px solid red; - color: #cc0000; - margin: 10px 0 5px 0; - padding: 5px 0 5px 0; -} -div.errors ul { - list-style: none; - padding: 0; -} -div.errors li { - background: url(../images/skin/exclamation.png) 8px 0% no-repeat; - line-height: 16px; - padding-left: 30px; +.message { + background: #f3f3ff; + border: 1px solid #b2d1ff; + color: #006dba; + -moz-box-shadow: 0 0 0.25em #b2d1ff; + -webkit-box-shadow: 0 0 0.25em #b2d1ff; + box-shadow: 0 0 0.25em #b2d1ff; } -td.errors select { - border: 1px solid red; +.errors { + background: #fff3f3; + border: 1px solid #ffaaaa; + color: #cc0000; + -moz-box-shadow: 0 0 0.25em #ff8888; + -webkit-box-shadow: 0 0 0.25em #ff8888; + box-shadow: 0 0 0.25em #ff8888; } -td.errors input { - border: 1px solid red; + +.errors ul, +.message { + padding: 0; +} + +.errors li { + list-style: none; + background: transparent url(../images/skin/exclamation.png) 0.5em 50% no-repeat; + text-indent: 2.2em; +} + +.message { + background: transparent url(../images/skin/information.png) 0.5em 50% no-repeat; + text-indent: 2.2em; +} + +/* form fields with errors */ + +.error input, .error select, .error textarea { + background: #fff3f3; + border-color: #ffaaaa; + color: #cc0000; +} + +.error input:focus, .error select:focus, .error textarea:focus { + -moz-box-shadow: 0 0 0.5em #ffaaaa; + -webkit-box-shadow: 0 0 0.5em #ffaaaa; + box-shadow: 0 0 0.5em #ffaaaa; +} + +/* same effects for browsers that support HTML5 client-side validation (these have to be specified separately or IE will ignore the entire rule) */ + +input:invalid, select:invalid, textarea:invalid { + background: #fff3f3; + border-color: #ffaaaa; + color: #cc0000; +} + +input:invalid:focus, select:invalid:focus, textarea:invalid:focus { + -moz-box-shadow: 0 0 0.5em #ffaaaa; + -webkit-box-shadow: 0 0 0.5em #ffaaaa; + box-shadow: 0 0 0.5em #ffaaaa; } /* TABLES */ table { - border: 1px solid #ccc; - width: 100% + border-top: 1px solid #DFDFDF; + border-collapse: collapse; + width: 100%; + margin-bottom: 1em; } + tr { - border: 0; + border: 0; } -td, th { - font: 11px verdana, arial, helvetica, sans-serif; - line-height: 12px; - padding: 5px 6px; - text-align: left; - vertical-align: top; + +tr>td:first-child, tr>th:first-child { + padding-left: 1.25em; } + +tr>td:last-child, tr>th:last-child { + padding-right: 1.25em; +} + +td, th { + line-height: 1.5em; + padding: 0.5em 0.6em; + text-align: left; + vertical-align: top; +} + th { - background: #fff url(../images/skin/shadow.jpg); - color: #666; - font-size: 11px; - font-weight: bold; - line-height: 17px; - padding: 2px 6px; + background-color: #efefef; + background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ffffff), color-stop(1, #eaeaea)); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr = '#ffffff', EndColorStr = '#eaeaea'); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#eaeaea')"; + color: #666666; + font-weight: bold; + line-height: 1.7em; + padding: 0.2em 0.6em; } -th a:link, th a:visited, th a:hover { - color: #333; - display: block; - font-size: 10px; - text-decoration: none; - width: 100%; + +thead th { + white-space: nowrap; } -th.asc a, th.desc a { - background-position: right; - background-repeat: no-repeat; + +th a { + display: block; + text-decoration: none; } + +th a:link, th a:visited { + color: #666666; +} + +th a:hover, th a:focus { + color: #333333; +} + +th.sortable a { + background-position: right; + background-repeat: no-repeat; + padding-right: 1.1em; +} + th.asc a { - background-image: url(../images/skin/sorted_asc.gif); + background-image: url(../images/skin/sorted_asc.gif); } + th.desc a { - background-image: url(../images/skin/sorted_desc.gif); + background-image: url(../images/skin/sorted_desc.gif); } .odd { - background: #f7f7f7; + background: #f7f7f7; } + .even { - background: #fff; + background: #ffffff; } -/* LIST */ - -.list table { - border-collapse: collapse; -} -.list th, .list td { - border-left: 1px solid #ddd; -} -.list th:hover, .list tr:hover { - background: #b2d1ff; +th:hover, tr:hover { + background: #E1F2B6; } /* PAGINATION */ -.paginateButtons { - background: #fff url(../images/skin/shadow.jpg) bottom repeat-x; - border: 1px solid #ccc; - border-top: 0; - color: #666; - font-size: 10px; - overflow: hidden; - padding: 10px 3px; -} -.paginateButtons a { - background: #fff; - border: 1px solid #ccc; - border-color: #ccc #aaa #aaa #ccc; - color: #666; - margin: 0 3px; - padding: 2px 6px; -} -.paginateButtons span { - padding: 2px 3px; +.pagination { + border-top: 0; + margin: 0; + padding: 0.3em 0.2em; + text-align: center; + -moz-box-shadow: 0 0 3px 1px #AAAAAA; + -webkit-box-shadow: 0 0 3px 1px #AAAAAA; + box-shadow: 0 0 3px 1px #AAAAAA; + background-color: #EFEFEF; } -/* DIALOG */ - -.dialog table { - padding: 5px 0; +.pagination a, +.pagination .currentStep { + color: #666666; + display: inline-block; + margin: 0 0.1em; + padding: 0.25em 0.7em; + text-decoration: none; + -moz-border-radius: 0.3em; + -webkit-border-radius: 0.3em; + border-radius: 0.3em; } -.prop { - padding: 5px; +.pagination a:hover, .pagination a:focus, +.pagination .currentStep { + background-color: #999999; + color: #ffffff; + outline: none; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.8); } -.prop .name { - text-align: left; - width: 15%; - white-space: nowrap; -} -.prop .value { - text-align: left; - width: 85%; + +.no-borderradius .pagination a:hover, .no-borderradius .pagination a:focus, +.no-borderradius .pagination .currentStep { + background-color: transparent; + color: #444444; + text-decoration: underline; } /* ACTION BUTTONS */ .buttons { - background: #fff url(../images/skin/shadow.jpg) bottom repeat-x; - border: 1px solid #ccc; - color: #666; - font-size: 10px; - margin-top: 5px; - overflow: hidden; - padding: 0; + background-color: #efefef; + overflow: hidden; + padding: 0.3em; + -moz-box-shadow: 0 0 3px 1px #aaaaaa; + -webkit-box-shadow: 0 0 3px 1px #aaaaaa; + box-shadow: 0 0 3px 1px #aaaaaa; + margin: 0.1em 0 0 0; + border: none; } -.buttons input { - background: #fff; - border: 0; - color: #333; - cursor: pointer; - font-size: 10px; - font-weight: bold; - margin-left: 3px; - overflow: visible; - padding: 2px 6px; +.buttons input, +.buttons a { + background-color: transparent; + border: 0; + color: #666666; + cursor: pointer; + display: inline-block; + margin: 0 0.25em 0; + overflow: visible; + padding: 0.25em 0.7em; + text-decoration: none; + + -moz-border-radius: 0.3em; + -webkit-border-radius: 0.3em; + border-radius: 0.3em; } -.buttons input.delete { - background: transparent url(../images/skin/database_delete.png) 5px 50% no-repeat; - padding-left: 28px; + +.buttons input:hover, .buttons input:focus, +.buttons a:hover, .buttons a:focus { + background-color: #999999; + color: #ffffff; + outline: none; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.8); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; } -.buttons input.edit { - background: transparent url(../images/skin/database_edit.png) 5px 50% no-repeat; - padding-left: 28px; + +.no-borderradius .buttons input:hover, .no-borderradius .buttons input:focus, +.no-borderradius .buttons a:hover, .no-borderradius .buttons a:focus { + background-color: transparent; + color: #444444; + text-decoration: underline; } -.buttons input.save { - background: transparent url(../images/skin/database_save.png) 5px 50% no-repeat; - padding-left: 28px; + +.buttons .delete, .buttons .edit, .buttons .save { + background-position: 0.7em center; + background-repeat: no-repeat; + text-indent: 25px; +} + +.ie6 .buttons input.delete, .ie6 .buttons input.edit, .ie6 .buttons input.save, +.ie7 .buttons input.delete, .ie7 .buttons input.edit, .ie7 .buttons input.save { + padding-left: 36px; +} + +.buttons .delete { + background-image: url(../images/skin/database_delete.png); +} + +.buttons .edit { + background-image: url(../images/skin/database_edit.png); +} + +.buttons .save { + background-image: url(../images/skin/database_save.png); +} + +a.skip { + position: absolute; + left: -9999px; } diff --git a/bbb-lti/web-app/css/mobile.css b/bbb-lti/web-app/css/mobile.css new file mode 100644 index 0000000000..167f50221e --- /dev/null +++ b/bbb-lti/web-app/css/mobile.css @@ -0,0 +1,82 @@ +/* Styles for mobile devices */ + +@media screen and (max-width: 480px) { + .nav { + padding: 0.5em; + } + + .nav li { + margin: 0 0.5em 0 0; + padding: 0.25em; + } + + /* Hide individual steps in pagination, just have next & previous */ + .pagination .step, .pagination .currentStep { + display: none; + } + + .pagination .prevLink { + float: left; + } + + .pagination .nextLink { + float: right; + } + + /* pagination needs to wrap around floated buttons */ + .pagination { + overflow: hidden; + } + + /* slightly smaller margin around content body */ + fieldset, + .property-list { + padding: 0.3em 1em 1em; + } + + input, textarea { + width: 100%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + } + + select, input[type=checkbox], input[type=radio], input[type=submit], input[type=button], input[type=reset] { + width: auto; + } + + /* hide all but the first column of list tables */ + .scaffold-list td:not(:first-child), + .scaffold-list th:not(:first-child) { + display: none; + } + + .scaffold-list thead th { + text-align: center; + } + + /* stack form elements */ + .fieldcontain { + margin-top: 0.6em; + } + + .fieldcontain label, + .fieldcontain .property-label, + .fieldcontain .property-value { + display: block; + float: none; + margin: 0 0 0.25em 0; + text-align: left; + width: auto; + } + + .errors ul, + .message p { + margin: 0.5em; + } + + .error ul { + margin-left: 0; + } +} diff --git a/bbb-lti/web-app/fonts/glyphicons-halflings-regular.eot b/bbb-lti/web-app/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000000..4a4ca865d6 Binary files /dev/null and b/bbb-lti/web-app/fonts/glyphicons-halflings-regular.eot differ diff --git a/bbb-lti/web-app/fonts/glyphicons-halflings-regular.svg b/bbb-lti/web-app/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000000..e3e2dc739d --- /dev/null +++ b/bbb-lti/web-app/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bbb-lti/web-app/fonts/glyphicons-halflings-regular.ttf b/bbb-lti/web-app/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000000..67fa00bf83 Binary files /dev/null and b/bbb-lti/web-app/fonts/glyphicons-halflings-regular.ttf differ diff --git a/bbb-lti/web-app/fonts/glyphicons-halflings-regular.woff b/bbb-lti/web-app/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000000..8c54182aa5 Binary files /dev/null and b/bbb-lti/web-app/fonts/glyphicons-halflings-regular.woff differ diff --git a/bbb-lti/web-app/images/apple-touch-icon-retina.png b/bbb-lti/web-app/images/apple-touch-icon-retina.png new file mode 100644 index 0000000000..5cc83edbe6 Binary files /dev/null and b/bbb-lti/web-app/images/apple-touch-icon-retina.png differ diff --git a/bbb-lti/web-app/images/apple-touch-icon.png b/bbb-lti/web-app/images/apple-touch-icon.png new file mode 100644 index 0000000000..aba337f611 Binary files /dev/null and b/bbb-lti/web-app/images/apple-touch-icon.png differ diff --git a/bbb-lti/web-app/images/favicon.ico b/bbb-lti/web-app/images/favicon.ico new file mode 100644 index 0000000000..3197f58622 Binary files /dev/null and b/bbb-lti/web-app/images/favicon.ico differ diff --git a/bbb-lti/web-app/images/grails_logo.png b/bbb-lti/web-app/images/grails_logo.png new file mode 100644 index 0000000000..9836b93d2c Binary files /dev/null and b/bbb-lti/web-app/images/grails_logo.png differ diff --git a/bbb-lti/web-app/images/springsource.png b/bbb-lti/web-app/images/springsource.png new file mode 100644 index 0000000000..e806d00115 Binary files /dev/null and b/bbb-lti/web-app/images/springsource.png differ diff --git a/bbb-lti/web-app/js/application.js b/bbb-lti/web-app/js/application.js index 1bf791a05c..b2adb962e2 100644 --- a/bbb-lti/web-app/js/application.js +++ b/bbb-lti/web-app/js/application.js @@ -1,13 +1,9 @@ -var Ajax; -if (Ajax && (Ajax != null)) { - Ajax.Responders.register({ - onCreate: function() { - if($('spinner') && Ajax.activeRequestCount>0) - Effect.Appear('spinner',{duration:0.5,queue:'end'}); - }, - onComplete: function() { - if($('spinner') && Ajax.activeRequestCount==0) - Effect.Fade('spinner',{duration:0.5,queue:'end'}); - } - }); +if (typeof jQuery !== 'undefined') { + (function($) { + $('#spinner').ajaxStart(function() { + $(this).fadeIn(); + }).ajaxStop(function() { + $(this).fadeOut(); + }); + })(jQuery); } diff --git a/bbb-lti/web-app/js/bootstrap.js b/bbb-lti/web-app/js/bootstrap.js new file mode 100644 index 0000000000..8ae571b6da --- /dev/null +++ b/bbb-lti/web-app/js/bootstrap.js @@ -0,0 +1,1951 @@ +/*! + * Bootstrap v3.1.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') } + +/* ======================================================================== + * Bootstrap: transition.js v3.1.1 + * http://getbootstrap.com/javascript/#transitions + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ + + function transitionEnd() { + var el = document.createElement('bootstrap') + + var transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd', + 'MozTransition' : 'transitionend', + 'OTransition' : 'oTransitionEnd otransitionend', + 'transition' : 'transitionend' + } + + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + + return false // explicit for ie8 ( ._.) + } + + // http://blog.alexmaccaw.com/css-transitions + $.fn.emulateTransitionEnd = function (duration) { + var called = false, $el = this + $(this).one($.support.transition.end, function () { called = true }) + var callback = function () { if (!called) $($el).trigger($.support.transition.end) } + setTimeout(callback, duration) + return this + } + + $(function () { + $.support.transition = transitionEnd() + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: alert.js v3.1.1 + * http://getbootstrap.com/javascript/#alerts + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent.trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent + .one($.support.transition.end, removeElement) + .emulateTransitionEnd(150) : + removeElement() + } + + + // ALERT PLUGIN DEFINITION + // ======================= + + var old = $.fn.alert + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + // ALERT NO CONFLICT + // ================= + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + // ALERT DATA-API + // ============== + + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: button.js v3.1.1 + * http://getbootstrap.com/javascript/#buttons + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + this.isLoading = false + } + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (!data.resetText) $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout($.proxy(function () { + if (state == 'loadingText') { + this.isLoading = true + $el.addClass(d).attr(d, d) + } else if (this.isLoading) { + this.isLoading = false + $el.removeClass(d).removeAttr(d) + } + }, this), 0) + } + + Button.prototype.toggle = function () { + var changed = true + var $parent = this.$element.closest('[data-toggle="buttons"]') + + if ($parent.length) { + var $input = this.$element.find('input') + if ($input.prop('type') == 'radio') { + if ($input.prop('checked') && this.$element.hasClass('active')) changed = false + else $parent.find('.active').removeClass('active') + } + if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') + } + + if (changed) this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + var old = $.fn.button + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.Constructor = Button + + + // BUTTON NO CONFLICT + // ================== + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + e.preventDefault() + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: carousel.js v3.1.1 + * http://getbootstrap.com/javascript/#carousel + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // CAROUSEL CLASS DEFINITION + // ========================= + + var Carousel = function (element, options) { + this.$element = $(element) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.DEFAULTS = { + interval: 5000, + pause: 'hover', + wrap: true + } + + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getActiveIndex = function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + + return this.$items.index(this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getActiveIndex() + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition) { + this.$element.trigger($.support.transition.end) + this.cycle(true) + } + + this.interval = clearInterval(this.interval) + + return this + } + + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } + + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } + + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() + } + + if ($next.hasClass('active')) return this.sliding = false + + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + + this.sliding = true + + isCycling && this.pause() + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid.bs.carousel', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') + }) + } + + if ($.support.transition && this.$element.hasClass('slide')) { + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + $active + .one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) + }) + .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) + } else { + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid.bs.carousel') + } + + isCycling && this.cycle() + + return this + } + + + // CAROUSEL PLUGIN DEFINITION + // ========================== + + var old = $.fn.carousel + + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide + + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) + } + + $.fn.carousel.Constructor = Carousel + + + // CAROUSEL NO CONFLICT + // ==================== + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var $this = $(this), href + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false + + $target.carousel(options) + + if (slideIndex = $this.attr('data-slide-to')) { + $target.data('bs.carousel').to(slideIndex) + } + + e.preventDefault() + }) + + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + $carousel.carousel($carousel.data()) + }) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: collapse.js v3.1.1 + * http://getbootstrap.com/javascript/#collapse + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing') + [dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('collapse in') + [dimension]('auto') + this.transitioning = 0 + this.$element.trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + [dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element + [dimension](this.$element[dimension]()) + [0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data && options.toggle && option == 'show') option = !option + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + } + + $target.collapse(option) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: dropdown.js v3.1.1 + * http://getbootstrap.com/javascript/#dropdowns + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle=dropdown]' + var Dropdown = function (element) { + $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we use a backdrop because click events don't delegate + $('
').insertAfter($(this)).on('click', clearMenus) + } + + var relatedTarget = { relatedTarget: this } + $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown', relatedTarget) + + $this.focus() + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27)/.test(e.keyCode)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } + + var desc = ' li:not(.divider):visible a' + var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc) + + if (!$items.length) return + + var index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 + + $items.eq(index).focus() + } + + function clearMenus(e) { + $(backdrop).remove() + $(toggle).each(function () { + var $parent = getParent($(this)) + var relatedTarget = { relatedTarget: this } + if (!$parent.hasClass('open')) return + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + if (e.isDefaultPrevented()) return + $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget) + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + var old = $.fn.dropdown + + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.dropdown') + + if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: modal.js v3.1.1 + * http://getbootstrap.com/javascript/#modals + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // MODAL CLASS DEFINITION + // ====================== + + var Modal = function (element, options) { + this.options = options + this.$element = $(element) + this.$backdrop = + this.isShown = null + + if (this.options.remote) { + this.$element + .find('.modal-content') + .load(this.options.remote, $.proxy(function () { + this.$element.trigger('loaded.bs.modal') + }, this)) + } + } + + Modal.DEFAULTS = { + backdrop: true, + keyboard: true, + show: true + } + + Modal.prototype.toggle = function (_relatedTarget) { + return this[!this.isShown ? 'show' : 'hide'](_relatedTarget) + } + + Modal.prototype.show = function (_relatedTarget) { + var that = this + var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.escape() + + this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) // don't move modals dom position + } + + that.$element + .show() + .scrollTop(0) + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + + that.enforceFocus() + + var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) + + transition ? + that.$element.find('.modal-dialog') // wait for modal to slide in + .one($.support.transition.end, function () { + that.$element.focus().trigger(e) + }) + .emulateTransitionEnd(300) : + that.$element.focus().trigger(e) + }) + } + + Modal.prototype.hide = function (e) { + if (e) e.preventDefault() + + e = $.Event('hide.bs.modal') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.escape() + + $(document).off('focusin.bs.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + .off('click.dismiss.bs.modal') + + $.support.transition && this.$element.hasClass('fade') ? + this.$element + .one($.support.transition.end, $.proxy(this.hideModal, this)) + .emulateTransitionEnd(300) : + this.hideModal() + } + + Modal.prototype.enforceFocus = function () { + $(document) + .off('focusin.bs.modal') // guard against infinite focus loop + .on('focusin.bs.modal', $.proxy(function (e) { + if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { + this.$element.focus() + } + }, this)) + } + + Modal.prototype.escape = function () { + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) { + e.which == 27 && this.hide() + }, this)) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.bs.modal') + } + } + + Modal.prototype.hideModal = function () { + var that = this + this.$element.hide() + this.backdrop(function () { + that.removeBackdrop() + that.$element.trigger('hidden.bs.modal') + }) + } + + Modal.prototype.removeBackdrop = function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + Modal.prototype.backdrop = function (callback) { + var animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
') + .appendTo(document.body) + + this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus.call(this.$element[0]) + : this.hide.call(this) + }, this)) + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + if (!callback) return + + doAnimate ? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade') ? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() + + } else if (callback) { + callback() + } + } + + + // MODAL PLUGIN DEFINITION + // ======================= + + var old = $.fn.modal + + $.fn.modal = function (option, _relatedTarget) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.modal') + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option](_relatedTarget) + else if (options.show) data.show(_relatedTarget) + }) + } + + $.fn.modal.Constructor = Modal + + + // MODAL NO CONFLICT + // ================= + + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } + + + // MODAL DATA-API + // ============== + + $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + var href = $this.attr('href') + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + + if ($this.is('a')) e.preventDefault() + + $target + .modal(option, this) + .one('hide', function () { + $this.is(':visible') && $this.focus() + }) + }) + + $(document) + .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) + .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: tooltip.js v3.1.1 + * http://getbootstrap.com/javascript/#tooltip + * Inspired by the original jQuery.tipsy by Jason Frame + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = + this.$element = null + + this.init('tooltip', element, options) + } + + Tooltip.DEFAULTS = { + animation: true, + placement: 'top', + selector: false, + template: '
', + trigger: 'hover focus', + title: '', + delay: 0, + html: false, + container: false + } + + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + + var triggers = this.options.trigger.split(' ') + + for (var i = triggers.length; i--;) { + var trigger = triggers[i] + + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' + + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay, + hide: options.delay + } + } + + return options + } + + Tooltip.prototype.getDelegateOptions = function () { + var options = {} + var defaults = this.getDefaults() + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) + + return options + } + + Tooltip.prototype.enter = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'in' + + if (!self.options.delay || !self.options.delay.show) return self.show() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'out' + + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.' + this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + var that = this; + + var $tip = this.tip() + + this.setContent() + + if (this.options.animation) $tip.addClass('fade') + + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + var autoToken = /\s?auto?\s?/i + var autoPlace = autoToken.test(placement) + if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (autoPlace) { + var $parent = this.$element.parent() + + var orgPlacement = placement + var docScroll = document.documentElement.scrollTop || document.body.scrollTop + var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth() + var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight() + var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left + + placement = placement == 'bottom' && pos.top + pos.height + actualHeight - docScroll > parentHeight ? 'top' : + placement == 'top' && pos.top - docScroll - actualHeight < 0 ? 'bottom' : + placement == 'right' && pos.right + actualWidth > parentWidth ? 'left' : + placement == 'left' && pos.left - actualWidth < parentLeft ? 'right' : + placement + + $tip + .removeClass(orgPlacement) + .addClass(placement) + } + + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + + this.applyPlacement(calculatedOffset, placement) + this.hoverState = null + + var complete = function() { + that.$element.trigger('shown.bs.' + that.type) + } + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one($.support.transition.end, complete) + .emulateTransitionEnd(150) : + complete() + } + } + + Tooltip.prototype.applyPlacement = function (offset, placement) { + var replace + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + // manually read margins because getBoundingClientRect includes difference + var marginTop = parseInt($tip.css('margin-top'), 10) + var marginLeft = parseInt($tip.css('margin-left'), 10) + + // we must check for NaN for ie 8/9 + if (isNaN(marginTop)) marginTop = 0 + if (isNaN(marginLeft)) marginLeft = 0 + + offset.top = offset.top + marginTop + offset.left = offset.left + marginLeft + + // $.fn.offset doesn't round pixel values + // so we use setOffset directly with our own function B-0 + $.offset.setOffset($tip[0], $.extend({ + using: function (props) { + $tip.css({ + top: Math.round(props.top), + left: Math.round(props.left) + }) + } + }, offset), 0) + + $tip.addClass('in') + + // check to see if placing tip in new offset caused the tip to resize itself + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + replace = true + offset.top = offset.top + height - actualHeight + } + + if (/bottom|top/.test(placement)) { + var delta = 0 + + if (offset.left < 0) { + delta = offset.left * -2 + offset.left = 0 + + $tip.offset(offset) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + } + + this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') + } else { + this.replaceArrow(actualHeight - height, actualHeight, 'top') + } + + if (replace) $tip.offset(offset) + } + + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function () { + var that = this + var $tip = this.tip() + var e = $.Event('hide.bs.' + this.type) + + function complete() { + if (that.hoverState != 'in') $tip.detach() + that.$element.trigger('hidden.bs.' + that.type) + } + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one($.support.transition.end, complete) + .emulateTransitionEnd(150) : + complete() + + this.hoverState = null + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function () { + var el = this.$element[0] + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { + width: el.offsetWidth, + height: el.offsetHeight + }, this.$element.offset()) + } + + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.tip = function () { + return this.$tip = this.$tip || $(this.options.template) + } + + Tooltip.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow') + } + + Tooltip.prototype.validate = function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) + } + + Tooltip.prototype.destroy = function () { + clearTimeout(this.timeout) + this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) + } + + + // TOOLTIP PLUGIN DEFINITION + // ========================= + + var old = $.fn.tooltip + + $.fn.tooltip = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data && option == 'destroy') return + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(jQuery); + +/* ======================================================================== + * Bootstrap: popover.js v3.1.1 + * http://getbootstrap.com/javascript/#popovers + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // POPOVER PUBLIC CLASS DEFINITION + // =============================== + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') + + Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right', + trigger: 'click', + content: '', + template: '

' + }) + + + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + + Popover.prototype.constructor = Popover + + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } + + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[ // we use append for html objects to maintain js events + this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' + ](content) + + $tip.removeClass('fade top bottom left right in') + + // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do + // this manually by checking the contents. + if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() + } + + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } + + Popover.prototype.getContent = function () { + var $e = this.$element + var o = this.options + + return $e.attr('data-content') + || (typeof o.content == 'function' ? + o.content.call($e[0]) : + o.content) + } + + Popover.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.arrow') + } + + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } + + + // POPOVER PLUGIN DEFINITION + // ========================= + + var old = $.fn.popover + + $.fn.popover = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data && option == 'destroy') return + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.popover.Constructor = Popover + + + // POPOVER NO CONFLICT + // =================== + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + +}(jQuery); + +/* ======================================================================== + * Bootstrap: scrollspy.js v3.1.1 + * http://getbootstrap.com/javascript/#scrollspy + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // SCROLLSPY CLASS DEFINITION + // ========================== + + function ScrollSpy(element, options) { + var href + var process = $.proxy(this.process, this) + + this.$element = $(element).is('body') ? $(window) : $(element) + this.$body = $('body') + this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process) + this.options = $.extend({}, ScrollSpy.DEFAULTS, options) + this.selector = (this.options.target + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + || '') + ' .nav li > a' + this.offsets = $([]) + this.targets = $([]) + this.activeTarget = null + + this.refresh() + this.process() + } + + ScrollSpy.DEFAULTS = { + offset: 10 + } + + ScrollSpy.prototype.refresh = function () { + var offsetMethod = this.$element[0] == window ? 'offset' : 'position' + + this.offsets = $([]) + this.targets = $([]) + + var self = this + var $targets = this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + var href = $el.data('target') || $el.attr('href') + var $href = /^#./.test(href) && $(href) + + return ($href + && $href.length + && $href.is(':visible') + && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } + + ScrollSpy.prototype.process = function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + var maxScroll = scrollHeight - this.$scrollElement.height() + var offsets = this.offsets + var targets = this.targets + var activeTarget = this.activeTarget + var i + + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) && this.activate(i) + } + + if (activeTarget && scrollTop <= offsets[0]) { + return activeTarget != (i = targets[0]) && this.activate(i) + } + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate( targets[i] ) + } + } + + ScrollSpy.prototype.activate = function (target) { + this.activeTarget = target + + $(this.selector) + .parentsUntil(this.options.target, '.active') + .removeClass('active') + + var selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + var active = $(selector) + .parents('li') + .addClass('active') + + if (active.parent('.dropdown-menu').length) { + active = active + .closest('li.dropdown') + .addClass('active') + } + + active.trigger('activate.bs.scrollspy') + } + + + // SCROLLSPY PLUGIN DEFINITION + // =========================== + + var old = $.fn.scrollspy + + $.fn.scrollspy = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.scrollspy') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.scrollspy.Constructor = ScrollSpy + + + // SCROLLSPY NO CONFLICT + // ===================== + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this + } + + + // SCROLLSPY DATA-API + // ================== + + $(window).on('load', function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + $spy.scrollspy($spy.data()) + }) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: tab.js v3.1.1 + * http://getbootstrap.com/javascript/#tabs + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // TAB CLASS DEFINITION + // ==================== + + var Tab = function (element) { + this.element = $(element) + } + + Tab.prototype.show = function () { + var $this = this.element + var $ul = $this.closest('ul:not(.dropdown-menu)') + var selector = $this.data('target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ($this.parent('li').hasClass('active')) return + + var previous = $ul.find('.active:last a')[0] + var e = $.Event('show.bs.tab', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + var $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown.bs.tab', + relatedTarget: previous + }) + }) + } + + Tab.prototype.activate = function (element, container, callback) { + var $active = container.find('> .active') + var transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if (element.parent('.dropdown-menu')) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active + .one($.support.transition.end, next) + .emulateTransitionEnd(150) : + next() + + $active.removeClass('in') + } + + + // TAB PLUGIN DEFINITION + // ===================== + + var old = $.fn.tab + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tab') + + if (!data) $this.data('bs.tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + // TAB NO CONFLICT + // =============== + + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + + // TAB DATA-API + // ============ + + $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: affix.js v3.1.1 + * http://getbootstrap.com/javascript/#affix + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // AFFIX CLASS DEFINITION + // ====================== + + var Affix = function (element, options) { + this.options = $.extend({}, Affix.DEFAULTS, options) + this.$window = $(window) + .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) + + this.$element = $(element) + this.affixed = + this.unpin = + this.pinnedOffset = null + + this.checkPosition() + } + + Affix.RESET = 'affix affix-top affix-bottom' + + Affix.DEFAULTS = { + offset: 0 + } + + Affix.prototype.getPinnedOffset = function () { + if (this.pinnedOffset) return this.pinnedOffset + this.$element.removeClass(Affix.RESET).addClass('affix') + var scrollTop = this.$window.scrollTop() + var position = this.$element.offset() + return (this.pinnedOffset = position.top - scrollTop) + } + + Affix.prototype.checkPositionWithEventLoop = function () { + setTimeout($.proxy(this.checkPosition, this), 1) + } + + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return + + var scrollHeight = $(document).height() + var scrollTop = this.$window.scrollTop() + var position = this.$element.offset() + var offset = this.options.offset + var offsetTop = offset.top + var offsetBottom = offset.bottom + + if (this.affixed == 'top') position.top += scrollTop + + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) + + var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false : + offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' : + offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false + + if (this.affixed === affix) return + if (this.unpin) this.$element.css('top', '') + + var affixType = 'affix' + (affix ? '-' + affix : '') + var e = $.Event(affixType + '.bs.affix') + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + this.affixed = affix + this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null + + this.$element + .removeClass(Affix.RESET) + .addClass(affixType) + .trigger($.Event(affixType.replace('affix', 'affixed'))) + + if (affix == 'bottom') { + this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() }) + } + } + + + // AFFIX PLUGIN DEFINITION + // ======================= + + var old = $.fn.affix + + $.fn.affix = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.affix') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.affix.Constructor = Affix + + + // AFFIX NO CONFLICT + // ================= + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + + // AFFIX DATA-API + // ============== + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + var data = $spy.data() + + data.offset = data.offset || {} + + if (data.offsetBottom) data.offset.bottom = data.offsetBottom + if (data.offsetTop) data.offset.top = data.offsetTop + + $spy.affix(data) + }) + }) + +}(jQuery); diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle old mode 100755 new mode 100644 index ac994cecff..eefc041292 --- a/bbb-video/build.gradle +++ b/bbb-video/build.gradle @@ -1,27 +1,15 @@ -usePlugin 'java' -usePlugin 'war' -usePlugin 'eclipse' +apply plugin: 'java' +apply plugin: 'war' +apply plugin: 'eclipse' version = '0.7' jar.enabled = true archivesBaseName = 'video' -task dependencies(type: Copy) { +task resolveDeps(type: Copy) { into('lib') from configurations.default - from configurations.default.allArtifacts*.file -} - -task resolveDeps(dependsOn: configurations.default.buildArtifacts, type: Copy) { - into('lib') - from configurations.default - from configurations.default.allArtifacts*.file -} - -task resolveDependencies(dependsOn: configurations.default.buildArtifacts, type: Copy) { - into('lib') - from configurations.default - from configurations.default.allArtifacts*.file + from configurations.default.allArtifacts.file } repositories { @@ -61,8 +49,14 @@ repositories { m2compatible = true addArtifactPattern "http://repository.springsource.com/maven/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" addArtifactPattern "http://repository.springsource.com/maven/bundles/release/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" - } - } + } + add(new org.apache.ivy.plugins.resolver.URLResolver()) { + name = "Red5" + m2compatible = true + addArtifactPattern "http://red5.googlecode.com/svn/repository/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" + addArtifactPattern "http://red5.googlecode.com/svn/repository/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" + } + } } dependencies { @@ -75,25 +69,26 @@ 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.3.RELEASE@jar' + providedCompile 'org.springframework:spring-beans:4.0.3.RELEASE@jar' + providedCompile 'org.springframework:spring-context:4.0.3.RELEASE@jar' + providedCompile 'org.springframework:spring-core:4.0.3.RELEASE@jar' // Red5 - providedCompile 'org/red5:red5:1.0r4643@jar' + providedCompile 'org/red5:red5:1.0.2@jar' + providedCompile 'org.red5:red5-io:1.0.3@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' + 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.0.6.RELEASE@jar' + providedCompile 'org.springframework:spring-aop:4.0.3.RELEASE@jar' compile 'aopalliance:aopalliance:1.0@jar' // Java Concurrency In Practice diff --git a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoStreamListener.java b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoStreamListener.java old mode 100755 new mode 100644 diff --git a/bbb-voice-conference/config/freeswitch/conf/autoload_configs/conference.conf.xml b/bbb-voice-conference/config/freeswitch/conf/autoload_configs/conference.conf.xml index 64be8e1f0f..e7e84135cc 100644 --- a/bbb-voice-conference/config/freeswitch/conf/autoload_configs/conference.conf.xml +++ b/bbb-voice-conference/config/freeswitch/conf/autoload_configs/conference.conf.xml @@ -123,6 +123,7 @@ + diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle old mode 100755 new mode 100644 index fe54c6172a..b3b0538e81 --- a/bbb-voice/build.gradle +++ b/bbb-voice/build.gradle @@ -1,27 +1,15 @@ -usePlugin 'java' -usePlugin 'war' -usePlugin 'eclipse' +apply plugin: 'java' +apply plugin: 'war' +apply plugin: 'eclipse' version = '0.7' jar.enabled = true archivesBaseName = 'sip' -task dependencies(type: Copy) { +task resolveDeps(type: Copy) { into('lib') from configurations.default - from configurations.default.allArtifacts*.file -} - -task resolveDeps(dependsOn: configurations.default.buildArtifacts, type: Copy) { - into('lib') - from configurations.default - from configurations.default.allArtifacts*.file -} - -task resolveDependencies(dependsOn: configurations.default.buildArtifacts, type: Copy) { - into('lib') - from configurations.default - from configurations.default.allArtifacts*.file + from configurations.default.allArtifacts.file } repositories { @@ -62,7 +50,13 @@ repositories { addArtifactPattern "http://repository.springsource.com/maven/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" addArtifactPattern "http://repository.springsource.com/maven/bundles/release/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" } - } + add(new org.apache.ivy.plugins.resolver.URLResolver()) { + name = "Red5" + m2compatible = true + addArtifactPattern "http://red5.googlecode.com/svn/repository/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" + addArtifactPattern "http://red5.googlecode.com/svn/repository/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" + } + } } dependencies { @@ -74,26 +68,27 @@ 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.3.RELEASE@jar' + providedCompile 'org.springframework:spring-beans:4.0.3.RELEASE@jar' + providedCompile 'org.springframework:spring-context:4.0.3.RELEASE@jar' + providedCompile 'org.springframework:spring-core:4.0.3.RELEASE@jar' + + // Red5 + providedCompile 'org/red5:red5:1.0.2@jar' + providedCompile 'org.red5:red5-io:1.0.3@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.0.6.RELEASE@jar' + providedCompile 'org.springframework:spring-aop:4.0.3.RELEASE@jar' compile 'aopalliance:aopalliance:1.0@jar' // Java Concurrency In Practice @@ -109,7 +104,10 @@ dependencies { compile 'javax/media:jmf:2.1.1e@jar' - + // Redis pubsub + compile "redis.clients:jedis:2.1.0" + providedCompile 'commons-pool:commons-pool:1.5.6' + compile 'com.google.code.gson:gson:1.7.1' } diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java new file mode 100755 index 0000000000..1a62d21078 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java @@ -0,0 +1,88 @@ +package org.bigbluebutton.voiceconf.messaging; + +public class Constants { + public static final String NAME = "name"; + public static final String HEADER = "header"; + public static final String PAYLOAD = "payload"; + public static final String MEETING_ID = "meeting_id"; + public static final String TIMESTAMP = "timestamp"; + public static final String USER_ID = "userid"; + public static final String RECORDED = "recorded"; + public static final String MEETING_NAME = "meeting_name"; + public static final String VOICE_CONF = "voice_conf"; + public static final String DURATION = "duration"; + public static final String AUTH_TOKEN = "auth_token"; + public static final String ROLE = "role"; + public static final String EXT_USER_ID = "external_user_id"; + public static final String REQUESTER_ID = "requester_id"; + public static final String REPLY_TO = "reply_to"; + public static final String LOWERED_BY = "lowered_by"; + public static final String STREAM = "stream"; + public static final String LOCKED = "locked"; + public static final String SETTINGS = "settings"; + public static final String LOCK = "lock"; + public static final String EXCEPT_USERS = "except_users"; + public static final String STATUS = "status"; + public static final String VALUE = "value"; + public static final String NEW_PRESENTER_ID = "new_presenter_id"; + public static final String NEW_PRESENTER_NAME = "new_presenter_name"; + public static final String ASSIGNED_BY = "assigned_by"; + public static final String RECORDING = "recording"; + public static final String LAYOUT_ID = "layout_id"; + public static final String POLL = "poll"; + public static final String POLL_ID = "poll_id"; + public static final String FORCE = "force"; + public static final String RESPONSE = "response"; + public static final String PRESENTATION_ID = "presentation_id"; + public static final String X_OFFSET = "x_offset"; + public static final String Y_OFFSET = "y_offset"; + public static final String WIDTH_RATIO = "width_ratio"; + public static final String HEIGHT_RATIO = "height_ratio"; + public static final String PAGE = "page"; + public static final String SHARE = "share"; + public static final String PRESENTATIONS = "presentations"; + public static final String MESSAGE_KEY = "message_key"; + public static final String CODE = "code"; + public static final String PRESENTATION_NAME = "presentation_name"; + public static final String NUM_PAGES = "num_pages"; + public static final String MAX_NUM_PAGES = "max_num_pages"; + public static final String PAGES_COMPLETED = "pages_completed"; + public static final String MUTE = "mute"; + public static final String CALLER_ID_NUM = "caller_id_num"; + public static final String CALLER_ID_NAME = "caller_id_name"; + public static final String TALKING = "talking"; + public static final String USER = "user"; + public static final String MUTED = "muted"; + public static final String VOICE_USER = "voice_user"; + public static final String RECORDING_FILE = "recording_file"; + public static final String ANNOTATION = "annotation"; + public static final String WHITEBOARD_ID = "whiteboard_id"; + public static final String ENABLE = "enable"; + public static final String PRESENTER = "presenter"; + public static final String USERS = "users"; + public static final String RAISE_HAND = "raise_hand"; + public static final String HAS_STREAM = "has_stream"; + public static final String WEBCAM_STREAM = "webcam_stream"; + public static final String PHONE_USER = "phone_user"; + public static final String PERMISSIONS = "permissions"; + public static final String VALID = "valid"; + public static final String CHAT_HISTORY = "chat_history"; + public static final String MESSAGE = "message"; + public static final String SET_BY_USER_ID = "set_by_user_id"; + public static final String POLLS = "polls"; + public static final String REASON = "reason"; + public static final String RESPONDER = "responder"; + public static final String PRESENTATION_INFO = "presentation_info"; + public static final String SHAPES = "shapes"; + public static final String SHAPE = "shape"; + public static final String SHAPE_ID = "shape_id"; + public static final String PRESENTATION = "presentation"; + public static final String ID = "id"; + public static final String CURRENT = "current"; + public static final String PAGES = "pages"; + public static final String WEB_USER_ID = "web_user_id"; + public static final String JOINED = "joined"; + public static final String X_PERCENT = "x_percent"; + public static final String Y_PERCENT = "y_percent"; + public static final String KEEP_ALIVE_ID = "keep_alive_id"; +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/GenericObjectPoolConfigWrapper.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/GenericObjectPoolConfigWrapper.java new file mode 100755 index 0000000000..47f3380f18 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/GenericObjectPoolConfigWrapper.java @@ -0,0 +1,142 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.voiceconf.messaging; + +import org.apache.commons.pool.impl.GenericObjectPool; + +public class GenericObjectPoolConfigWrapper { + + private final GenericObjectPool.Config config; + + public GenericObjectPoolConfigWrapper() { + this.config = new GenericObjectPool.Config(); + } + + public GenericObjectPool.Config getConfig() { + return config; + } + + public int getMaxIdle() { + return this.config.maxIdle; + } + + public void setMaxIdle(int maxIdle) { + this.config.maxIdle = maxIdle; + } + + public int getMinIdle() { + return this.config.minIdle; + } + + public void setMinIdle(int minIdle) { + this.config.minIdle = minIdle; + } + + public int getMaxActive() { + return this.config.maxActive; + } + + public void setMaxActive(int maxActive) { + this.config.maxActive = maxActive; + } + + public long getMaxWait() { + return this.config.maxWait; + } + + public void setMaxWait(long maxWait) { + this.config.maxWait = maxWait; + } + + public byte getWhenExhaustedAction() { + return this.config.whenExhaustedAction; + } + + public void setWhenExhaustedAction(byte whenExhaustedAction) { + this.config.whenExhaustedAction = whenExhaustedAction; + } + + public boolean isTestOnBorrow() { + return this.config.testOnBorrow; + } + + public void setTestOnBorrow(boolean testOnBorrow) { + this.config.testOnBorrow = testOnBorrow; + } + + public boolean isTestOnReturn() { + return this.config.testOnReturn; + } + + public void setTestOnReturn(boolean testOnReturn) { + this.config.testOnReturn = testOnReturn; + } + + public boolean isTestWhileIdle() { + return this.config.testWhileIdle; + } + + public void setTestWhileIdle(boolean testWhileIdle) { + this.config.testWhileIdle = testWhileIdle; + } + + public long getTimeBetweenEvictionRunsMillis() { + return this.config.timeBetweenEvictionRunsMillis; + } + + public void setTimeBetweenEvictionRunsMillis( + long timeBetweenEvictionRunsMillis) { + this.config.timeBetweenEvictionRunsMillis = + timeBetweenEvictionRunsMillis; + } + + public int getNumTestsPerEvictionRun() { + return this.config.numTestsPerEvictionRun; + } + + public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) { + this.config.numTestsPerEvictionRun = numTestsPerEvictionRun; + } + + public long getMinEvictableIdleTimeMillis() { + return this.config.minEvictableIdleTimeMillis; + } + + public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) { + this.config.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis; + } + + public long getSoftMinEvictableIdleTimeMillis() { + return this.config.softMinEvictableIdleTimeMillis; + } + + public void setSoftMinEvictableIdleTimeMillis( + long softMinEvictableIdleTimeMillis) { + this.config.softMinEvictableIdleTimeMillis = + softMinEvictableIdleTimeMillis; + } + + public boolean isLifo() { + return this.config.lifo; + } + + public void setLifo(boolean lifo) { + this.config.lifo = lifo; + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java new file mode 100755 index 0000000000..72e5905e54 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java @@ -0,0 +1,6 @@ +package org.bigbluebutton.voiceconf.messaging; + +public interface IMessagingService { + void userConnectedToGlobalAudio(String voiceConf, String callerIdName); + void userDisconnectedFromGlobalAudio(String voiceConf, String callerIdName); +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageBuilder.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageBuilder.java new file mode 100755 index 0000000000..a5c0f8c996 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageBuilder.java @@ -0,0 +1,36 @@ +package org.bigbluebutton.voiceconf.messaging; + +import java.util.concurrent.TimeUnit; + +import com.google.gson.Gson; + +public class MessageBuilder { + public final static String VERSION = "version"; + + public static long generateTimestamp() { + return TimeUnit.NANOSECONDS.toMillis(System.nanoTime()); + } + + public static java.util.HashMap buildHeader(String name, String version, String replyTo) { + java.util.HashMap header = new java.util.HashMap(); + header.put(Constants.NAME, name); + header.put(VERSION, version); + header.put(Constants.TIMESTAMP, generateTimestamp()); + if (replyTo != null && replyTo != "") + header.put(Constants.REPLY_TO, replyTo); + + return header; + } + + + public static String buildJson(java.util.HashMap header, + java.util.HashMap payload) { + + java.util.HashMap> message = new java.util.HashMap>(); + message.put(Constants.HEADER, header); + message.put(Constants.PAYLOAD, payload); + + Gson gson = new Gson(); + return gson.toJson(message); + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageDistributor.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageDistributor.java new file mode 100755 index 0000000000..595bf905cb --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageDistributor.java @@ -0,0 +1,25 @@ +package org.bigbluebutton.voiceconf.messaging; + +import java.util.Set; + +public class MessageDistributor { + private ReceivedMessageHandler handler; + private Set listeners; + + public void setMessageListeners(Set listeners) { + this.listeners = listeners; + } + + public void setMessageHandler(ReceivedMessageHandler handler) { + this.handler = handler; + if (handler != null) { + handler.setMessageDistributor(this); + } + } + + public void notifyListeners(String pattern, String channel, String message) { + for (MessageHandler listener : listeners) { + listener.handleMessage(pattern, channel, message); + } + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageHandler.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageHandler.java new file mode 100755 index 0000000000..b94db88559 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageHandler.java @@ -0,0 +1,23 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.voiceconf.messaging; + +public interface MessageHandler { + void handleMessage(String pattern, String channel, String message); +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java new file mode 100755 index 0000000000..716bbcbb04 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java @@ -0,0 +1,88 @@ +package org.bigbluebutton.voiceconf.messaging; + +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPubSub; + +public class MessageReceiver { + private static Logger log = Red5LoggerFactory.getLogger(MessageReceiver.class, "bigbluebutton"); + + private ReceivedMessageHandler handler; + + private JedisPool redisPool; + private volatile boolean receiveMessage = false; + + private final Executor msgReceiverExec = Executors.newSingleThreadExecutor(); + + public void stop() { + receiveMessage = false; + } + + public void start() { + log.info("Ready to receive messages from Redis pubsub."); + try { + receiveMessage = true; + final Jedis jedis = redisPool.getResource(); + + Runnable messageReceiver = new Runnable() { + public void run() { + if (receiveMessage) { + jedis.psubscribe(new PubSubListener(), MessagingConstants.TO_BBB_APPS_PATTERN); + } + } + }; + msgReceiverExec.execute(messageReceiver); + } catch (Exception e) { + log.error("Error subscribing to channels: " + e.getMessage()); + } + } + + public void setRedisPool(JedisPool redisPool){ + this.redisPool = redisPool; + } + + public void setMessageHandler(ReceivedMessageHandler handler) { + this.handler = handler; + } + + private class PubSubListener extends JedisPubSub { + + public PubSubListener() { + super(); + } + + @Override + public void onMessage(String channel, String message) { + // Not used. + } + + @Override + public void onPMessage(String pattern, String channel, String message) { + handler.handleMessage(pattern, channel, message); + } + + @Override + public void onPSubscribe(String pattern, int subscribedChannels) { + log.debug("Subscribed to the pattern: " + pattern); + } + + @Override + public void onPUnsubscribe(String pattern, int subscribedChannels) { + // Not used. + } + + @Override + public void onSubscribe(String channel, int subscribedChannels) { + // Not used. + } + + @Override + public void onUnsubscribe(String channel, int subscribedChannels) { + // Not used. + } + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageSender.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageSender.java new file mode 100755 index 0000000000..109f00ca0f --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageSender.java @@ -0,0 +1,67 @@ +package org.bigbluebutton.voiceconf.messaging; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; + +public class MessageSender { + private static Logger log = Red5LoggerFactory.getLogger(MessageSender.class, "bigbluebutton"); + + private JedisPool redisPool; + private volatile boolean sendMessage = false; + + private final Executor msgSenderExec = Executors.newSingleThreadExecutor(); + private BlockingQueue messages = new LinkedBlockingQueue(); + + public void stop() { + sendMessage = false; + } + + public void start() { + log.info("Redis message publisher starting!"); + try { + sendMessage = true; + + Runnable messageSender = new Runnable() { + public void run() { + while (sendMessage) { + try { + MessageToSend msg = messages.take(); + publish(msg.getChannel(), msg.getMessage()); + } catch (InterruptedException e) { + log.warn("Failed to get message from queue."); + } + } + } + }; + msgSenderExec.execute(messageSender); + } catch (Exception e) { + log.error("Error subscribing to channels: " + e.getMessage()); + } + } + + public void send(String channel, String message) { + MessageToSend msg = new MessageToSend(channel, message); + messages.add(msg); + } + + private void publish(String channel, String message) { + Jedis jedis = redisPool.getResource(); + try { + jedis.publish(channel, message); + } catch(Exception e){ + log.warn("Cannot publish the message to redis", e); + } finally { + redisPool.returnResource(jedis); + } + } + + public void setRedisPool(JedisPool redisPool){ + this.redisPool = redisPool; + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageToSend.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageToSend.java new file mode 100755 index 0000000000..a72c9c6efe --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageToSend.java @@ -0,0 +1,19 @@ +package org.bigbluebutton.voiceconf.messaging; + +public class MessageToSend { + private final String channel; + private final String message; + + public MessageToSend(String channel, String message) { + this.channel = channel; + this.message = message; + } + + public String getChannel() { + return channel; + } + + public String getMessage() { + return message; + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessagingConstants.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessagingConstants.java new file mode 100755 index 0000000000..c983a7f7bd --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessagingConstants.java @@ -0,0 +1,47 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.voiceconf.messaging; + +public class MessagingConstants { + + public static final String FROM_BBB_APPS_CHANNEL = "bigbluebutton:from-bbb-apps"; + public static final String FROM_BBB_APPS_PATTERN = FROM_BBB_APPS_CHANNEL + ":*"; + public static final String FROM_SYSTEM_CHANNEL = FROM_BBB_APPS_CHANNEL + ":system"; + public static final String FROM_MEETING_CHANNEL = FROM_BBB_APPS_CHANNEL + ":meeting"; + public static final String FROM_PRESENTATION_CHANNEL = FROM_BBB_APPS_CHANNEL + ":presentation"; + public static final String FROM_POLLING_CHANNEL = FROM_BBB_APPS_CHANNEL + ":polling"; + public static final String FROM_USERS_CHANNEL = FROM_BBB_APPS_CHANNEL + ":users"; + public static final String FROM_CHAT_CHANNEL = FROM_BBB_APPS_CHANNEL + ":chat"; + public static final String FROM_WHITEBOARD_CHANNEL = FROM_BBB_APPS_CHANNEL + ":whiteboard"; + + public static final String TO_BBB_APPS_CHANNEL = "bigbluebutton:to-bbb-apps"; + public static final String TO_BBB_APPS_PATTERN = TO_BBB_APPS_CHANNEL + ":*"; + public static final String TO_MEETING_CHANNEL = TO_BBB_APPS_CHANNEL + ":meeting"; + public static final String TO_SYSTEM_CHANNEL = TO_BBB_APPS_CHANNEL + ":system"; + public static final String TO_PRESENTATION_CHANNEL = TO_BBB_APPS_CHANNEL + ":presentation"; + public static final String TO_POLLING_CHANNEL = TO_BBB_APPS_CHANNEL + ":polling"; + public static final String TO_USERS_CHANNEL = TO_BBB_APPS_CHANNEL + ":users"; + public static final String TO_CHAT_CHANNEL = TO_BBB_APPS_CHANNEL + ":chat"; + + + + public static final String USER_DISCONNECTED_FROM_GLOBAL_AUDIO = "user_disconnected_from_global_audio"; + + +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessage.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessage.java new file mode 100755 index 0000000000..82d14824b1 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessage.java @@ -0,0 +1,28 @@ +package org.bigbluebutton.voiceconf.messaging; + +public class ReceivedMessage { + + private final String pattern; + private final String channel; + private final String message; + + public ReceivedMessage(String pattern, String channel, String message) { + this.pattern = pattern; + this.channel = channel; + this.message = message; + } + + public String getPattern() { + return pattern; + } + + public String getChannel() { + return channel; + } + + public String getMessage() { + return message; + } + + +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java new file mode 100755 index 0000000000..596710e10c --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java @@ -0,0 +1,69 @@ +package org.bigbluebutton.voiceconf.messaging; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; + +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +public class ReceivedMessageHandler { + private static Logger log = Red5LoggerFactory.getLogger(ReceivedMessageHandler.class, "bigbluebutton"); + + private BlockingQueue receivedMessages = new LinkedBlockingQueue(); + + private volatile boolean processMessage = false; + + private final Executor msgProcessorExec = Executors.newSingleThreadExecutor(); + + + private MessageDistributor handler; + + public void stop() { + processMessage = false; + } + + public void start() { + log.info("Ready to handle messages from Redis pubsub!"); + + try { + processMessage = true; + + Runnable messageProcessor = new Runnable() { + public void run() { + while (processMessage) { + try { + ReceivedMessage msg = receivedMessages.take(); + processMessage(msg); + } catch (InterruptedException e) { + log.warn("Error while taking received message from queue."); + } + } + } + }; + msgProcessorExec.execute(messageProcessor); + } catch (Exception e) { + log.error("Error subscribing to channels: " + e.getMessage()); + } + } + + private void processMessage(ReceivedMessage msg) { + if (handler != null) { + log.debug("Let's process this message: " + msg.getMessage()); + + handler.notifyListeners(msg.getPattern(), msg.getChannel(), msg.getMessage()); + } else { + log.warn("No listeners interested in messages from Redis!"); + } + } + + public void handleMessage(String pattern, String channel, String message) { + ReceivedMessage rm = new ReceivedMessage(pattern, channel, message); + receivedMessages.add(rm); + } + + public void setMessageDistributor(MessageDistributor h) { + this.handler = h; + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java new file mode 100755 index 0000000000..014ef1fde5 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java @@ -0,0 +1,51 @@ +package org.bigbluebutton.voiceconf.messaging; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.bigbluebutton.voiceconf.messaging.messages.UserConnectedToGlobalAudio; +import org.bigbluebutton.voiceconf.messaging.messages.UserDisconnectedFromGlobalAudio; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +public class RedisMessagingService implements IMessagingService { + private static Logger log = Red5LoggerFactory.getLogger(RedisMessagingService.class, "sip"); + + private static final Pattern CALLERNAME_PATTERN = Pattern.compile("(.*)-bbbID-(.*)$"); + + private MessageSender sender; + + @Override + public void userConnectedToGlobalAudio(String voiceConf, String callerIdName) { + + Matcher matcher = CALLERNAME_PATTERN.matcher(callerIdName); + if (matcher.matches()) { + String userid = matcher.group(1).trim(); + String name = matcher.group(2).trim(); + String json = new UserConnectedToGlobalAudio(voiceConf, userid, name).toJson(); + sender.send(MessagingConstants.TO_MEETING_CHANNEL, json); + } else { + log.warn("Invalid calleridname [{}] in userConnectedToGlobalAudio as it does not match pattern (.*)-bbbID-(.*)"); + String json = new UserConnectedToGlobalAudio(voiceConf, callerIdName, callerIdName).toJson(); + sender.send(MessagingConstants.TO_MEETING_CHANNEL, json); + } + } + + @Override + public void userDisconnectedFromGlobalAudio(String voiceConf, String callerIdName) { + Matcher matcher = CALLERNAME_PATTERN.matcher(callerIdName); + if (matcher.matches()) { + String userid = matcher.group(1).trim(); + String name = matcher.group(2).trim(); + String json = new UserDisconnectedFromGlobalAudio(voiceConf, userid, name).toJson(); + sender.send(MessagingConstants.TO_MEETING_CHANNEL, json); + } else { + log.warn("Invalid calleridname [{}] in userDisconnectedFromGlobalAudio as it does not match pattern (.*)-bbbID-(.*)"); + String json = new UserDisconnectedFromGlobalAudio(voiceConf, callerIdName, callerIdName).toJson(); + sender.send(MessagingConstants.TO_MEETING_CHANNEL, json); + } + } + + public void setRedisMessageSender(MessageSender sender) { + this.sender = sender; + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/messages/UserConnectedToGlobalAudio.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/messages/UserConnectedToGlobalAudio.java new file mode 100755 index 0000000000..75dbe0ef70 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/messages/UserConnectedToGlobalAudio.java @@ -0,0 +1,62 @@ +package org.bigbluebutton.voiceconf.messaging.messages; + +import java.util.HashMap; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.bigbluebutton.voiceconf.messaging.Constants; +import org.bigbluebutton.voiceconf.messaging.MessageBuilder; + + +public class UserConnectedToGlobalAudio { + public static final String USER_CONNECTED_TO_GLOBAL_AUDIO = "user_connected_to_global_audio"; + public static final String VERSION = "0.0.1"; + + public final String voiceConf; + public final String name; + public final String userid; + + + + public UserConnectedToGlobalAudio(String voiceConf, String userid, String name) { + this.voiceConf = voiceConf; + this.userid = userid; + this.name = name; + } + + public String toJson() { + HashMap payload = new HashMap(); + payload.put(Constants.VOICE_CONF, voiceConf); + payload.put(Constants.USER_ID, userid); + payload.put(Constants.NAME, name); + + java.util.HashMap header = MessageBuilder.buildHeader(USER_CONNECTED_TO_GLOBAL_AUDIO, VERSION, null); + + return MessageBuilder.buildJson(header, payload); + } + + public static UserConnectedToGlobalAudio fromJson(String message) { + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + + if (obj.has("header") && obj.has("payload")) { + JsonObject header = (JsonObject) obj.get("header"); + JsonObject payload = (JsonObject) obj.get("payload"); + + if (header.has("name")) { + String messageName = header.get("name").getAsString(); + if (messageName == USER_CONNECTED_TO_GLOBAL_AUDIO) { + if (payload.has(Constants.VOICE_CONF) + && payload.has(Constants.USER_ID) + && payload.has(Constants.NAME)) { + String voiceConf = payload.get(Constants.VOICE_CONF).getAsString(); + String userid = payload.get(Constants.USER_ID).getAsString(); + String name = payload.get(Constants.NAME).getAsString(); + return new UserConnectedToGlobalAudio(voiceConf, userid, name); + } + } + } + } + return null; + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/messages/UserDisconnectedFromGlobalAudio.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/messages/UserDisconnectedFromGlobalAudio.java new file mode 100755 index 0000000000..8588b3ebc8 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/messages/UserDisconnectedFromGlobalAudio.java @@ -0,0 +1,60 @@ +package org.bigbluebutton.voiceconf.messaging.messages; + +import java.util.HashMap; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.bigbluebutton.voiceconf.messaging.Constants; +import org.bigbluebutton.voiceconf.messaging.MessageBuilder; + + +public class UserDisconnectedFromGlobalAudio { + public static final String USER_DISCONNECTED_FROM_GLOBAL_AUDIO = "user_disconnected_from_global_audio"; + public static final String VERSION = "0.0.1"; + + public final String voiceConf; + public final String name; + public final String userid; + + public UserDisconnectedFromGlobalAudio(String voiceConf, String userid, String name) { + this.voiceConf = voiceConf; + this.userid = userid; + this.name = name; + } + + public String toJson() { + HashMap payload = new HashMap(); + payload.put(Constants.VOICE_CONF, voiceConf); + payload.put(Constants.USER_ID, userid); + payload.put(Constants.NAME, name); + + java.util.HashMap header = MessageBuilder.buildHeader(USER_DISCONNECTED_FROM_GLOBAL_AUDIO, VERSION, null); + + return MessageBuilder.buildJson(header, payload); + } + + public static UserDisconnectedFromGlobalAudio fromJson(String message) { + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + + if (obj.has("header") && obj.has("payload")) { + JsonObject header = (JsonObject) obj.get("header"); + JsonObject payload = (JsonObject) obj.get("payload"); + + if (header.has("name")) { + String messageName = header.get("name").getAsString(); + if (messageName == USER_DISCONNECTED_FROM_GLOBAL_AUDIO) { + if (payload.has(Constants.VOICE_CONF) + && payload.has(Constants.USER_ID) + && payload.has(Constants.NAME)) { + String voiceConf = payload.get(Constants.VOICE_CONF).getAsString(); + String userid = payload.get(Constants.USER_ID).getAsString(); + String name = payload.get(Constants.NAME).getAsString(); + return new UserDisconnectedFromGlobalAudio(voiceConf, userid, name); + } + } + } + } + return null; + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/ClientConnection.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/ClientConnection.java index 0d16f6fb57..bdb1f20948 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/ClientConnection.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/ClientConnection.java @@ -43,16 +43,22 @@ private static Logger log = Red5LoggerFactory.getLogger(ClientConnection.class, public void onJoinConferenceSuccess(String publishName, String playName, String codec) { log.debug("Notify client that {} [{}] has joined the conference.", username, userid); - connection.invoke("successfullyJoinedVoiceConferenceCallback", new Object[] {publishName, playName, codec}); + if (connection.isConnected()) { + connection.invoke("successfullyJoinedVoiceConferenceCallback", new Object[] {publishName, playName, codec}); + } } public void onJoinConferenceFail() { log.debug("Notify client that {} [{}] failed to join the conference.", username, userid); - connection.invoke("failedToJoinVoiceConferenceCallback", new Object[] {"onUaCallFailed"}); + if (connection.isConnected()) { + connection.invoke("failedToJoinVoiceConferenceCallback", new Object[] {"onUaCallFailed"}); + } } public void onLeaveConference() { log.debug("Notify client that {} [{}] left the conference.", username, userid); - connection.invoke("disconnectedFromJoinVoiceConferenceCallback", new Object[] {"onUaCallClosed"}); + if (connection.isConnected()) { + connection.invoke("disconnectedFromJoinVoiceConferenceCallback", new Object[] {"onUaCallClosed"}); + } } } diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java index c77a506826..3499ae8d25 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java @@ -25,6 +25,7 @@ import org.bigbluebutton.voiceconf.sip.SipPeerManager; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.IConnection; import org.red5.server.api.Red5; +import org.bigbluebutton.voiceconf.sip.GlobalCall; public class Service { private static Logger log = Red5LoggerFactory.getLogger(Service.class, "sip"); @@ -33,6 +34,27 @@ public class Service { private MessageFormat callExtensionPattern = new MessageFormat("{0}"); + public Boolean call(String peerId, String callerName, String destination, Boolean listenOnly) { + if (listenOnly) { + if (GlobalCall.reservePlaceToCreateGlobal(destination)) { + String extension = callExtensionPattern.format(new String[] { destination }); + try { + sipPeerManager.call(peerId, destination, "GLOBAL_AUDIO_" + destination, extension); + Red5.getConnectionLocal().setAttribute("VOICE_CONF_PEER", peerId); + } catch (PeerNotFoundException e) { + log.error("PeerNotFound {}", peerId); + return false; + } + } + sipPeerManager.connectToGlobalStream(peerId, getClientId(), callerName, destination); + Red5.getConnectionLocal().setAttribute("VOICE_CONF_PEER", peerId); + return true; + } else { + Boolean result = call(peerId, callerName, destination); + return result; + } + } + public Boolean call(String peerId, String callerName, String destination) { String clientId = Red5.getConnectionLocal().getClient().getId(); String userid = getUserId(); diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java index 37a27cf86b..0bff035dfa 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java @@ -26,7 +26,8 @@ import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.event.IEvent; import org.red5.server.api.scope.IScope; import org.red5.server.api.stream.IBroadcastStream; -import org.red5.server.api.stream.IStreamCodecInfo; +import org.red5.codec.IStreamCodecInfo; +import org.red5.codec.StreamCodecInfo; import org.red5.server.api.stream.IStreamListener; import org.red5.server.api.stream.ResourceExistException; import org.red5.server.api.stream.ResourceNotFoundException; @@ -38,11 +39,8 @@ import org.red5.server.messaging.OOBControlMessage; import org.red5.server.messaging.PipeConnectionEvent; import org.red5.server.net.rtmp.event.IRTMPEvent; import org.red5.server.net.rtmp.event.Notify; -import org.red5.server.stream.codec.StreamCodecInfo; import org.red5.server.stream.message.RTMPMessage; - import org.slf4j.Logger; - import org.red5.server.api.stream.IStreamPacket;; public class AudioBroadcastStream implements IBroadcastStream, IProvider, IPipeConnectionListener { diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java index 8c8bf576ca..984e188456 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java @@ -37,7 +37,7 @@ public class CallStream implements StreamObserver { private FlashToSipAudioStream userTalkStream; private SipToFlashAudioStream userListenStream; - private final Codec sipCodec; + public final Codec sipCodec; private final SipConnectInfo connInfo; private final IScope scope; private CallStreamObserver callStreamObserver; @@ -80,6 +80,10 @@ public class CallStream implements StreamObserver { public String getListenStreamName() { return userListenStream.getStreamName(); } + + public Codec getSipCodec() { + return sipCodec; + } public void startTalkStream(IBroadcastStream broadcastStream, IScope scope) throws StreamException { log.debug("userTalkStream setup"); diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java index 70779ac70b..2f3eca5316 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java @@ -18,11 +18,14 @@ */ package org.bigbluebutton.voiceconf.sip; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.zoolu.sip.call.*; import org.zoolu.sip.provider.SipProvider; import org.zoolu.sip.provider.SipStack; import org.zoolu.sip.message.*; import org.zoolu.sdp.*; +import org.bigbluebutton.voiceconf.messaging.IMessagingService; import org.bigbluebutton.voiceconf.red5.CallStreamFactory; import org.bigbluebutton.voiceconf.red5.ClientConnectionManager; import org.bigbluebutton.voiceconf.red5.media.CallStream; @@ -55,7 +58,11 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver private ClientConnectionManager clientConnManager; private final String clientId; private final AudioConferenceProvider portProvider; - private DatagramSocket localSocket; + private DatagramSocket localSocket = null; + private String _callerName; + private String _destination; + private Boolean listeningToGlobal = false; + private IMessagingService messagingService; private enum CallState { UA_IDLE(0), UA_INCOMING_CALL(1), UA_OUTGOING_CALL(2), UA_ONCALL(3); @@ -66,12 +73,18 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver private CallState callState; - public CallAgent(String sipClientRtpIp, SipProvider sipProvider, SipPeerProfile userProfile, AudioConferenceProvider portProvider, String clientId) { + public String getDestination() { + return _destination; + } + + public CallAgent(String sipClientRtpIp, SipProvider sipProvider, SipPeerProfile userProfile, + AudioConferenceProvider portProvider, String clientId, IMessagingService messagingService) { this.sipProvider = sipProvider; this.clientRtpIp = sipClientRtpIp; this.userProfile = userProfile; this.portProvider = portProvider; this.clientId = clientId; + this.messagingService = messagingService; } public String getCallId() { @@ -79,7 +92,7 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver } private void initSessionDescriptor() { - log.debug("initSessionDescriptor"); + log.debug("initSessionDescriptor"); SessionDescriptor newSdp = SdpUtils.createInitialSdp(userProfile.username, this.clientRtpIp, userProfile.audioPort, userProfile.videoPort, userProfile.audioCodecsPrecedence ); @@ -87,7 +100,13 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver log.debug("localSession Descriptor = " + localSession ); } + public Boolean isListeningToGlobal() { + return listeningToGlobal; + } + public void call(String callerName, String destination) { + _callerName = callerName; + _destination = destination; log.debug("{} making a call to {}", callerName, destination); try { localSocket = getLocalAudioSocket(); @@ -131,11 +150,15 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver /** Closes an ongoing, incoming, or pending call */ public void hangup() { + if (callState == CallState.UA_IDLE) return; log.debug("hangup"); - - if (callState == CallState.UA_IDLE) return; - closeVoiceStreams(); - if (call != null) call.hangup(); + if (listeningToGlobal) { + log.debug("Hanging up of a call connected to the global audio stream"); + notifyListenersOfOnCallClosed(); + } else { + closeVoiceStreams(); + if (call != null) call.hangup(); + } callState = CallState.UA_IDLE; } @@ -163,6 +186,10 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver return socket; } + + private boolean isGlobalAudioStream() { + return (_callerName != null && _callerName.startsWith("GLOBAL_AUDIO_")); + } private void createVoiceStreams() { if (callStream != null) { @@ -187,7 +214,11 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver callStream = callStreamFactory.createCallStream(sipCodec, connInfo); callStream.addCallStreamObserver(this); callStream.start(); - notifyListenersOnCallConnected(callStream.getTalkStreamName(), callStream.getListenStreamName()); + if (isGlobalAudioStream()) { + GlobalCall.addGlobalAudioStream(_destination, callStream.getListenStreamName(), sipCodec, connInfo); + } else { + notifyListenersOnCallConnected(callStream.getTalkStreamName(), callStream.getListenStreamName()); + } } catch (Exception e) { log.error("Failed to create Call Stream."); System.out.println(StackTraceUtil.getStackTrace(e)); @@ -214,15 +245,41 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver callStream.stopTalkStream(broadcastStream, scope); } } + + + + public void connectToGlobalStream(String clientId, String callerIdName, String voiceConf) { + listeningToGlobal = true; + _destination = voiceConf; + + String globalAudioStreamName = GlobalCall.getGlobalAudioStream(voiceConf); + while (globalAudioStreamName.equals("reserved")) { + try { + Thread.sleep(100); + } catch (Exception e) { + } + globalAudioStreamName = GlobalCall.getGlobalAudioStream(voiceConf); + } + + + + GlobalCall.addUser(clientId, callerIdName, _destination); + sipCodec = GlobalCall.getRoomCodec(voiceConf); + callState = CallState.UA_ONCALL; + notifyListenersOnCallConnected("", globalAudioStreamName); + log.info("User is has connected to global audio, user=[" + callerIdName + "] voiceConf = [" + voiceConf + "]"); + messagingService.userConnectedToGlobalAudio(voiceConf, callerIdName); + + } private void closeVoiceStreams() { log.debug("Shutting down the voice streams."); - if (callStream != null) { - callStream.stop(); - callStream = null; - } else { - log.debug("Can't shutdown voice stream. callstream is NULL"); - } + if (callStream != null) { + callStream.stop(); + callStream = null; + } else { + log.debug("Can't shutdown voice stream. callstream is NULL"); + } } // ********************** Call callback functions ********************** @@ -260,10 +317,7 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver public void onCallAccepted(Call call, String sdp, Message resp) { log.debug("Received 200/OK. So user has successfully joined the conference."); if (!isCurrentCall(call)) return; - - log.debug("ACCEPTED/CALL."); callState = CallState.UA_ONCALL; - setupSdpAndCodec(sdp); if (userProfile.noOffer) { @@ -330,18 +384,20 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver } private void notifyListenersOfOnCallClosed() { + if (callState == CallState.UA_IDLE) return; + log.debug("notifyListenersOfOnCallClosed for {}", clientId); clientConnManager.leaveConference(clientId); cleanup(); } private void cleanup() { - log.debug("Closing local audio port {}", localSocket.getLocalPort()); - if (localSocket != null) { - localSocket.close(); - } else { - log.debug("Trying to close un-allocated port {}", localSocket.getLocalPort()); - } + if (localSocket == null) return; + + log.debug("Closing local audio port {}", localSocket.getLocalPort()); + if (!listeningToGlobal) { + localSocket.close(); + } } /** Callback function called when arriving a BYE request */ diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java new file mode 100755 index 0000000000..47e2f99097 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java @@ -0,0 +1,83 @@ +package org.bigbluebutton.voiceconf.sip; + + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import org.red5.app.sip.codecs.Codec; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +public class GlobalCall { + private static final Logger log = Red5LoggerFactory.getLogger( GlobalCall.class, "sip" ); + + private static Map roomToStreamMap = new ConcurrentHashMap(); + private static Map roomToCodecMap = new ConcurrentHashMap(); + private static Map globalAudioKeepAliverMap = new ConcurrentHashMap(); + + private static Map voiceConfToListenOnlyUsersMap = new ConcurrentHashMap(); + + public static synchronized boolean reservePlaceToCreateGlobal(String roomName) { + if (roomToStreamMap.containsKey(roomName)) { + log.debug("There's already a global audio stream for room {}, no need to create a new one", roomName); + return false; + } else { + log.debug("Reserving the place to create a global audio stream for room {}", roomName); + roomToStreamMap.put(roomName, "reserved"); + return true; + } + } + + public static synchronized void addGlobalAudioStream(String voiceConf, String globalAudioStreamName, Codec sipCodec, SipConnectInfo connInfo) { + log.debug("Adding a global audio stream to room {}", voiceConf); + roomToStreamMap.put(voiceConf, globalAudioStreamName); + roomToCodecMap.put(voiceConf, sipCodec); + voiceConfToListenOnlyUsersMap.put(voiceConf, new VoiceConfToListenOnlyUsersMap(voiceConf)); + KeepGlobalAudioAlive globalAudioKeepAlive = new KeepGlobalAudioAlive(connInfo.getSocket(), connInfo, sipCodec.getCodecId()); + globalAudioKeepAliverMap.put(voiceConf, globalAudioKeepAlive); + globalAudioKeepAlive.start(); + } + + public static synchronized String getGlobalAudioStream(String voiceConf) { + return roomToStreamMap.get(voiceConf); + } + + public static synchronized boolean removeRoomIfUnused(String voiceConf) { + if (voiceConfToListenOnlyUsersMap.containsKey(voiceConf) && voiceConfToListenOnlyUsersMap.get(voiceConf).numUsers() <= 0) { + removeRoom(voiceConf); + return true; + } else { + return false; + } + } + + private static void removeRoom(String voiceConf) { + log.debug("Removing global audio stream of room {}", voiceConf); + roomToStreamMap.remove(voiceConf); + voiceConfToListenOnlyUsersMap.remove(voiceConf); + roomToCodecMap.remove(voiceConf); + KeepGlobalAudioAlive globalAudioKeepAlive = globalAudioKeepAliverMap.get(voiceConf); + globalAudioKeepAlive.halt(); + globalAudioKeepAliverMap.remove(voiceConf); + } + + public static synchronized void addUser(String clientId, String callerIdName, String voiceConf) { + if (voiceConfToListenOnlyUsersMap.containsKey(voiceConf)) { + VoiceConfToListenOnlyUsersMap map = voiceConfToListenOnlyUsersMap.get(voiceConf); + map.addUser(clientId, callerIdName); + int numUsers = map.numUsers(); + log.debug("Adding new user to voiceConf [{}], current number of users on global stream is {}", voiceConf, numUsers); + } + + } + + public static synchronized ListenOnlyUser removeUser(String clientId, String voiceConf) { + if (voiceConfToListenOnlyUsersMap.containsKey(voiceConf)) { + return voiceConfToListenOnlyUsersMap.get(voiceConf).removeUser(clientId); + } + return null; + } + + public static Codec getRoomCodec(String roomName) { + return roomToCodecMap.get(roomName); + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/KeepAliveUdp.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/KeepAliveUdp.java index a0550a6b9a..9d05eeee05 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/KeepAliveUdp.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/KeepAliveUdp.java @@ -145,13 +145,11 @@ public class KeepAliveUdp extends Thread { try { while(!stop) { sendToken(); - //System.out.print("."); Thread.sleep(delta_time); if (expire>0 && System.currentTimeMillis()>expire) halt(); } } catch (Exception e) { e.printStackTrace(); } - //System.out.println("o"); udp_socket=null; } @@ -165,4 +163,4 @@ public class KeepAliveUdp extends Thread return str+" ("+delta_time+"ms)"; } -} \ No newline at end of file +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/KeepGlobalAudioAlive.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/KeepGlobalAudioAlive.java new file mode 100644 index 0000000000..0f9b0bcb58 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/KeepGlobalAudioAlive.java @@ -0,0 +1,130 @@ +/** +* +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU General Public License as published by the Free Software +* Foundation; either version 2.1 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with BigBlueButton; if not, see . +* +**/ +package org.bigbluebutton.voiceconf.sip; + +import java.io.IOException; +import java.net.DatagramSocket; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Random; +import org.bigbluebutton.voiceconf.red5.media.*; +import org.slf4j.Logger; +import org.bigbluebutton.voiceconf.red5.media.net.RtpPacket; +import org.bigbluebutton.voiceconf.red5.media.net.RtpSocket; +import org.bigbluebutton.voiceconf.sip.SipConnectInfo; +import org.bigbluebutton.voiceconf.util.StackTraceUtil; +import org.red5.logging.Red5LoggerFactory; +import java.lang.InterruptedException; + + +public class KeepGlobalAudioAlive extends Thread { + // Time is in milliseconds + // This time should be less than rtp-timeout-sec to prevent freeswitch from kicking out + // the global audio + private static final long DELTA_TIME_TO_SEND_KEEPALIVE = 60000; + + private static final int RTP_HEADER_SIZE = 12; + private RtpSocket rtpSocket = null; + private int sequenceNum = 0; + private final DatagramSocket srcSocket; + private final SipConnectInfo connInfo; + private boolean marked = false; + private long startTimestamp = 0; + boolean stop=false; + int codecId; + private static Logger log = Red5LoggerFactory.getLogger(KeepGlobalAudioAlive.class, "sip"); + + + public KeepGlobalAudioAlive(DatagramSocket srcSocket, SipConnectInfo connInfo, int codecId) { + this.srcSocket = srcSocket; + this.connInfo = connInfo; + this.codecId = codecId; + + connect(); + } + + public void connect() { + try { + rtpSocket = new RtpSocket(srcSocket, InetAddress.getByName(connInfo.getRemoteAddr()), connInfo.getRemotePort()); + Random rgen = new Random(); + sequenceNum = rgen.nextInt(); + } catch (UnknownHostException e) { + log.error("Failed to connect to {}", connInfo.getRemoteAddr()); + log.error(StackTraceUtil.getStackTrace(e)); + log.error("Rtp sender failed to connect to " + connInfo.getRemoteAddr() + "."); + } + } + + public void run() { + try + { + while(!stop) + { + byte array[]= new byte[]{0,0,0,0}; + sendAudio(array, startTimestamp); + startTimestamp++; + Thread.sleep(DELTA_TIME_TO_SEND_KEEPALIVE); + + } + } + catch (InterruptedException e) { + log.error("Failed to sleep time in keepAlive"); + } + } + + public void halt() + { + stop=true; + } + + + public void sendAudio(byte[] audioData, long timestamp) { + byte[] transcodedAudioDataBuffer = new byte[audioData.length + RTP_HEADER_SIZE]; + System.arraycopy(audioData, 0, transcodedAudioDataBuffer, RTP_HEADER_SIZE, audioData.length); + RtpPacket rtpPacket = new RtpPacket(transcodedAudioDataBuffer, transcodedAudioDataBuffer.length); + if (!marked) { + rtpPacket.setMarker(true); + marked = true; + startTimestamp = System.currentTimeMillis(); + } + rtpPacket.setPadding(false); + rtpPacket.setExtension(false); + rtpPacket.setPayloadType(codecId); + rtpPacket.setSeqNum(sequenceNum++); + rtpPacket.setTimestamp(timestamp); + rtpPacket.setPayloadLength(audioData.length); + try { + rtpSocketSend(rtpPacket); + } catch (StreamException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + log.error("Failed to send data to server."); + } + } + + private synchronized void rtpSocketSend(RtpPacket rtpPacket) throws StreamException { + try { + + rtpSocket.send(rtpPacket); + } catch (IOException e) { + throw new StreamException("Failed to send data to server."); + } + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ListenOnlyUser.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ListenOnlyUser.java new file mode 100755 index 0000000000..67b6d682ee --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ListenOnlyUser.java @@ -0,0 +1,14 @@ +package org.bigbluebutton.voiceconf.sip; + +public class ListenOnlyUser { + + public final String clientId; + public final String callerIdName; + public final String voiceConf; + + public ListenOnlyUser(String clientId, String callerIdName, String voiceConf) { + this.clientId = clientId; + this.callerIdName = callerIdName; + this.voiceConf = voiceConf; + } +} diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java index f30c476d8d..5a4dd9dfbd 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java @@ -20,10 +20,10 @@ package org.bigbluebutton.voiceconf.sip; import java.util.Collection; import java.util.Iterator; -import java.util.concurrent.atomic.AtomicInteger; import org.zoolu.sip.provider.*; import org.zoolu.net.SocketAddress; import org.slf4j.Logger; +import org.bigbluebutton.voiceconf.messaging.IMessagingService; import org.bigbluebutton.voiceconf.red5.CallStreamFactory; import org.bigbluebutton.voiceconf.red5.ClientConnectionManager; import org.red5.logging.Red5LoggerFactory; @@ -43,7 +43,7 @@ public class SipPeer implements SipRegisterAgentListener { private CallStreamFactory callStreamFactory; private CallManager callManager = new CallManager(); - + private IMessagingService messagingService; private SipProvider sipProvider; private String clientRtpIp; private SipRegisterAgent registerAgent; @@ -53,9 +53,12 @@ public class SipPeer implements SipRegisterAgentListener { private boolean registered = false; private SipPeerProfile registeredProfile; - public SipPeer(String id, String sipClientRtpIp, String host, int sipPort, int startAudioPort, int stopAudioPort) { + public SipPeer(String id, String sipClientRtpIp, String host, int sipPort, + int startAudioPort, int stopAudioPort, IMessagingService messagingService) { + this.id = id; this.clientRtpIp = sipClientRtpIp; + this.messagingService = messagingService; audioconfProvider = new AudioConferenceProvider(host, sipPort, startAudioPort, stopAudioPort); initSipProvider(host, sipPort); } @@ -98,7 +101,6 @@ public class SipPeer implements SipRegisterAgentListener { log.debug( "SIPUser register : {}", fromURL ); log.debug( "SIPUser register : {}", registeredProfile.contactUrl ); } - public void call(String clientId, String callerName, String destination) { if (!registered) { @@ -112,13 +114,26 @@ public class SipPeer implements SipRegisterAgentListener { log.warn("We are not registered to FreeSWITCH. However, we will allow {} to call {}.", callerName, destination); // return; } - - SipPeerProfile callerProfile = SipPeerProfile.copy(registeredProfile); - CallAgent ca = new CallAgent(this.clientRtpIp, sipProvider, callerProfile, audioconfProvider, clientId); + + CallAgent ca = createCallAgent(clientId); + + ca.call(callerName, destination); + } + + public void connectToGlobalStream(String clientId, String callerIdName, String destination) { + CallAgent ca = createCallAgent(clientId); + + ca.connectToGlobalStream(clientId, callerIdName, destination); + } + + private CallAgent createCallAgent(String clientId) { + SipPeerProfile callerProfile = SipPeerProfile.copy(registeredProfile); + CallAgent ca = new CallAgent(this.clientRtpIp, sipProvider, callerProfile, audioconfProvider, clientId, messagingService); ca.setClientConnectionManager(clientConnManager); ca.setCallStreamFactory(callStreamFactory); callManager.add(ca); - ca.call(callerName, destination); + + return ca; } public void close() { @@ -134,11 +149,30 @@ public class SipPeer implements SipRegisterAgentListener { } public void hangup(String clientId) { - log.debug( "SIPUser hangup" ); + log.debug( "SIPUser hangup" ); + + CallAgent ca = callManager.remove(clientId); - CallAgent ca = callManager.remove(clientId); if (ca != null) { - ca.hangup(); + if (ca.isListeningToGlobal()) { + String destination = ca.getDestination(); + ListenOnlyUser lou = GlobalCall.removeUser(clientId, destination); + if (lou != null) { + log.info("User has disconnected from global audio, user [{}] voiceConf {}", lou.callerIdName, lou.voiceConf); + messagingService.userDisconnectedFromGlobalAudio(lou.voiceConf, lou.callerIdName); + } + ca.hangup(); + + boolean roomRemoved = GlobalCall.removeRoomIfUnused(destination); + log.debug("Should the global connection be removed? {}", roomRemoved? "yes": "no"); + if (roomRemoved) { + log.debug("Hanging up the global audio call {}", destination); + CallAgent caGlobal = callManager.remove(destination); + caGlobal.hangup(); + } + } else { + ca.hangup(); + } } } @@ -150,7 +184,7 @@ public class SipPeer implements SipRegisterAgentListener { CallAgent ca = (CallAgent) iter.next(); ca.hangup(); } - + if (registerAgent != null) { registerAgent.unregister(); registerAgent = null; diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java index 1cf00fbd6c..8ea7c2c148 100755 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java @@ -20,6 +20,7 @@ package org.bigbluebutton.voiceconf.sip; import org.slf4j.Logger; import org.zoolu.sip.provider.SipStack; +import org.bigbluebutton.voiceconf.messaging.IMessagingService; import org.bigbluebutton.voiceconf.red5.CallStreamFactory; import org.bigbluebutton.voiceconf.red5.ClientConnectionManager; import org.red5.logging.Red5LoggerFactory; @@ -38,6 +39,7 @@ public final class SipPeerManager { private ClientConnectionManager clientConnManager; private CallStreamFactory callStreamFactory; + private IMessagingService messagingService; private Map sipPeers; private int sipStackDebugLevel = 8; @@ -48,7 +50,7 @@ public final class SipPeerManager { } public void createSipPeer(String peerId, String clientRtpIp, String host, int sipPort, int startRtpPort, int stopRtpPort) { - SipPeer sipPeer = new SipPeer(peerId, clientRtpIp, host, sipPort, startRtpPort, stopRtpPort); + SipPeer sipPeer = new SipPeer(peerId, clientRtpIp, host, sipPort, startRtpPort, stopRtpPort, messagingService); sipPeer.setClientConnectionManager(clientConnManager); sipPeer.setCallStreamFactory(callStreamFactory); sipPeers.put(peerId, sipPeer); @@ -65,7 +67,7 @@ public final class SipPeerManager { if (sipPeer == null) throw new PeerNotFoundException("Can't find sip peer " + peerId); sipPeer.call(clientId, callerName, destination); } - + public void unregister(String userid) { SipPeer sipUser = sipPeers.get(userid); if (sipUser != null) { @@ -100,6 +102,13 @@ public final class SipPeerManager { sipPeers.remove(userid); } + public void connectToGlobalStream(String peerId, String clientId, String callerIdName, String destination) { + SipPeer sipUser = sipPeers.get(peerId); + if (sipUser != null) { + sipUser.connectToGlobalStream(clientId, callerIdName, destination); + } + } + public void close(String userid) { SipPeer sipUser = sipPeers.get(userid); if (sipUser != null) { @@ -141,4 +150,8 @@ public final class SipPeerManager { public void setClientConnectionManager(ClientConnectionManager ccm) { clientConnManager = ccm; } + + public void setMessagingService(IMessagingService service) { + messagingService = service; + } } diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/VoiceConfToListenOnlyUsersMap.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/VoiceConfToListenOnlyUsersMap.java new file mode 100755 index 0000000000..84d647cce0 --- /dev/null +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/VoiceConfToListenOnlyUsersMap.java @@ -0,0 +1,26 @@ +package org.bigbluebutton.voiceconf.sip; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class VoiceConfToListenOnlyUsersMap { + private Map listenOnlyUsers = new ConcurrentHashMap(); + + public final String voiceConf; + + public VoiceConfToListenOnlyUsersMap(String voiceConf) { + this.voiceConf = voiceConf; + } + + public void addUser(String clientId, String callerIdName) { + listenOnlyUsers.put(clientId, new ListenOnlyUser(clientId, callerIdName, voiceConf)); + } + + public ListenOnlyUser removeUser(String clientId) { + return listenOnlyUsers.remove(clientId); + } + + public int numUsers() { + return listenOnlyUsers.size(); + } +} diff --git a/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java b/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java index 9239ad7ab1..9ae660ec13 100755 --- a/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java +++ b/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java @@ -8,7 +8,8 @@ import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.event.IEvent; import org.red5.server.api.scope.IScope; import org.red5.server.api.stream.IBroadcastStream; -import org.red5.server.api.stream.IStreamCodecInfo; +import org.red5.codec.IStreamCodecInfo; +import org.red5.codec.StreamCodecInfo; import org.red5.server.api.stream.IStreamListener; import org.red5.server.api.stream.ResourceExistException; import org.red5.server.api.stream.ResourceNotFoundException; @@ -20,7 +21,6 @@ import org.red5.server.messaging.OOBControlMessage; import org.red5.server.messaging.PipeConnectionEvent; import org.red5.server.net.rtmp.event.IRTMPEvent; import org.red5.server.net.rtmp.event.Notify; -import org.red5.server.stream.codec.StreamCodecInfo; import org.red5.server.stream.message.RTMPMessage; import org.slf4j.Logger; import org.red5.server.api.stream.IStreamPacket;; diff --git a/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml b/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml new file mode 100755 index 0000000000..536588174e --- /dev/null +++ b/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + diff --git a/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-pool.xml b/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-pool.xml new file mode 100755 index 0000000000..b30253c682 --- /dev/null +++ b/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-pool.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 444a1e730f..fda685c102 100755 --- a/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties +++ b/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties @@ -17,10 +17,10 @@ freeswitch.port=5060 startAudioPort=15000 stopAudioPort=16383 -# An extension pattern, in case your asterisk extensions.conf -# uses a naming convetion for your meeting rooms -# e.g. conf-85115 instead of just 85115 -callExtensionPattern={0} +redis.host=127.0.0.1 +redis.port=6379 +redis.pass= + # 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). diff --git a/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml b/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml index 04b2c882b2..df02df9dcc 100755 --- a/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml +++ b/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml @@ -22,8 +22,10 @@ with BigBlueButton; if not, see . + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/lang + http://www.springframework.org/schema/lang/spring-lang-2.0.xsd"> @@ -67,8 +69,13 @@ with BigBlueButton; if not, see . + + - + + + + diff --git a/bbb.sh b/bbb.sh new file mode 100755 index 0000000000..5df1480b49 --- /dev/null +++ b/bbb.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -x + +RED5_DIR=/usr/share/red5 +BBB_DIR=$(pwd) + +cd $BBB_DIR + +DESKSHARE=$BBB_DIR/deskshare +VOICE=$BBB_DIR/bbb-voice +VIDEO=$BBB_DIR/bbb-video +APPS=$BBB_DIR/bigbluebutton-apps + +echo "Building apps" +cd $APPS +gradle resolveDeps +gradle clean war deploy + +echo "Building voice" +cd $VOICE +gradle resolveDeps +gradle clean war deploy + +echo "Building video" +cd $VIDEO +gradle resolveDeps +gradle clean war deploy + +echo "Building deskshare" +cd $DESKSHARE +gradle resolveDeps +cd $DESKSHARE/app +gradle clean war deploy + +cd $BBB_DIR + +sudo chown -R red5.adm $RED5_DIR +sudo chmod -R 777 $RED5_DIR/webapps/ + diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle old mode 100755 new mode 100644 index 862eb0e4e0..bf2a88c347 --- a/bigbluebutton-apps/build.gradle +++ b/bigbluebutton-apps/build.gradle @@ -1,7 +1,7 @@ -usePlugin 'scala' -usePlugin 'java' -usePlugin 'war' -usePlugin 'eclipse' +apply plugin: 'scala' +apply plugin: 'java' +apply plugin: 'war' +apply plugin: 'eclipse' version = '0.8' jar.enabled = true @@ -10,112 +10,121 @@ def appName = 'bigbluebutton' archivesBaseName = appName -task resolveDeps(dependsOn: configurations.default.buildArtifacts, type: Copy) { +task resolveDeps(type: Copy) { into('lib') from configurations.default - from configurations.default.allArtifacts*.file + from configurations.default.allArtifacts.file } repositories { - add(new org.apache.ivy.plugins.resolver.ChainResolver()) { - name = 'remote' - returnFirst = true - add(new org.apache.ivy.plugins.resolver.URLResolver()) { - name = "googlecode" - addArtifactPattern "http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]" - addArtifactPattern "http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]" - } - add(new org.apache.ivy.plugins.resolver.URLResolver()) { - name = "blindside-repos" - addArtifactPattern "http://blindside.googlecode.com/svn/repository/[artifact](-[revision]).[ext]" - addArtifactPattern "http://blindside.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]" - } + add(new org.apache.ivy.plugins.resolver.ChainResolver()) { + name = 'remote' + returnFirst = true add(new org.apache.ivy.plugins.resolver.URLResolver()) { - name = "maven2-central" - m2compatible = true - addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact](-[revision]).[ext]" - addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]" - } - add(new org.apache.ivy.plugins.resolver.URLResolver()) { - name = "testng_ibiblio_maven2" - m2compatible = true - addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact](-[revision])-jdk15.[ext]" - addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision])-jdk15.[ext]" - } - add(new org.apache.ivy.plugins.resolver.URLResolver()) { - name = "netty-dependency" - m2compatible = true - addArtifactPattern "http://repository.jboss.org/nexus/content/groups/public-jboss/[organisation]/[module]/[revision]/[artifact](-[revision]).[ext]" - addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]" + name = "googlecode" + addArtifactPattern "http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]" + addArtifactPattern "http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]" } - add(new org.apache.ivy.plugins.resolver.URLResolver()) { - name = "spring-bundles" - m2compatible = true - addArtifactPattern "http://repository.springsource.com/maven/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" - addArtifactPattern "http://repository.springsource.com/maven/bundles/release/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" - } - } + add(new org.apache.ivy.plugins.resolver.URLResolver()) { + name = "blindside-repos" + addArtifactPattern "http://blindside.googlecode.com/svn/repository/[artifact](-[revision]).[ext]" + addArtifactPattern "http://blindside.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]" + } + add(new org.apache.ivy.plugins.resolver.URLResolver()) { + name = "maven2-central" + m2compatible = true + addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact](-[revision]).[ext]" + addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]" + } + add(new org.apache.ivy.plugins.resolver.URLResolver()) { + name = "testng_ibiblio_maven2" + m2compatible = true + addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact](-[revision])-jdk15.[ext]" + addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision])-jdk15.[ext]" + } + add(new org.apache.ivy.plugins.resolver.URLResolver()) { + name = "netty-dependency" + m2compatible = true + addArtifactPattern "http://repository.jboss.org/nexus/content/groups/public-jboss/[organisation]/[module]/[revision]/[artifact](-[revision]).[ext]" + addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]" + } + add(new org.apache.ivy.plugins.resolver.URLResolver()) { + name = "spring-bundles" + m2compatible = true + addArtifactPattern "http://repository.springsource.com/maven/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" + addArtifactPattern "http://repository.springsource.com/maven/bundles/release/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" + } + } } dependencies { - // Servlet - providedCompile 'javax.servlet:servlet-api:2.5@jar' - - // Mina - providedCompile 'org.apache.mina:mina-core:2.0.7@jar' - 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' + // Servlet + providedCompile 'javax.servlet:servlet-api:2.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.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' + // Mina + providedCompile 'org.apache.mina:mina-core:2.0.7@jar' + 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:4.0.3.RELEASE@jar' + providedCompile 'org.springframework:spring-beans:4.0.3.RELEASE@jar' + providedCompile 'org.springframework:spring-context:4.0.3.RELEASE@jar' + providedCompile 'org.springframework:spring-core:4.0.3.RELEASE@jar' + + // Red5 + providedCompile 'org/red5:red5:1.0.2@jar' - //redis - compile 'redis.clients:jedis:2.0.0' - providedCompile 'commons-pool:commons-pool:1.5.6' + // 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' + } + + // 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.0.3.RELEASE@jar' + compile 'aopalliance:aopalliance:1.0@jar' + + // Testing + compile 'org.testng:testng:5.8@jar' + compile 'org.easymock:easymock:2.4@jar' + + //redis + //compile 'redis.clients:jedis:2.0.0' + providedCompile 'commons-pool:commons-pool:1.5.6' - // 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' + // 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' - // Libraries needed for scala api - compile 'org.scala-lang:scala-library:2.9.2' - + // Libraries needed for scala api + compile 'org.scala-lang:scala-library:2.9.2' + + // workaround for http://issues.gradle.org/browse/GRADLE-1273 + //compileScala.classpath = sourceSets.main.compileClasspath + files(sourceSets.main.classesDir) + //compileTestScala.classpath = sourceSets.test.compileClasspath + files(sourceSets.test.classesDir) + // Freeswitch ESL Client compile 'org/freeswitch:fs-esl-client:0.8.2@jar' 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 { - useTestNG() + useTestNG() } war.doLast { @@ -124,13 +133,12 @@ war.doLast { task deploy() << { - def red5AppsDir = '/usr/share/red5/webapps' - def bbbDir = new File("${red5AppsDir}/$appName") - println "Deleting $bbbDir" - ant.delete(dir: bbbDir) - ant.mkdir(dir: bbbDir) - ant.copy(todir: bbbDir) { - fileset(dir: "$buildDir/$appName") - } + def red5AppsDir = '/usr/share/red5/webapps' + def bbbDir = new File("${red5AppsDir}/$appName") + ant.delete(dir: bbbDir) + ant.mkdir(dir: bbbDir) + ant.copy(todir: bbbDir) { + fileset(dir: "$buildDir/$appName") + } } diff --git a/bigbluebutton-apps/gradle.properties b/bigbluebutton-apps/gradle.properties new file mode 100644 index 0000000000..a0cdfb5b63 --- /dev/null +++ b/bigbluebutton-apps/gradle.properties @@ -0,0 +1,16 @@ +## Dependecies Version + +# Logging +log4jVersion = 1.2.17 +slf4jVersion = 1.6.6 + +# Common libraries +springVersion = 3.1.4.RELEASE +springRedisVersion = 1.1.0.RELEASE +jacksonVersion = 1.8.3 + +# Testing +junitVersion = 4.8.1 +mockitoVersion = 1.8.5 + + diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java old mode 100755 new mode 100644 index f056b9cd27..9110aab0d4 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java @@ -22,9 +22,11 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.red5.server.api.Red5; import org.bigbluebutton.conference.service.lock.LockSettings; +import org.red5.server.api.Red5; +import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService; import org.bigbluebutton.conference.service.participants.ParticipantsApplication; import org.bigbluebutton.conference.service.recorder.RecorderApplication; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; import org.red5.logging.Red5LoggerFactory; import org.red5.server.adapter.IApplication; import org.red5.server.adapter.MultiThreadedApplicationAdapter; @@ -44,6 +46,7 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter { private RecorderApplication recorderApplication; private AbstractApplicationContext appCtx; private ConnectionInvokerService connInvokerService; + private IBigBlueButtonInGW bbbGW; private static final String APP = "BBB"; @@ -92,15 +95,14 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter { appCtx.registerShutdownHook(); super.appStart(app); - connInvokerService.start(); - + connInvokerService.setAppScope(app); + return true; } @Override public void appStop(IScope app) { log.debug("***** " + APP + " [ " + " appStop [ " + scope.getName() + "] *********"); - connInvokerService.stop(); super.appStop(app); } @@ -116,7 +118,8 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter { public void roomStop(IScope room) { log.debug("***** " + APP + " [ " + " roomStop [ " + scope.getName() + "] *********"); - participantsApplication.destroyRoom(room.getName()); +// bbbGW.destroyMeeting(room.getName()); + recorderApplication.destroyRecordSession(room.getName()); connInvokerService.removeScope(room.getName()); @@ -156,9 +159,7 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter { lsMap = new HashMap(); } } - - - + if (record == true) { recorderApplication.createRecordSession(room); } @@ -166,11 +167,13 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter { BigBlueButtonSession bbbSession = new BigBlueButtonSession(room, internalUserID, username, role, voiceBridge, record, externalUserID, muted); connection.setAttribute(Constants.SESSION, bbbSession); + connection.setAttribute("INTERNAL_USER_ID", internalUserID); String debugInfo = "internalUserID=" + internalUserID + ",username=" + username + ",role=" + role + "," + ",voiceConf=" + voiceBridge + ",room=" + room + ",externalUserid=" + externalUserID; log.debug("User [{}] connected to room [{}]", debugInfo, room); - participantsApplication.createRoom(room, locked, new LockSettings(lsMap)); + + bbbGW.initLockSettings(room, locked, lsMap); connInvokerService.addConnection(bbbSession.getInternalUserID(), connection); @@ -191,13 +194,32 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter { BigBlueButtonSession bbbSession = (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); log.info("User [" + bbbSession.getUsername() + "] disconnected from room [" + bbbSession.getRoom() +"]"); + + bbbGW.userLeft(bbbSession.getRoom(), getBbbSession().getInternalUserID()); + super.roomDisconnect(conn); } - public String getMyUserId() { + public void validateToken(String token) { BigBlueButtonSession bbbSession = (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); assert bbbSession != null; - return bbbSession.getInternalUserID(); + String userId = bbbSession.getInternalUserID(); + String meetingId = Red5.getConnectionLocal().getScope().getName(); + bbbGW.validateAuthToken(meetingId, userId, token, meetingId + "/" + userId); + } + + public void joinMeeting(String userId) { + BigBlueButtonSession bbbSession = getBbbSession(); + if (bbbSession != null) { + String userid = bbbSession.getInternalUserID(); + String username = bbbSession.getUsername(); + String role = bbbSession.getRole(); + String meetingId = bbbSession.getRoom(); + log.debug(APP + ":joinMeeting - [" + meetingId + "] [" + userid + ", " + username + ", " + role + "]"); + + bbbGW.userJoin(meetingId, userid); + } + } public void setParticipantsApplication(ParticipantsApplication a) { @@ -223,13 +245,16 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter { this.connInvokerService = connInvokerService; } + public void setBigBlueButtonInGW(IBigBlueButtonInGW bbbGW) { + this.bbbGW = bbbGW; + } + private class ShutdownHookListener implements ApplicationListener { @Override public void onApplicationEvent(ApplicationEvent event) { if (event instanceof org.springframework.context.event.ContextStoppedEvent) { log.info("Received shutdown event. Red5 is shutting down. Destroying all rooms."); - participantsApplication.destroyAllRooms(); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonService.java deleted file mode 100755 index 71869cd32a..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonService.java +++ /dev/null @@ -1,52 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.red5.server.api.Red5; - -public class BigBlueButtonService { - private ConnectionInvokerService connInvokerService; - - public void sendMessage(HashMap params) { - - Map messageToSend = new HashMap(); - - for (Iterator it = params.keySet().iterator(); it.hasNext();) { - String key = it.next(); - messageToSend.put(key, params.get(key)); - } - - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), (String) params.get("messageID"), messageToSend); - connInvokerService.sendMessage(m); - } - - private String getMeetingId(){ - return Red5.getConnectionLocal().getScope().getName(); - } - - public void setConnInvokerService(ConnectionInvokerService connInvokerService) { - this.connInvokerService = connInvokerService; - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ConnectionInvokerService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ConnectionInvokerService.java deleted file mode 100755 index 38d80443be..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ConnectionInvokerService.java +++ /dev/null @@ -1,129 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import java.util.concurrent.LinkedBlockingQueue; - -import org.red5.server.api.IConnection; -import org.red5.server.api.scope.IScope; -import org.red5.server.api.service.ServiceUtils; - -public class ConnectionInvokerService { - - private static final int NTHREADS = 1; - private static final Executor exec = Executors.newFixedThreadPool(NTHREADS); - - private BlockingQueue messages; - - private ConcurrentHashMap connections; - private ConcurrentHashMap scopes; - - private volatile boolean sendMessages = false; - - public ConnectionInvokerService() { - messages = new LinkedBlockingQueue(); - - connections = new ConcurrentHashMap(); - scopes = new ConcurrentHashMap(); - } - - public void addConnection(String id, IConnection conn) { - if (connections == null) { - System.out.println("Connections is null!!!!"); - return; - } - if (id == null) { - System.out.println("CONN ID IS NULL!!!"); - - } - if (conn == null) { - System.out.println("CONN IS NULL"); - } - connections.putIfAbsent(id, conn); - } - - public void start() { - sendMessages = true; - Runnable sender = new Runnable() { - public void run() { - while (sendMessages) { - ClientMessage message; - try { - message = messages.take(); - sendMessageToClient(message); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - } - }; - exec.execute(sender); - } - - public void stop() { - sendMessages = false; - } - - public void removeConnection(String id) { - connections.remove(id); - } - - public void addScope(String id, IScope scope) { - scopes.putIfAbsent(id, scope); - } - - public void removeScope(String id) { - scopes.remove(id); - } - - public void sendMessage(final ClientMessage message) { - messages.offer(message); - } - - private void sendMessageToClient(ClientMessage message) { - if (message.getType().equals(ClientMessage.BROADCAST)) { - IScope scope = scopes.get(message.getDest()); - if (scope != null) { - List params = new ArrayList(); - params.add(message.getMessageName()); - params.add(message.getMessage()); - ServiceUtils.invokeOnAllScopeConnections(scope, "onMessageFromServer", params.toArray(), null); - } - } else if (message.getType().equals(ClientMessage.DIRECT)) { - IConnection conn = connections.get(message.getDest()); - if (conn != null) { - if (conn.isConnected()) { - List params = new ArrayList(); - params.add(message.getMessageName()); - params.add(message.getMessage()); - ServiceUtils.invokeOnConnection(conn, "onMessageFromServer", params.toArray()); - } - } - } - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/IRoomListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/IRoomListener.java deleted file mode 100755 index 823daa4d95..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/IRoomListener.java +++ /dev/null @@ -1,35 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference; - -import java.util.ArrayList; -import java.util.Map; - -public interface IRoomListener { - public String getName(); - - public void lockSettingsChange(Map lockSettings); - public void participantStatusChange(User p, String status, Object value); - public void participantJoined(User participant); - public void participantLeft(User participant); - public void assignPresenter(ArrayList presenter); - public void endAndKickAll(); - public void recordingStatusChange(User p, Boolean recording); -} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java deleted file mode 100755 index 0e6ff1670c..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java +++ /dev/null @@ -1,123 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import org.bigbluebutton.conference.service.messaging.MessagingConstants; -import org.bigbluebutton.conference.service.messaging.MessagingService; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -import com.google.gson.Gson; - - -public class ParticipantUpdatingRoomListener implements IRoomListener{ - - private static Logger log = Red5LoggerFactory.getLogger(ParticipantUpdatingRoomListener.class, "bigbluebutton"); - - MessagingService messagingService; - private Room room; - - public ParticipantUpdatingRoomListener(Room room, MessagingService messagingService) { - this.room = room; - this.messagingService=messagingService; - } - - public String getName() { - return "PARTICIPANT:UPDATE:ROOM"; - } - - public void participantStatusChange(User p, String status, Object value){ - if (messagingService != null) { - HashMap map= new HashMap(); - map.put("meetingId", this.room.getName()); - map.put("messageId", MessagingConstants.USER_STATUS_CHANGE_EVENT); - - map.put("internalUserId", p.getInternalUserID()); - map.put("status", status); - map.put("value", value.toString()); - - Gson gson= new Gson(); - messagingService.send(MessagingConstants.PARTICIPANTS_CHANNEL, gson.toJson(map)); - log.debug("Publishing a status change in: " + this.room.getName()); - } - } - - public void participantJoined(User p) { - if (messagingService != null) { - HashMap map= new HashMap(); - map.put("meetingId", this.room.getName()); - map.put("messageId", MessagingConstants.USER_JOINED_EVENT); - map.put("internalUserId", p.getInternalUserID()); - map.put("externalUserId", p.getExternalUserID()); - map.put("fullname", p.getName()); - map.put("role", p.getRole()); - - Gson gson= new Gson(); - messagingService.send(MessagingConstants.PARTICIPANTS_CHANNEL, gson.toJson(map)); - log.debug("Publishing message participant joined in " + this.room.getName()); - } - } - - public void participantLeft(User p) { - if (messagingService != null) { - HashMap map= new HashMap(); - map.put("meetingId", this.room.getName()); - map.put("messageId", MessagingConstants.USER_LEFT_EVENT); - map.put("internalUserId", p.getInternalUserID()); - - Gson gson= new Gson(); - messagingService.send(MessagingConstants.PARTICIPANTS_CHANNEL, gson.toJson(map)); - log.debug("Publishing message participant left in " + this.room.getName()); - } - } - - public void assignPresenter(ArrayList presenter) { - // Do nothing. - } - - public void endAndKickAll() { - // no-op - } - - @Override - public void lockSettingsChange(Map lockSettings) { - // Do nothing - } - - public void recordingStatusChange(User p, Boolean recording){ - if (messagingService != null) { - HashMap map= new HashMap(); - map.put("meetingId", this.room.getName()); - map.put("messageId", MessagingConstants.RECORD_STATUS_EVENT); - - map.put("internalUserId", p.getInternalUserID()); - map.put("value", recording.toString()); - - Gson gson= new Gson(); - messagingService.send(MessagingConstants.PARTICIPANTS_CHANNEL, gson.toJson(map)); - log.debug("Publishing a recording status change in: " + this.room.getName()); - } - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java deleted file mode 100755 index 1c1b4084e4..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java +++ /dev/null @@ -1,240 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import net.jcip.annotations.ThreadSafe; - -import org.bigbluebutton.conference.service.lock.LockSettings; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; -/** - * Contains information about a Room and it's Participants. - * Encapsulates Participants and RoomListeners. - */ -@ThreadSafe -public class Room implements Serializable { - private static Logger log = Red5LoggerFactory.getLogger( Room.class, "bigbluebutton" ); - ArrayList currentPresenter = null; - private String name; - private Map participants; - private Boolean locked; - private LockSettings lockSettings = null; - private Boolean recording = false; - - // these should stay transient so they're not serialized in ActiveMQ messages: - //private transient Map unmodifiableMap; - private transient final Map listeners; - - public Room(String name, Boolean locked, LockSettings lockSettings) { - this.name = name; - this.locked = locked; - this.lockSettings = lockSettings; - - participants = new ConcurrentHashMap(); - //unmodifiableMap = Collections.unmodifiableMap(participants); - listeners = new ConcurrentHashMap(); - } - - public String getName() { - return name; - } - - public void addRoomListener(IRoomListener listener) { - if (! listeners.containsKey(listener.getName())) { - log.debug("adding room listener"); - listeners.put(listener.getName(), listener); - } - } - - public void removeRoomListener(IRoomListener listener) { - log.debug("removing room listener"); - listeners.remove(listener); - } - - public void addParticipant(User participant) { - synchronized (this) { - log.debug("adding participant " + participant.getInternalUserID()); - participants.put(participant.getInternalUserID(), participant); -// unmodifiableMap = Collections.unmodifiableMap(participants) - } - log.debug("Informing roomlisteners " + listeners.size()); - for (Iterator it = listeners.values().iterator(); it.hasNext();) { - IRoomListener listener = (IRoomListener) it.next(); - log.debug("calling participantJoined on listener " + listener.getName()); - listener.participantJoined(participant); - } - } - - public void removeParticipant(String userid) { - boolean present = false; - User p = null; - synchronized (this) { - present = participants.containsKey(userid); - if (present) { - log.debug("removing participant"); - p = participants.remove(userid); - } - } - if (present) { - for (Iterator it = listeners.values().iterator(); it.hasNext();) { - IRoomListener listener = (IRoomListener) it.next(); - log.debug("calling participantLeft on listener " + listener.getName()); - listener.participantLeft(p); - } - } - - // When the last participant leaves the conference, if it's still recording - // we will finish the recording. The problem it will avoid is that when the last - // participant leaves the conference, the Room is cleaned up and the recording - // flag is lost. If a user joins after that, but before the meeting get cleaned up - // by the server, there's no way to detect that the previous part of the session - // was being recorded. - if (participants.isEmpty() && recording) { - changeRecordingStatus(p, false); - } - } - - public void changeParticipantStatus(String userid, String status, Object value) { - boolean present = false; - User p = null; - synchronized (this) { - present = participants.containsKey(userid); - if (present) { - log.debug("change participant status"); - p = participants.get(userid); - p.setStatus(status, value); - //participants.put(userid, p); - //unmodifiableMap = Collections.unmodifiableMap(participants); - } - } - if (present) { - for (Iterator it = listeners.values().iterator(); it.hasNext();) { - IRoomListener listener = (IRoomListener) it.next(); - log.debug("calling participantStatusChange on listener " + listener.getName()); - listener.participantStatusChange(p, status, value); - } - } - } - - public void endAndKickAll() { - for (Iterator it = listeners.values().iterator(); it.hasNext();) { - IRoomListener listener = (IRoomListener) it.next(); - log.debug("calling endAndKickAll on listener " + listener.getName()); - listener.endAndKickAll(); - } - } - - public Map getParticipants() { - return participants;//unmodifiableMap; - } - - public Collection getParticipantCollection() { - return participants.values(); - } - - public int getNumberOfParticipants() { - log.debug("Returning number of participants: " + participants.size()); - return participants.size(); - } - - public int getNumberOfModerators() { - int sum = 0; - for (Iterator it = participants.values().iterator(); it.hasNext(); ) { - User part = it.next(); - if (part.isModerator()) { - sum++; - } - } - log.debug("Returning number of moderators: " + sum); - return sum; - } - - public ArrayList getCurrentPresenter() { - return currentPresenter; - } - - public void assignPresenter(ArrayList presenter){ - currentPresenter = presenter; - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - log.debug("calling on listener"); - IRoomListener listener = (IRoomListener) iter.next(); - log.debug("calling sendUpdateMessage on listener " + listener.getName()); - listener.assignPresenter(presenter); - } - } - - public void setLocked(Boolean locked) { - this.locked = locked; - } - - public boolean isLocked() { - return locked; - } - - public LockSettings getLockSettings() { - return lockSettings; - } - - public void setLockSettings(LockSettings lockSettings) { - this.lockSettings = lockSettings; - - for (Iterator it = listeners.values().iterator(); it.hasNext();) { - IRoomListener listener = (IRoomListener) it.next(); - log.debug("calling setLockSettings on listener " + listener.getName()); - listener.lockSettingsChange(lockSettings.toMap()); - } - } - - public void changeRecordingStatus(String userid, Boolean recording) { - boolean present = false; - User p = null; - synchronized (this) { - present = participants.containsKey(userid); - if (present) { - p = participants.get(userid); - } - } - if (present && recording != this.recording) { - changeRecordingStatus(p, recording); - } - } - - private void changeRecordingStatus(User p, Boolean recording) { - log.debug("Changed recording status to " + recording); - this.recording = recording; - - for (Iterator it = listeners.values().iterator(); it.hasNext();) { - IRoomListener listener = (IRoomListener) it.next(); - log.debug("calling recordingStatusChange on listener " + listener.getName()); - listener.recordingStatusChange(p, recording); - } - } - - public Boolean getRecordingStatus() { - return recording; - } -} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java deleted file mode 100755 index 00138c74fe..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java +++ /dev/null @@ -1,85 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.red5.server.api.so.ISharedObject; - -public class RoomListener implements IRoomListener{ - - private ISharedObject so; - - public RoomListener(ISharedObject so) { - this.so = so; - } - - public String getName() { - return "TEMPNAME"; - } - - @SuppressWarnings("unchecked") - public void participantStatusChange(User p, String status, Object value){ - List list = new ArrayList(); - list.add(p.getInternalUserID()); - list.add(status); - list.add(value); - so.sendMessage("participantStatusChange", list); - } - - @SuppressWarnings("unchecked") - public void participantJoined(User p) { - List args = new ArrayList(); - args.add(p.toMap()); - so.sendMessage("participantJoined", args); - } - - @SuppressWarnings("unchecked") - public void participantLeft(User p) { - List args = new ArrayList(); - args.add(p.getInternalUserID()); - so.sendMessage("participantLeft", args); - } - - public void assignPresenter(ArrayList presenter) { - so.sendMessage("assignPresenterCallback", presenter); - } - - public void endAndKickAll() { - // no-op - } - - @Override - public void lockSettingsChange(Map lockSettings) { - List list = new ArrayList(); - list.add(lockSettings); - so.sendMessage("lockSettingsChange", list); - } - - @SuppressWarnings("unchecked") - public void recordingStatusChange(User p, Boolean recording){ - List list = new ArrayList(); - list.add(p.getInternalUserID()); - list.add(recording); - so.sendMessage("recordingStatusChange", list); - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java deleted file mode 100755 index 7981d963cc..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java +++ /dev/null @@ -1,242 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference; - -import org.slf4j.Logger; -import org.bigbluebutton.conference.service.messaging.MessageListener; -import org.bigbluebutton.conference.service.messaging.MessagingConstants; -import org.bigbluebutton.conference.service.messaging.MessagingService; -import org.bigbluebutton.conference.service.presentation.ConversionUpdatesMessageListener; -import org.red5.logging.Red5LoggerFactory; -import com.google.gson.Gson; -import net.jcip.annotations.ThreadSafe; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * This encapsulates access to Room and Participant. This class must be threadsafe. - */ -@ThreadSafe -public class RoomsManager { - private static Logger log = Red5LoggerFactory.getLogger(RoomsManager.class, "bigbluebutton"); - - private final Map rooms; - - MessagingService messagingService; - ConversionUpdatesMessageListener conversionUpdatesMessageListener; - - public RoomsManager() { - rooms = new ConcurrentHashMap(); - } - - public void addRoom(Room room) { - log.debug("Adding room " + room.getName()); - room.addRoomListener(new ParticipantUpdatingRoomListener(room,messagingService)); - - if (checkPublisher()) { - HashMap map = new HashMap(); - map.put("meetingId", room.getName()); - map.put("messageId", MessagingConstants.MEETING_STARTED_EVENT); - - Gson gson = new Gson(); - messagingService.send(MessagingConstants.SYSTEM_CHANNEL, gson.toJson(map)); - - log.debug("Notified event listener of conference start"); - } - rooms.put(room.getName(), room); - } - - public void removeRoom(String name) { - log.debug("Remove room " + name); - Room room = rooms.remove(name); - if (checkPublisher() && room != null) { - room.endAndKickAll(); - HashMap map = new HashMap(); - map.put("meetingId", room.getName()); - map.put("messageId", MessagingConstants.MEETING_ENDED_EVENT); - - Gson gson = new Gson(); - messagingService.send(MessagingConstants.SYSTEM_CHANNEL, gson.toJson(map)); - - log.debug("Notified event listener of conference end"); - } - } - - public void destroyAllRooms() { - for (Map.Entry entry : rooms.entrySet()) { - Room room = entry.getValue(); - room.endAndKickAll(); - } - } - - private boolean checkPublisher() { - return messagingService != null; - } - - - public boolean hasRoom(String name) { - return rooms.containsKey(name); - } - - public int numberOfRooms() { - return rooms.size(); - } - - /** - * Keeping getRoom private so that all access to Room goes through here. - */ - //TODO: this method becomes public for ParticipantsApplication, ask if it's right? - public Room getRoom(String name) { - log.debug("Get room " + name); - return rooms.get(name); - } - - public Map getParticipants(String roomName) { - Room r = getRoom(roomName); - if (r != null) { - return r.getParticipants(); - } - log.warn("Getting participants from a non-existing room " + roomName); - return null; - } - - public void addRoomListener(String roomName, IRoomListener listener) { - Room r = getRoom(roomName); - if (r != null) { - r.addRoomListener(listener); - return; - } - log.warn("Adding listener to a non-existing room " + roomName); - } - - // TODO: this must be broken, right? where is roomName? (JRT: 9/25/2009) -// public void removeRoomListener(IRoomListener listener) { -// -// Room r = getRoom(roomName); -// if (r != null) { -// r.removeRoomListener(listener) -// return -// } -// log.warn("Removing listener from a non-existing room ${roomName}") -// } - - public void addParticipant(String roomName, User participant) { - log.debug("Add participant " + participant.getName()); - Room r = getRoom(roomName); - if (r != null) { - r.addParticipant(participant); - - return; - } - log.warn("Adding participant to a non-existing room " + roomName); - } - - public void removeParticipant(String roomName, String userid) { - log.debug("Remove participant " + userid + " from " + roomName); - Room r = getRoom(roomName); - if (r != null) { - if (checkPublisher()) { - //conferenceEventListener.participantsUpdated(r); - //missing method()? - } - r.removeParticipant(userid); - - return; - } - log.warn("Removing listener from a non-existing room " + roomName); - } - - public void changeParticipantStatus(String roomName, String userid, String status, Object value) { - log.debug("Change participant status " + userid + " - " + status + " [" + value + "]"); - Room r = getRoom(roomName); - if (r != null) { - r.changeParticipantStatus(userid, status, value); - return; - } - log.warn("Changing participant status on a non-existing room " + roomName); - } - - public void setMessagingService(MessagingService messagingService) { - this.messagingService = messagingService; - this.messagingService.addListener(new RoomsManagerListener()); - this.messagingService.start(); - } - - public ArrayList getCurrentPresenter( String room){ - Room r = getRoom(room); - if (r != null) { - return r.getCurrentPresenter(); - } - log.warn("Getting presenter from a non-existing room " + room); - return null; - } - - public void assignPresenter(String room, ArrayList presenter){ - Room r = getRoom(room); - if (r != null) { - r.assignPresenter(presenter); - return; - } - log.warn("Assigning presenter to a non-existing room " + room); - } - - public void setConversionUpdatesMessageListener(ConversionUpdatesMessageListener conversionUpdatesMessageListener) { - this.conversionUpdatesMessageListener = conversionUpdatesMessageListener; - } - - private class RoomsManagerListener implements MessageListener{ - - @Override - public void endMeetingRequest(String meetingId) { - log.debug("End meeting request for room: " + meetingId); - Room room = getRoom(meetingId); // must do this because the room coming in is serialized (no transient values are present) - if (room != null) - room.endAndKickAll(); - else - log.debug("Could not find room " + meetingId); - } - - @Override - public void presentationUpdates(HashMap map) { - conversionUpdatesMessageListener.handleReceivedMessage(map); - } - - } - - public void changeRecordingStatus(String roomName, String userid, Boolean recording) { - log.debug("Change recording status " + userid + " [" + recording + "]"); - Room r = getRoom(roomName); - if (r != null) { - r.changeRecordingStatus(userid, recording); - return; - } - log.warn("Changing recording status on a non-existing room " + roomName); - } - - public Boolean getRecordingStatus(String roomName) { - Room r = getRoom(roomName); - if (r != null) { - return r.getRecordingStatus(); - } - log.warn("Getting recording status from a non-existing room " + roomName); - return null; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java deleted file mode 100755 index 328a136bc6..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java +++ /dev/null @@ -1,124 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference; - -import net.jcip.annotations.ThreadSafe; -import java.util.concurrent.ConcurrentHashMap; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.io.Serializable; - -/** - * Contains information for a Participant. Encapsulates status and the - * only way to change/add status is through setStatus; - */ -@ThreadSafe -public class User implements Serializable { - private String internalUserID; - private String name; - private String role = "VIEWER"; - private String externalUserID; - - private final Map status; - private Map unmodifiableStatus; - - public User(String internalUserID, String name, String role, String externalUserID, Map status, Boolean locked) { - this.internalUserID = internalUserID; - this.name = name; - this.role = role; - this.externalUserID = externalUserID; - this.status = new ConcurrentHashMap(status); - unmodifiableStatus = Collections.unmodifiableMap(status); - setStatus("locked", locked); - } - - public boolean isModerator() { - return "MODERATOR".equals(role); - } - - public String getName() { - return name; - } - - public String getInternalUserID() { - return internalUserID; - } - - public String getRole() { - return role; - } - - public String getExternalUserID() { - return externalUserID; - } - - /** - * Returns that status for this participant. However, the status cannot - * be modified. To do that, setStatus(...) must be used. - */ - public Map getStatus() { - return unmodifiableStatus; - } - - public void setStatus(String statusName, Object value) { - // Should we sychronize? - synchronized (this) { - status.put(statusName, value); - /** - * Update unmodifiableStatus as it does not get synched with status. - * Not sure it it should auto-syc, so just sync it. - * Not sure if this is the right way to do it (ralam 2/26/2009). - */ - unmodifiableStatus = Collections.unmodifiableMap(status); - } - } - - public void removeStatus(String statusName) { - // Should we sychronize? - synchronized (this) { - status.remove(statusName); - /** - * Update unmodifiableStatus as it does not get synched with status. - * Not sure it it should auto-syc, so just sync it. - * Not sure if this is the right way to do it (ralam 2/26/2009). - */ - unmodifiableStatus = Collections.unmodifiableMap(status); - } - } - - public Map toMap() { - Map m = new HashMap(); - m.put("userid", internalUserID); - m.put("externUserID", externalUserID); - m.put("name", name); - m.put("role", role); - /** - * Create a copy of the status instead of returning the - * unmodifiableMap. This way callers can still manipulate it - * for their own purpose but our copy still remains unmodified. - */ - m.put("status", new HashMap(unmodifiableStatus)); - return m; - } - - public Boolean isLocked() { - return ((Boolean) getStatus().get("locked") ); - } -} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ClientMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/BroadcastClientMessage.java similarity index 69% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ClientMessage.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/BroadcastClientMessage.java index baac86852f..ce005c2fed 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ClientMessage.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/BroadcastClientMessage.java @@ -16,32 +16,24 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference; +package org.bigbluebutton.conference.meeting.messaging.red5; import java.util.Map; -public class ClientMessage { - public static final String BROADCAST = "broadcast"; - public static final String DIRECT = "direct"; - - private String type; - private String dest; +public class BroadcastClientMessage implements ClientMessage { + + private String meetingID; private Map message; private String messageName; - public ClientMessage(String type, String dest, String messageName, Map message) { - this.type = type; - this.dest = dest; + public BroadcastClientMessage(String meetingID, String messageName, Map message) { + this.meetingID = meetingID; this.message = message; this.messageName = messageName; } - - public String getType() { - return type; - } - - public String getDest() { - return dest; + + public String getMeetingID() { + return meetingID; } public String getMessageName() { diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Rectangle.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ClientMessage.java similarity index 87% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Rectangle.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ClientMessage.java index 0d9c50560f..5194eca8d4 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Rectangle.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ClientMessage.java @@ -16,8 +16,9 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference.service.whiteboard.shapes; +package org.bigbluebutton.conference.meeting.messaging.red5; -public class Rectangle { + +public interface ClientMessage { } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java new file mode 100755 index 0000000000..e03a34d532 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java @@ -0,0 +1,234 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.meeting.messaging.red5; + +import java.util.Set; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import org.red5.logging.Red5LoggerFactory; +import org.red5.server.api.IConnection; +import org.red5.server.api.scope.IScope; +import org.red5.server.api.scope.ScopeType; +import org.red5.server.api.service.ServiceUtils; +import org.red5.server.api.so.ISharedObject; +import org.red5.server.api.so.ISharedObjectService; +import org.red5.server.so.SharedObjectService; +import org.red5.server.util.ScopeUtils; +import org.slf4j.Logger; + +public class ConnectionInvokerService { + private static Logger log = Red5LoggerFactory.getLogger(ConnectionInvokerService.class, "bigbluebutton"); + + private static final int NTHREADS = 1; + private static final Executor exec = Executors.newFixedThreadPool(NTHREADS); + + private BlockingQueue messages; + + private ConcurrentHashMap connections; + private ConcurrentHashMap scopes; + + private volatile boolean sendMessages = false; + private IScope bbbAppScope; + + public ConnectionInvokerService() { + messages = new LinkedBlockingQueue(); + + connections = new ConcurrentHashMap(); + scopes = new ConcurrentHashMap(); + } + + public void setAppScope(IScope scope) { + bbbAppScope = scope; + } + + public void addConnection(String id, IConnection conn) { + if (connections == null) { + System.out.println("Connections is null!!!!"); + return; + } + if (id == null) { + System.out.println("CONN ID IS NULL!!!"); + + } + if (conn == null) { + System.out.println("CONN IS NULL"); + } + connections.putIfAbsent(id, conn); + } + + public void start() { + sendMessages = true; + Runnable sender = new Runnable() { + public void run() { + while (sendMessages) { + ClientMessage message; + try { + message = messages.take(); + sendMessageToClient(message); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + } + }; + exec.execute(sender); + } + + public void stop() { + sendMessages = false; + } + + public void removeConnection(String id) { + connections.remove(id); + } + + public void addScope(String id, IScope scope) { + scopes.putIfAbsent(id, scope); + } + + public void removeScope(String id) { + scopes.remove(id); + } + + public void sendMessage(final ClientMessage message) { + messages.offer(message); + } + + private void sendMessageToClient(ClientMessage message) { + if (message instanceof BroadcastClientMessage) { + sendBroadcastMessage((BroadcastClientMessage) message); + } else if (message instanceof DirectClientMessage) { + sendDirectMessage((DirectClientMessage) message); + } else if (message instanceof SharedObjectClientMessage) { + sendSharedObjectMessage((SharedObjectClientMessage) message); + } else if (message instanceof DisconnectClientMessage) { + handlDisconnectClientMessage((DisconnectClientMessage) message); + } else if (message instanceof DisconnectAllClientsMessage) { + handleDisconnectAllClientsMessage((DisconnectAllClientsMessage) message); + } + } + + private void handleDisconnectAllClientsMessage(DisconnectAllClientsMessage msg) { + IScope meetingScope = getScope(msg.getMeetingId()); + if (meetingScope != null) { + Set conns = meetingScope.getClientConnections(); + + for (IConnection conn : conns) { + if (conn.isConnected()) { + String connId = (String) conn.getAttribute("INTERNAL_USER_ID"); + log.info("Disconnecting client=[{}] from meeting=[{}]", connId, msg.getMeetingId()); + conn.close(); + } + } + } + } + + private void handlDisconnectClientMessage(DisconnectClientMessage msg) { + IScope meetingScope = getScope(msg.getMeetingId()); + if (meetingScope != null) { + IConnection conn = getConnection(meetingScope, msg.getUserId()); + if (conn != null) { + if (conn.isConnected()) { + log.info("Disconnecting user=[{}] from meeting=[{}]", msg.getUserId(), msg.getMeetingId()); + conn.close(); + } + } + } + } + + private void sendSharedObjectMessage(SharedObjectClientMessage msg) { + System.out.println("*********** Request to send [" + msg.getMessageName() + "] using shared object."); + + IScope meetingScope = getScope(msg.getMeetingID()); + if (meetingScope != null) { + if (meetingScope.hasChildScope(ScopeType.SHARED_OBJECT, msg.getSharedObjectName())) { + ISharedObject so = getSharedObject(meetingScope, msg.getSharedObjectName()); + if (so != null) { + System.out.println("*********** Sending [" + msg.getMessageName() + "] using shared object."); + so.sendMessage(msg.getMessageName(), msg.getMessage()); + } else { + System.out.println("**** Cannot get SO for [" + msg.getSharedObjectName() + "]"); + } + } else { + System.out.println("**** No SO scope for [" + msg.getSharedObjectName() + "]"); + } + } else { + System.out.println("**** No Meeting scope for [" + msg.getMeetingID() + "]"); + } + } + + private void sendDirectMessage(DirectClientMessage msg) { + IScope meetingScope = getScope(msg.getMeetingID()); + if (meetingScope != null) { + IConnection conn = getConnection(meetingScope, msg.getUserID()); + if (conn != null) { + if (conn.isConnected()) { + List params = new ArrayList(); + params.add(msg.getMessageName()); + params.add(msg.getMessage()); + ServiceUtils.invokeOnConnection(conn, "onMessageFromServer", params.toArray()); + } + } + } + } + + private void sendBroadcastMessage(BroadcastClientMessage msg) { + IScope meetingScope = getScope(msg.getMeetingID()); + if (meetingScope != null) { + List params = new ArrayList(); + params.add(msg.getMessageName()); + params.add(msg.getMessage()); + ServiceUtils.invokeOnAllScopeConnections(meetingScope, "onMessageFromServer", params.toArray(), null); + } + } + + private IConnection getConnection(IScope scope, String userID) { + Set conns = scope.getClientConnections(); + for (IConnection conn : conns) { + String connID = (String) conn.getAttribute("INTERNAL_USER_ID"); + if (connID != null && connID.equals(userID)) { + return conn; + } + } + + return null; + } + + public IScope getScope(String meetingID) { + if (bbbAppScope != null) { + return bbbAppScope.getContext().resolveScope("bigbluebutton/" + meetingID); + } else { + log.error("BigBlueButton Scope not initialized. No messages are going to the Flash client!"); + } + + return null; + } + + private ISharedObject getSharedObject(IScope scope, String name) { + ISharedObjectService service = (ISharedObjectService) ScopeUtils.getScopeService(scope, ISharedObjectService.class, SharedObjectService.class, false); + return service.getSharedObject(scope, name); + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DirectClientMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DirectClientMessage.java new file mode 100755 index 0000000000..3edf12c747 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DirectClientMessage.java @@ -0,0 +1,61 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.meeting.messaging.red5; + +import java.util.Map; + +public class DirectClientMessage implements ClientMessage { + + private String meetingID; + private String userID; + private Map message; + private String messageName; + private String sharedObjectName; + + public DirectClientMessage(String meetingID, String userID, String messageName, Map message) { + this.meetingID = meetingID; + this.userID = userID; + this.message = message; + this.messageName = messageName; + } + + public void setSharedObjectName(String name) { + sharedObjectName = name; + } + + public String getSharedObjectName() { + return sharedObjectName; + } + + public String getMeetingID() { + return meetingID; + } + + public String getUserID() { + return userID; + } + + public String getMessageName() { + return messageName; + } + + public Map getMessage() { + return message; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectAllClientsMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectAllClientsMessage.java new file mode 100755 index 0000000000..c9dd6aee65 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectAllClientsMessage.java @@ -0,0 +1,14 @@ +package org.bigbluebutton.conference.meeting.messaging.red5; + +public class DisconnectAllClientsMessage implements ClientMessage { + + private final String meetingId; + + public DisconnectAllClientsMessage(String meetingId) { + this.meetingId = meetingId; + } + + public String getMeetingId() { + return meetingId; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectClientMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectClientMessage.java new file mode 100755 index 0000000000..a43468f025 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectClientMessage.java @@ -0,0 +1,20 @@ +package org.bigbluebutton.conference.meeting.messaging.red5; + +public class DisconnectClientMessage implements ClientMessage { + + private final String meetingId; + private final String userId; + + public DisconnectClientMessage(String meetingId, String userId) { + this.meetingId = meetingId; + this.userId = userId; + } + + public String getMeetingId() { + return meetingId; + } + + public String getUserId() { + return userId; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/SharedObjectClientMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/SharedObjectClientMessage.java new file mode 100755 index 0000000000..33abc80a67 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/SharedObjectClientMessage.java @@ -0,0 +1,59 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.meeting.messaging.red5; + +import java.util.ArrayList; + +public class SharedObjectClientMessage implements ClientMessage { + public static final String BROADCAST = "broadcast"; + public static final String DIRECT = "direct"; + public static final String SHAREDOBJECT = "sharedobject"; + + private String meetingID; + private String sharedObjectName; + private ArrayList message; + private String messageName; + + public SharedObjectClientMessage(String meetingID, String sharedObjectName, String messageName, ArrayList message) { + this.meetingID = meetingID; + this.message = message; + this.sharedObjectName = sharedObjectName; + this.messageName = messageName; + } + + public void setSharedObjectName(String name) { + sharedObjectName = name; + } + + public String getSharedObjectName() { + return sharedObjectName; + } + + public String getMeetingID() { + return meetingID; + } + + public String getMessageName() { + return messageName; + } + + public ArrayList getMessage() { + return message; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java new file mode 100644 index 0000000000..87c2734a21 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java @@ -0,0 +1,82 @@ +package org.bigbluebutton.conference.meeting.messaging.redis; + +import java.util.HashMap; +import java.util.Map; + +import org.bigbluebutton.conference.service.messaging.CreateMeetingMessage; +import org.bigbluebutton.conference.service.messaging.DestroyMeetingMessage; +import org.bigbluebutton.conference.service.messaging.EndMeetingMessage; +import org.bigbluebutton.conference.service.messaging.IMessage; +import org.bigbluebutton.conference.service.messaging.KeepAliveMessage; +import org.bigbluebutton.conference.service.messaging.MessageFromJsonConverter; +import org.bigbluebutton.conference.service.messaging.MessagingConstants; +import org.bigbluebutton.conference.service.messaging.RegisterUserMessage; +import org.bigbluebutton.conference.service.messaging.UserConnectedToGlobalAudio; +import org.bigbluebutton.conference.service.messaging.UserDisconnectedFromGlobalAudio; +import org.bigbluebutton.conference.service.messaging.ValidateAuthTokenMessage; +import org.bigbluebutton.conference.service.messaging.redis.MessageHandler; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; + + +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +public class MeetingMessageHandler implements MessageHandler { + private static Logger log = Red5LoggerFactory.getLogger(MeetingMessageHandler.class, "bigbluebutton"); + + private IBigBlueButtonInGW bbbGW; + + @Override + public void handleMessage(String pattern, String channel, String message) { + System.out.println("Checking message: " + pattern + " " + channel + " " + message); + if (channel.equalsIgnoreCase(MessagingConstants.TO_MEETING_CHANNEL)) { + System.out.println("Meeting message: " + channel + " " + message); + IMessage msg = MessageFromJsonConverter.convert(message); + + if (msg != null) { + if (msg instanceof EndMeetingMessage) { + EndMeetingMessage emm = (EndMeetingMessage) msg; + log.info("Received end meeting request. Meeting id [{}]", emm.meetingId); + bbbGW.endMeeting(emm.meetingId); + } else if (msg instanceof CreateMeetingMessage) { + CreateMeetingMessage emm = (CreateMeetingMessage) msg; + bbbGW.createMeeting2(emm.id, emm.name, emm.record, emm.voiceBridge, emm.duration); + } else if (msg instanceof RegisterUserMessage) { + RegisterUserMessage emm = (RegisterUserMessage) msg; + bbbGW.registerUser(emm.meetingID, emm.internalUserId, emm.fullname, emm.role, emm.externUserID, emm.authToken); + } else if (msg instanceof DestroyMeetingMessage) { + DestroyMeetingMessage emm = (DestroyMeetingMessage) msg; + log.info("Received destroy meeting request. Meeting id [{}]", emm.meetingId); + bbbGW.destroyMeeting(emm.meetingId); + } else if (msg instanceof ValidateAuthTokenMessage) { + ValidateAuthTokenMessage emm = (ValidateAuthTokenMessage) msg; + log.info("Received ValidateAuthTokenMessage token request. Meeting id [{}]", emm.meetingId); + bbbGW.validateAuthToken(emm.meetingId, emm.userId, emm.token, emm.replyTo); + } else if (msg instanceof UserConnectedToGlobalAudio) { + UserConnectedToGlobalAudio emm = (UserConnectedToGlobalAudio) msg; + log.info("Received UserConnectedToGlobalAudio toekn request. user id [{}]", emm.name); + bbbGW.userConnectedToGlobalAudio(emm.voiceConf, emm.userid, emm.name); + } else if (msg instanceof UserDisconnectedFromGlobalAudio) { + UserDisconnectedFromGlobalAudio emm = (UserDisconnectedFromGlobalAudio) msg; + log.info("Received UserDisconnectedFromGlobalAudio toekn request. Meeting id [{}]", emm.name); + bbbGW.userConnectedToGlobalAudio(emm.voiceConf, emm.userid, emm.name); + } + } + } else if (channel.equalsIgnoreCase(MessagingConstants.TO_SYSTEM_CHANNEL)) { + IMessage msg = MessageFromJsonConverter.convert(message); + + if (msg != null) { + if (msg instanceof KeepAliveMessage) { + KeepAliveMessage emm = (KeepAliveMessage) msg; + log.info("Received KeepAliveMessage request. Meeting id [{}]", emm.keepAliveId); + bbbGW.isAliveAudit(emm.keepAliveId); + } + } + } + } + + public void setBigBlueButtonInGW(IBigBlueButtonInGW bbbGW) { + this.bbbGW = bbbGW; + } + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java index 4bcbec1ef3..be5233c61b 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java @@ -18,99 +18,33 @@ */ package org.bigbluebutton.conference.service.chat; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; + import java.util.Map; import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.Red5; import org.bigbluebutton.conference.BigBlueButtonSession; -import org.bigbluebutton.conference.ClientMessage; -import org.bigbluebutton.conference.ConnectionInvokerService; -import org.bigbluebutton.conference.Constants; -import org.bigbluebutton.conference.service.chat.ChatRoomsManager; -import org.bigbluebutton.conference.service.chat.ChatRoom; import org.bigbluebutton.conference.service.chat.IChatRoomListener; +import org.red5.logging.Red5LoggerFactory; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; public class ChatApplication { - private static Logger log = Red5LoggerFactory.getLogger( ChatApplication.class, "bigbluebutton" ); - - private ChatRoomsManager roomsManager; - public ChatHandler handler; - private ConnectionInvokerService connInvokerService; - public boolean createRoom(String name) { - roomsManager.addRoom(new ChatRoom(name)); - return true; + private IBigBlueButtonInGW bbbInGW; + + public void setBigBlueButtonInGW(IBigBlueButtonInGW inGW) { + bbbInGW = inGW; } - public boolean destroyRoom(String name) { - if (roomsManager.hasRoom(name)) { - roomsManager.removeRoom(name); - } - return true; + public void sendPublicChatHistory(String meetingID, String requesterID) { + // Just hardcode as we don't really need it for flash client. (ralam may 7, 2014) + String replyTo = meetingID + "/" + requesterID; + bbbInGW.getChatHistory(meetingID, requesterID, replyTo); } - public boolean hasRoom(String name) { - return roomsManager.hasRoom(name); + public void sendPublicMessage(String meetingID, String requesterID, Map message) { + bbbInGW.sendPublicMessage(meetingID, requesterID, message); } - public boolean addRoomListener(String room, IChatRoomListener listener) { - if (roomsManager.hasRoom(room)){ - roomsManager.addRoomListener(room, listener); - return true; - } - log.warn("Adding listener to a non-existant room " + room); - return false; - } - - public void sendPublicChatHistory(String meetingID) { - List messages = roomsManager.getChatMessages(meetingID); - - List> msgs = new ArrayList>(); - for (ChatMessageVO v : messages) { - msgs.add(v.toMap()); - } - - Map messageToSend = new HashMap(); - messageToSend.put("count", new Integer(msgs.size())); - messageToSend.put("messages", msgs); - - ClientMessage m = new ClientMessage(ClientMessage.DIRECT, getBbbSession().getInternalUserID(), "ChatRequestMessageHistoryReply", messageToSend); - connInvokerService.sendMessage(m); - } - - public void sendPublicMessage(String room, ChatMessageVO chatobj) { - roomsManager.sendMessage(room, chatobj); - - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), "ChatReceivePublicMessageCommand", chatobj.toMap()); - connInvokerService.sendMessage(m); - } - - public void sendPrivateMessage(ChatMessageVO chatobj) { - ClientMessage m = new ClientMessage(ClientMessage.DIRECT, chatobj.toUserID, "ChatReceivePrivateMessageCommand", chatobj.toMap()); - connInvokerService.sendMessage(m); - - ClientMessage m2 = new ClientMessage(ClientMessage.DIRECT, chatobj.fromUserID, "ChatReceivePrivateMessageCommand", chatobj.toMap()); - connInvokerService.sendMessage(m2); - } - - public void setRoomsManager(ChatRoomsManager r) { - log.debug("Setting room manager"); - roomsManager = r; - } - - private String getMeetingId(){ - return Red5.getConnectionLocal().getScope().getName(); - } - - private BigBlueButtonSession getBbbSession() { - return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); - } - - public void setConnInvokerService(ConnectionInvokerService connInvokerService) { - this.connInvokerService = connInvokerService; + public void sendPrivateMessage(String meetingID, String requesterID, Map message) { + bbbInGW.sendPrivateMessage(meetingID, requesterID, message); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatHandler.java index 69d4d8c02e..7164870c04 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatHandler.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatHandler.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.scope.IScope; import org.bigbluebutton.conference.service.recorder.RecorderApplication; -import org.bigbluebutton.conference.service.recorder.chat.ChatEventRecorder; public class ChatHandler implements IApplication{ private static Logger log = Red5LoggerFactory.getLogger( ChatHandler.class, "bigbluebutton" ); @@ -89,11 +88,6 @@ public class ChatHandler implements IApplication{ public boolean roomConnect(IConnection connection, Object[] params) { log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********"); - chatApplication.createRoom(connection.getScope().getName()); - - ChatEventRecorder recorder = new ChatEventRecorder(connection.getScope().getName(), recorderApplication); - chatApplication.addRoomListener(connection.getScope().getName(), recorder); - return true; } @@ -106,13 +100,11 @@ public class ChatHandler implements IApplication{ @Override public void roomStop(IScope scope) { log.debug("***** " + APP + " [ " + " roomStop [ " + scope.getName() + "] *********"); - chatApplication.destroyRoom(scope.getName()); } public void setChatApplication(ChatApplication a) { log.debug("Setting chat application"); chatApplication = a; - chatApplication.handler = this; } public void setRecorderApplication(RecorderApplication a) { diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatKeyUtil.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatKeyUtil.java new file mode 100755 index 0000000000..4f8a3be24a --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatKeyUtil.java @@ -0,0 +1,14 @@ +package org.bigbluebutton.conference.service.chat; + +public class ChatKeyUtil { + public static final String CHAT_TYPE = "chatType"; + public static final String FROM_USERID = "fromUserID"; + public static final String FROM_USERNAME = "fromUsername"; + public static final String FROM_COLOR = "fromColor"; + public static final String FROM_TIME = "fromTime"; + public static final String FROM_TZ_OFFSET = "fromTimezoneOffset"; + public static final String FROM_LANG = "fromLang"; + public static final String TO_USERID = "toUserID"; + public static final String TO_USERNAME = "toUsername"; + public static final String MESSAGE = "message"; +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java new file mode 100755 index 0000000000..36884cce8f --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java @@ -0,0 +1,83 @@ +package org.bigbluebutton.conference.service.chat; + +import org.bigbluebutton.conference.service.messaging.MessagingConstants; +import org.bigbluebutton.conference.service.messaging.redis.MessageHandler; +import com.google.gson.JsonParser; +import com.google.gson.JsonObject; + +import java.util.Map; +import java.util.HashMap; + +import org.bigbluebutton.core.api.IBigBlueButtonInGW; + +public class ChatMessageListener implements MessageHandler{ + + private IBigBlueButtonInGW bbbGW; + + public void setBigBlueButtonInGW(IBigBlueButtonInGW bbbGW) { + this.bbbGW = bbbGW; + } + + @Override + public void handleMessage(String pattern, String channel, String message) { + if (channel.equalsIgnoreCase(MessagingConstants.TO_CHAT_CHANNEL)) { + + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + JsonObject headerObject = (JsonObject) obj.get("header"); + JsonObject payloadObject = (JsonObject) obj.get("payload"); + JsonObject messageObject = (JsonObject) payloadObject.get("message"); + + String eventName = headerObject.get("name").toString(); + eventName = eventName.replace("\"", ""); + + if (eventName.equalsIgnoreCase("public_chat_message_event") || + eventName.equalsIgnoreCase("send_public_chat_message") || + eventName.equalsIgnoreCase("private_chat_message_event") || + eventName.equalsIgnoreCase("send_private_chat_message")){ + + String meetingID = payloadObject.get("meeting_id").toString().replace("\"", ""); + String requesterID = payloadObject.get("requester_id").toString().replace("\"", ""); + + String chatType = messageObject.get("chat_type").toString().replace("\"", ""); + String fromUserID = messageObject.get("from_userid").toString().replace("\"", ""); + String fromUsername = messageObject.get("from_username").toString().replace("\"", ""); + String fromColor = messageObject.get("from_color").toString().replace("\"", ""); + String fromTime = messageObject.get("from_time").toString().replace("\"", ""); + String fromTimezoneOffset = messageObject.get("from_tz_offset").toString().replace("\"", ""); + String fromLang = messageObject.get("from_lang").toString().replace("\"", ""); + String toUserID = messageObject.get("to_userid").toString().replace("\"", ""); + String toUsername = messageObject.get("to_username").toString().replace("\"", ""); + String chatText = messageObject.get("message").toString().replace("\"", ""); + + Map map = new HashMap(); + map.put(ChatKeyUtil.CHAT_TYPE, chatType); + map.put(ChatKeyUtil.FROM_USERID, fromUserID); + map.put(ChatKeyUtil.FROM_USERNAME, fromUsername); + map.put(ChatKeyUtil.FROM_COLOR, fromColor); + map.put(ChatKeyUtil.FROM_TIME, fromTime); + map.put(ChatKeyUtil.FROM_TZ_OFFSET, fromTimezoneOffset); + map.put(ChatKeyUtil.FROM_LANG, fromLang); + map.put(ChatKeyUtil.TO_USERID, toUserID); + map.put(ChatKeyUtil.TO_USERNAME, toUsername); + map.put(ChatKeyUtil.MESSAGE, chatText); + + //public message + if(eventName.equalsIgnoreCase("public_chat_message_event") || eventName.equalsIgnoreCase("send_public_chat_message")) //put this string into a constants file + { + System.out.println("I'm in the case for a public chat message" ); + + bbbGW.sendPublicMessage(meetingID, requesterID, map); + } + + //private message + else if(eventName.equalsIgnoreCase("private_chat_message_event") || eventName.equalsIgnoreCase("send_private_chat_message")) //put this string into a constants file + { + System.out.println("I'm in the case for a private chat message" ); + + bbbGW.sendPrivateMessage(meetingID, requesterID, map); //TODO not tested yet + } + } + } + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageVO.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageVO.java deleted file mode 100755 index 0c2f4d8e87..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageVO.java +++ /dev/null @@ -1,64 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.chat; - -import java.util.HashMap; -import java.util.Map; - -public class ChatMessageVO { - // The type of chat (PUBLIC or PRIVATE) - public String chatType; - - // The sender - public String fromUserID; - public String fromUsername; - public String fromColor; - - // Stores the UTC time (milliseconds) when the message was sent. - public Double fromTime; - // Stores the timezone offset (minutes) when the message was sent. - // This will be used by receiver to convert to locale time. - public Long fromTimezoneOffset; - - public String fromLang; - - // The receiver. For PUBLIC chat this is empty - public String toUserID = ""; - public String toUsername = ""; - - public String message; - - - public Map toMap() { - Map msg = new HashMap(); - msg.put("fromUserID", fromUserID); - msg.put("fromUsername", fromUsername); - msg.put("fromColor", fromColor); - msg.put("fromTime", fromTime); - msg.put("fromLang", fromLang); - msg.put("fromTime", fromTime); - msg.put("fromTimezoneOffset", fromTimezoneOffset); - msg.put("chatType", chatType); - msg.put("message", message); - msg.put("toUserID", toUserID); - msg.put("toUsername", toUsername); - - return msg; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatRoom.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatRoom.java deleted file mode 100755 index 3179d4aa5f..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatRoom.java +++ /dev/null @@ -1,77 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference.service.chat; - -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; -import net.jcip.annotations.ThreadSafe; import java.util.concurrent.ConcurrentHashMap; import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -/** - * Contains information about a ChatRoom. - */ -@ThreadSafe -public class ChatRoom { - private static Logger log = Red5LoggerFactory.getLogger( ChatRoom.class, "bigbluebutton" ); - - private final String name; - private final Map listeners; - ArrayList messages; - - public ChatRoom(String name) { - this.name = name; - listeners = new ConcurrentHashMap(); - this.messages = new ArrayList(); - } - - public String getName() { - return name; - } - - public void addRoomListener(IChatRoomListener listener) { - if (! listeners.containsKey(listener.getName())) { - log.debug("adding room listener"); - listeners.put(listener.getName(), listener); - } - } - - public void removeRoomListener(IChatRoomListener listener) { - log.debug("removing room listener"); - listeners.remove(listener); - } - - public List getChatMessages(){ - return messages; - } - - @SuppressWarnings("unchecked") - public void sendMessage(ChatMessageVO chatobj){ - messages.add(chatobj); - - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - log.debug("calling on listener"); - IChatRoomListener listener = (IChatRoomListener) iter.next(); - log.debug("calling newChatMessage on listener " + listener.getName()); - listener.newChatMessage(chatobj); - } - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatRoomsManager.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatRoomsManager.java deleted file mode 100755 index 4066163086..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatRoomsManager.java +++ /dev/null @@ -1,105 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.chat; - -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; -import net.jcip.annotations.ThreadSafe; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -/** - * This encapsulates access to ChatRoom and messages. This class must be threadsafe. - */ -@ThreadSafe -public class ChatRoomsManager { - private static Logger log = Red5LoggerFactory.getLogger( ChatRoomsManager.class, "bigbluebutton" ); - - private final Map rooms; - - public ChatRoomsManager() { - log.debug("In ChatRoomsManager constructor"); - rooms = new ConcurrentHashMap(); - } - - public void addRoom(ChatRoom room) { - log.debug("In ChatRoomsManager adding room " + room.getName()); - if (!hasRoom(room.getName())) { - rooms.put(room.getName(), room); - } - } - - public void removeRoom(String name) { - log.debug("In ChatRoomsManager remove room " + name); - rooms.remove(name); - } - - public boolean hasRoom(String name) { - log.debug("In ChatRoomsManager has Room " + name); - return rooms.containsKey(name); - } - - - /** - * Keeping getRoom private so that all access to ChatRoom goes through here. - */ - private ChatRoom getRoom(String name) { - log.debug("In ChatRoomsManager get room " + name); - return rooms.get(name); - } - - public List getChatMessages(String room) { - ChatRoom r = getRoom(room); - if (r != null) { - return r.getChatMessages(); - } - log.warn("Getting messages from a non-existing room " + room); - return null; - } - - public void sendMessage(String room, ChatMessageVO chatobj) { - ChatRoom r = getRoom(room); - if (r != null) { - r.sendMessage(chatobj); - } else { - log.warn("Sending message to a non-existing room " + room); - } - } - - public void addRoomListener(String roomName, IChatRoomListener listener) { - ChatRoom r = getRoom(roomName); - if (r != null) { - r.addRoomListener(listener); - return; - } - log.warn("Adding listener to a non-existing room " + roomName); - } - - //TODO: roomName? -// public void removeRoomListener(IChatRoomListener listener) { -// ChatRoom r = getRoom(roomName); -// if (r != null) { -// r.removeRoomListener(listener); -// return; -// } -// log.warn("Removing listener from a non-existing room ${roomName}"); -// } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java index c4a6ce306b..99ae148ac0 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java @@ -18,58 +18,92 @@ */ package org.bigbluebutton.conference.service.chat; +import java.util.HashMap; import java.util.Map; import org.slf4j.Logger; +import org.bigbluebutton.conference.BigBlueButtonSession; +import org.bigbluebutton.conference.Constants; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.Red5; -public class ChatService { - +public class ChatService { private static Logger log = Red5LoggerFactory.getLogger( ChatService.class, "bigbluebutton" ); private ChatApplication application; public void sendPublicChatHistory() { String meetingID = Red5.getConnectionLocal().getScope().getName(); - application.sendPublicChatHistory(meetingID); + String requesterID = getBbbSession().getInternalUserID(); + + application.sendPublicChatHistory(meetingID, requesterID); + } + + private BigBlueButtonSession getBbbSession() { + return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } public void sendPublicMessage(Map msg) { - String meetingID = Red5.getConnectionLocal().getScope().getName(); - ChatMessageVO chatObj = new ChatMessageVO(); - chatObj.chatType = msg.get("chatType").toString(); - chatObj.fromUserID = msg.get("fromUserID").toString(); - chatObj.fromUsername = msg.get("fromUsername").toString(); - chatObj.fromColor = msg.get("fromColor").toString(); - chatObj.fromTime = Double.valueOf(msg.get("fromTime").toString()); - chatObj.fromTimezoneOffset = Long.valueOf(msg.get("fromTimezoneOffset").toString()); - chatObj.fromLang = msg.get("fromLang").toString(); - chatObj.toUserID = msg.get("toUserID").toString(); - chatObj.toUsername = msg.get("toUsername").toString(); - chatObj.message = msg.get("message").toString(); + String chatType = msg.get(ChatKeyUtil.CHAT_TYPE).toString(); + String fromUserID = msg.get(ChatKeyUtil.FROM_USERID).toString(); + String fromUsername = msg.get(ChatKeyUtil.FROM_USERNAME ).toString(); + String fromColor = msg.get(ChatKeyUtil.FROM_COLOR).toString(); + String fromTime = msg.get(ChatKeyUtil.FROM_TIME).toString(); + String fromTimezoneOffset = msg.get(ChatKeyUtil.FROM_TZ_OFFSET).toString(); + String fromLang = msg.get(ChatKeyUtil.FROM_LANG).toString(); + String toUserID = msg.get(ChatKeyUtil.TO_USERID).toString(); + String toUsername = msg.get(ChatKeyUtil.TO_USERNAME).toString(); + String chatText = msg.get(ChatKeyUtil.MESSAGE).toString(); + + Map message = new HashMap(); + message.put(ChatKeyUtil.CHAT_TYPE, chatType); + message.put(ChatKeyUtil.FROM_USERID, fromUserID); + message.put(ChatKeyUtil.FROM_USERNAME, fromUsername); + message.put(ChatKeyUtil.FROM_COLOR, fromColor); + message.put(ChatKeyUtil.FROM_TIME, fromTime); + message.put(ChatKeyUtil.FROM_TZ_OFFSET, fromTimezoneOffset); + message.put(ChatKeyUtil.FROM_LANG, fromLang); + message.put(ChatKeyUtil.TO_USERID, toUserID); + message.put(ChatKeyUtil.TO_USERNAME, toUsername); + message.put(ChatKeyUtil.MESSAGE, chatText); - application.sendPublicMessage(meetingID, chatObj); + String meetingID = Red5.getConnectionLocal().getScope().getName(); + String requesterID = getBbbSession().getInternalUserID(); + + application.sendPublicMessage(meetingID, requesterID, message); } public void setChatApplication(ChatApplication a) { - log.debug("Setting Chat Applications"); application = a; } - + public void sendPrivateMessage(Map msg){ - ChatMessageVO chatObj = new ChatMessageVO(); - chatObj.chatType = msg.get("chatType").toString(); - chatObj.fromUserID = msg.get("fromUserID").toString(); - chatObj.fromUsername = msg.get("fromUsername").toString(); - chatObj.fromColor = msg.get("fromColor").toString(); - chatObj.fromTime = Double.valueOf(msg.get("fromTime").toString()); - chatObj.fromTimezoneOffset = Long.valueOf(msg.get("fromTimezoneOffset").toString()); - chatObj.fromLang = msg.get("fromLang").toString(); - chatObj.toUserID = msg.get("toUserID").toString(); - chatObj.toUsername = msg.get("toUsername").toString(); - chatObj.message = msg.get("message").toString(); + String chatType = msg.get(ChatKeyUtil.CHAT_TYPE).toString(); + String fromUserID = msg.get(ChatKeyUtil.FROM_USERID).toString(); + String fromUsername = msg.get(ChatKeyUtil.FROM_USERNAME ).toString(); + String fromColor = msg.get(ChatKeyUtil.FROM_COLOR).toString(); + String fromTime = msg.get(ChatKeyUtil.FROM_TIME).toString(); + String fromTimezoneOffset = msg.get(ChatKeyUtil.FROM_TZ_OFFSET).toString(); + String fromLang = msg.get(ChatKeyUtil.FROM_LANG).toString(); + String toUserID = msg.get(ChatKeyUtil.TO_USERID).toString(); + String toUsername = msg.get(ChatKeyUtil.TO_USERNAME).toString(); + String chatText = msg.get(ChatKeyUtil.MESSAGE).toString(); + + Map message = new HashMap(); + message.put(ChatKeyUtil.CHAT_TYPE, chatType); + message.put(ChatKeyUtil.FROM_USERID, fromUserID); + message.put(ChatKeyUtil.FROM_USERNAME, fromUsername); + message.put(ChatKeyUtil.FROM_COLOR, fromColor); + message.put(ChatKeyUtil.FROM_TIME, fromTime); + message.put(ChatKeyUtil.FROM_TZ_OFFSET, fromTimezoneOffset); + message.put(ChatKeyUtil.FROM_LANG, fromLang); + message.put(ChatKeyUtil.TO_USERID, toUserID); + message.put(ChatKeyUtil.TO_USERNAME, toUsername); + message.put(ChatKeyUtil.MESSAGE, chatText); - application.sendPrivateMessage(chatObj); + String meetingID = Red5.getConnectionLocal().getScope().getName(); + String requesterID = getBbbSession().getInternalUserID(); + + application.sendPrivateMessage(meetingID, requesterID, message); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java old mode 100755 new mode 100644 index 6a53f59598..4c7db1cff2 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java @@ -17,58 +17,29 @@ * */ package org.bigbluebutton.conference.service.layout; + +import org.bigbluebutton.core.api.IBigBlueButtonInGW; -import java.util.List; - -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class LayoutApplication { - - private static Logger log = Red5LoggerFactory.getLogger( LayoutApplication.class, "bigbluebutton" ); - - private LayoutRoomsManager roomsManager; - public LayoutHandler handler; +public class LayoutApplication { + private IBigBlueButtonInGW bbbInGW; - public boolean createRoom(String name) { - roomsManager.addRoom(new LayoutRoom(name)); - return true; + public void setBigBlueButtonInGW(IBigBlueButtonInGW inGW) { + bbbInGW = inGW; } - public boolean destroyRoom(String name) { - if (roomsManager.hasRoom(name)) { - roomsManager.removeRoom(name); - } - return true; + public void syncLayout(String meetingID, String requesterID, String layoutID) { + bbbInGW.syncLayout(meetingID, requesterID, layoutID); } - public boolean hasRoom(String name) { - return roomsManager.hasRoom(name); - } - - public boolean addRoomListener(String room, ILayoutRoomListener listener) { - if (roomsManager.hasRoom(room)){ - roomsManager.addRoomListener(room, listener); - return true; - } - log.warn("Adding listener to a non-existant room " + room); - return false; - } - - public void setRoomsManager(LayoutRoomsManager r) { - log.debug("Setting room manager"); - roomsManager = r; + public void lockLayout(String meetingID, String requesterID, String layoutID) { + bbbInGW.lockLayout(meetingID, requesterID, layoutID); } - public void lockLayout(String room, String userId, String layout) { - roomsManager.lockLayout(room, userId, layout); + public void unlockLayout(String meetingID, String requesterID) { + bbbInGW.unlockLayout(meetingID, requesterID); } - public void unlockLayout(String room) { - roomsManager.unlockLayout(room); - } - - public List currentLayout(String roomName) { - return roomsManager.currentLayout(roomName); + public void getCurrentLayout(String meetingID, String requesterID) { + bbbInGW.getCurrentLayout(meetingID, requesterID); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutHandler.java index 0c0078bd84..dfef44dae7 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutHandler.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutHandler.java @@ -18,21 +18,21 @@ */ package org.bigbluebutton.conference.service.layout; +import org.bigbluebutton.conference.BigBlueButtonSession; +import org.bigbluebutton.conference.Constants; import org.red5.logging.Red5LoggerFactory; import org.red5.server.adapter.ApplicationAdapter; import org.red5.server.adapter.IApplication; import org.red5.server.api.IClient; import org.red5.server.api.IConnection; +import org.red5.server.api.Red5; import org.red5.server.api.scope.IScope; -import org.red5.server.api.so.ISharedObject; import org.slf4j.Logger; public class LayoutHandler extends ApplicationAdapter implements IApplication { private static Logger log = Red5LoggerFactory.getLogger( LayoutHandler.class, "bigbluebutton" ); private static final String APP = "LAYOUT"; - private static final String LAYOUT_SO = "layoutSO"; - private LayoutApplication layoutApplication; @Override @@ -87,22 +87,13 @@ public class LayoutHandler extends ApplicationAdapter implements IApplication { @Override public boolean roomConnect(IConnection connection, Object[] params) { log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********"); - - ISharedObject so = getSharedObject(connection.getScope(), LAYOUT_SO, false); - log.debug("Setting up Listener"); - LayoutSender sender = new LayoutSender(so); - String room = connection.getScope().getName(); - log.debug("Adding event listener to " + room); - log.debug("Adding room listener"); - layoutApplication.addRoomListener(room, sender); - log.debug("Done setting up listener"); return true; } @Override public boolean roomStart(IScope scope) { log.debug("***** " + APP + " [ " + " roomStart [ " + scope.getName() + "] *********"); - layoutApplication.createRoom(scope.getName()); + return true; } @@ -110,10 +101,6 @@ public class LayoutHandler extends ApplicationAdapter implements IApplication { @Override public void roomStop(IScope scope) { log.debug("***** " + APP + " [ " + " roomStop [ " + scope.getName() + "] *********"); - layoutApplication.destroyRoom(scope.getName()); - if (hasSharedObject(scope, LAYOUT_SO)) { - clearSharedObjects(scope, LAYOUT_SO); - } } public void setLayoutApplication(LayoutApplication a) { @@ -121,7 +108,10 @@ public class LayoutHandler extends ApplicationAdapter implements IApplication { log.debug("Setting layout application"); layoutApplication = a; - layoutApplication.handler = this; + } + + private BigBlueButtonSession getBbbSession() { + return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutRoom.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutRoom.java deleted file mode 100755 index 2f263bde4a..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutRoom.java +++ /dev/null @@ -1,95 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.layout; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import net.jcip.annotations.ThreadSafe; - -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; -/** - * Contains information about a LayoutRoom. - */ -@ThreadSafe -public class LayoutRoom { - private static Logger log = Red5LoggerFactory.getLogger( LayoutRoom.class, "bigbluebutton" ); - - private final String name; - private final Map listeners; - private boolean locked = false; - private String modifierId = "-1"; - private String currentLayout = ""; - - public LayoutRoom(String name) { - this.name = name; - this.listeners = new ConcurrentHashMap(); - } - - public String getName() { - return name; - } - - public void addRoomListener(ILayoutRoomListener listener) { - if (! listeners.containsKey(listener.getName())) { - log.debug("adding room listener"); - listeners.put(listener.getName(), listener); - } - } - - public void removeRoomListener(ILayoutRoomListener listener) { - log.debug("removing room listener"); - listeners.remove(listener); - } - - private void updateLayout() { - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - log.debug("calling on listener"); - ILayoutRoomListener listener = (ILayoutRoomListener) iter.next(); - log.debug("calling updateLayout on listener " + listener.getName()); - listener.updateLayout(currentLayout()); - } - } - - public void lockLayout(String userId, String layout) { - locked = true; - modifierId = userId; - currentLayout = layout; - updateLayout(); - } - - public void unlockLayout() { - locked = false; - modifierId = "-1"; - currentLayout = ""; - updateLayout(); - } - - public List currentLayout() { - List args = new ArrayList(); - args.add(locked); - args.add(modifierId); - args.add(currentLayout); - return args; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutRoomsManager.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutRoomsManager.java deleted file mode 100755 index f694ea4489..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutRoomsManager.java +++ /dev/null @@ -1,112 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.layout; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import net.jcip.annotations.ThreadSafe; - -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; -/** - * This encapsulates access to LayoutRoom and messages. This class must be threadsafe. - */ -@ThreadSafe -public class LayoutRoomsManager { - private static Logger log = Red5LoggerFactory.getLogger( LayoutRoomsManager.class, "bigbluebutton" ); - - private final Map rooms; - - public LayoutRoomsManager() { - log.debug("In LayoutRoomsManager constructor"); - rooms = new ConcurrentHashMap(); - } - - public void addRoom(LayoutRoom room) { - log.debug("In LayoutRoomsManager adding room " + room.getName()); - rooms.put(room.getName(), room); - } - - public void removeRoom(String name) { - log.debug("In LayoutRoomsManager remove room " + name); - rooms.remove(name); - } - - public boolean hasRoom(String name) { - log.debug("In LayoutRoomsManager has Room " + name); - return rooms.containsKey(name); - } - - - /** - * Keeping getRoom private so that all access to ChatRoom goes through here. - */ - private LayoutRoom getRoom(String name) { - log.debug("In LayoutRoomsManager get room " + name); - return rooms.get(name); - } - - public void addRoomListener(String roomName, ILayoutRoomListener listener) { - LayoutRoom r = getRoom(roomName); - if (r != null) { - r.addRoomListener(listener); - return; - } - log.warn("Adding listener to a non-existing room " + roomName); - } - - public void removeRoomListener(String roomName, ILayoutRoomListener listener) { - LayoutRoom r = getRoom(roomName); - if (r != null) { - r.removeRoomListener(listener); - return; - } - log.warn("Removing listener to a non-existing room " + roomName); - } - - public void lockLayout(String room, String userId, String layout) { - LayoutRoom r = getRoom(room); - if (r != null) { - r.lockLayout(userId, layout); - } else { - log.warn("lockLayout: sending message to a non-existing room " + room); - } - } - - public void unlockLayout(String room) { - LayoutRoom r = getRoom(room); - if (r != null) { - r.unlockLayout(); - } else { - log.warn("unlockLayout: sending message to a non-existing room " + room); - } - } - - public List currentLayout(String room) { - LayoutRoom r = getRoom(room); - if (r != null) { - return r.currentLayout(); - } else { - log.warn("initLayout: sending message to a non-existing room " + room); - return null; - } - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutSender.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutSender.java deleted file mode 100755 index 3f9a602a4b..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutSender.java +++ /dev/null @@ -1,58 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.layout; - -import java.util.List; - -import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.so.ISharedObject; -import org.red5.server.api.statistics.ISharedObjectStatistics; -import org.slf4j.Logger; - -public class LayoutSender implements ILayoutRoomListener { - -private static Logger log = Red5LoggerFactory.getLogger( LayoutSender.class, "bigbluebutton" ); - - private ISharedObject so; - private String name = "LAYOUT"; - - public LayoutSender(ISharedObject so) { - this.so = so; - } - - @Override - public String getName() { - return name; - } - - @Override - public void updateLayout(List args) { - log.debug("Sending update layout"); - - if (so.isLocked()) log.info("Layout SO is locked"); - if (so.isAcquired()) log.info("Layout SO is acquired"); - ISharedObjectStatistics stats = so.getStatistics(); - log.debug("Before: Layout SO stats [total-sends=" + stats.getTotalSends() + "]"); - so.sendMessage("remoteUpdateLayout", args); - log.debug("After: Layout SO stats [total-sends=" + stats.getTotalSends() + "]"); - if (so.isLocked()) log.info("Layout SO is locked"); - if (so.isAcquired()) log.info("Layout SO is acquired"); - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java old mode 100755 new mode 100644 index 7b48564ca1..0720601559 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java @@ -17,8 +17,11 @@ * Author: Felipe Cecagno */ package org.bigbluebutton.conference.service.layout; - import java.util.List; +import java.util.Map; + +import org.bigbluebutton.conference.BigBlueButtonSession; +import org.bigbluebutton.conference.Constants; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.Red5; import org.slf4j.Logger; @@ -29,26 +32,33 @@ public class LayoutService { private LayoutApplication application; - public List init() { - log.debug("Initializing layout"); - String roomName = Red5.getConnectionLocal().getScope().getName(); - return application.currentLayout(roomName); + public void getCurrentLayout() { + String meetingID = Red5.getConnectionLocal().getScope().getName(); + log.debug("Received get current layout request"); + application.getCurrentLayout(meetingID, getBbbSession().getInternalUserID()); } - public void lock(String userId, String layout) { - log.debug("Layout locked"); - String roomName = Red5.getConnectionLocal().getScope().getName(); - application.lockLayout(roomName, userId, layout); + public void sync(Map message) { + String meetingID = Red5.getConnectionLocal().getScope().getName(); + application.syncLayout(meetingID, getBbbSession().getInternalUserID(), (String) message.get("layout")); + } + + public void lock(Map message) { + String meetingID = Red5.getConnectionLocal().getScope().getName(); + application.lockLayout(meetingID, (String) message.get("setByUserID"), (String) message.get("layout")); } public void unlock() { - log.debug("Layout unlocked"); - String roomName = Red5.getConnectionLocal().getScope().getName(); - application.unlockLayout(roomName); + String meetingID = Red5.getConnectionLocal().getScope().getName(); + application.unlockLayout(meetingID, getBbbSession().getInternalUserID()); } public void setLayoutApplication(LayoutApplication a) { log.debug("Setting layout application"); application = a; } + + private BigBlueButtonSession getBbbSession() { + return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); + } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.java index 096ea91e1d..5af458d7e5 100644 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.java @@ -19,15 +19,10 @@ package org.bigbluebutton.conference.service.lock; import java.util.ArrayList; -import java.util.Collection; import java.util.Map; - import org.bigbluebutton.conference.BigBlueButtonSession; import org.bigbluebutton.conference.Constants; -import org.bigbluebutton.conference.Room; -import org.bigbluebutton.conference.RoomsManager; -import org.bigbluebutton.conference.User; -import org.bigbluebutton.conference.service.participants.ParticipantsApplication; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.Red5; import org.slf4j.Logger; @@ -35,9 +30,8 @@ import org.slf4j.Logger; public class LockService { private static Logger log = Red5LoggerFactory.getLogger( LockService.class, "bigbluebutton" ); - private ParticipantsApplication application; - private final static Boolean lockModerators = true; - + private IBigBlueButtonInGW bbbInGW; + /** * Internal function used to get the session * */ @@ -45,23 +39,17 @@ public class LockService { return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } - /** - * Internal function used to set participants application (from xml) - * */ - public void setParticipantsApplication(ParticipantsApplication a) { - log.debug("Setting Participants Applications"); - application = a; + public void setBigBlueButtonInGW(IBigBlueButtonInGW inGW) { + bbbInGW = inGW; } /** * Called from client to get lock settings for this room. * */ - public Map getLockSettings(){ - String roomID = getBbbSession().getRoom(); - RoomsManager rm = application.getRoomsManager(); - Room room = rm.getRoom(roomID); - - return room.getLockSettings().toMap(); + public void getLockSettings(){ + String meetingId = getBbbSession().getRoom(); + String userId = getMyUserId(); + bbbInGW.getLockSettings(meetingId, userId); } /** @@ -73,23 +61,18 @@ public class LockService { * Returns the new lock settings for the room. * */ public void setLockSettings(Map newSettings){ - String roomID = getBbbSession().getRoom(); - RoomsManager rm = application.getRoomsManager(); - Room room = rm.getRoom(roomID); - - room.setLockSettings(new LockSettings(newSettings)); - //Send notification to clients + String meetingId = getBbbSession().getRoom(); + String userId = getMyUserId(); + bbbInGW.sendLockSettings(meetingId, userId, newSettings); } /** * Method called from client on connect to know if the room is locked or not * */ - public boolean isRoomLocked(){ - String roomID = getBbbSession().getRoom(); - RoomsManager rm = application.getRoomsManager(); - Room room = rm.getRoom(roomID); - - return room.isLocked(); + public void isRoomLocked(){ + String meetingId = getBbbSession().getRoom(); + String userId = getMyUserId(); + bbbInGW.isMeetingLocked(meetingId, userId); } /** @@ -98,29 +81,8 @@ public class LockService { * */ public void setAllUsersLock(Boolean lock, ArrayList dontLockTheseUsers){ log.debug("setAllUsersLock ({}, {})", new Object[] { lock, dontLockTheseUsers }); - String roomID = getBbbSession().getRoom(); - RoomsManager rm = application.getRoomsManager(); - Room room = rm.getRoom(roomID); - room.setLocked(lock); - Map roomUserMap = application.getParticipants(roomID); - Collection allUsers = roomUserMap.values(); - - for(User user : allUsers) { - if(lock && user.isModerator() && !room.getLockSettings().getAllowModeratorLocking()){ - log.debug("setAllUsersLock::Will not set lock for user " + user.getInternalUserID()+" because it's a moderator and allowModeratorLocking is false"); - continue; - } - - //Don't lock users listed in dontLockTheseUsers array - if(lock && dontLockTheseUsers.contains(user.getInternalUserID())){ - log.debug("setAllUsersLock::Will not lock user " + user.getInternalUserID()); - continue; - } - - log.debug("setAllUsersLock::Will lock user " + user.getInternalUserID()); - application.setParticipantStatus(roomID, user.getInternalUserID(), "locked", lock); - } + log.error("TODO: Need to implement!"); } /** @@ -128,21 +90,13 @@ public class LockService { * */ public void setUserLock(Boolean lock, String internalUserID){ log.debug("setUserLock ({}, {}, {})", new Object[] { lock, internalUserID }); - String roomID = getBbbSession().getRoom(); - Map roomUserMap = application.getParticipants(roomID); - - User user = null; - - if((user = roomUserMap.get(internalUserID)) != null) { - RoomsManager rm = application.getRoomsManager(); - Room room = rm.getRoom(roomID); - - if(lock && user.isModerator() && !room.getLockSettings().getAllowModeratorLocking()){ - log.debug("setUserLock::Will not set lock for user " + user.getInternalUserID()+" because it's a moderator and allowModeratorLocking is false"); - return; - } - - application.setParticipantStatus(roomID, user.getInternalUserID(), "locked", lock); - } + String meetingId = getBbbSession().getRoom(); + bbbInGW.lockUser(meetingId, lock, internalUserID); + } + + public String getMyUserId() { + BigBlueButtonSession bbbSession = (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); + assert bbbSession != null; + return bbbSession.getInternalUserID(); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockSettings.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockSettingsOld.java old mode 100644 new mode 100755 similarity index 97% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockSettings.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockSettingsOld.java index 799089d826..86cb66a0a9 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockSettings.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockSettingsOld.java @@ -21,7 +21,7 @@ package org.bigbluebutton.conference.service.lock; import java.util.HashMap; import java.util.Map; -public class LockSettings { +public class LockSettingsOld { private Boolean allowModeratorLocking; private Boolean disableCam; private Boolean disableMic; @@ -31,7 +31,7 @@ public class LockSettings { /** * Read a map object received from client * */ - public LockSettings(Map lsMap) { + public LockSettingsOld(Map lsMap) { if(lsMap.containsKey("allowModeratorLocking")) allowModeratorLocking = lsMap.get("allowModeratorLocking"); else diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java new file mode 100644 index 0000000000..b4d94eab2d --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java @@ -0,0 +1,89 @@ +package org.bigbluebutton.conference.service.messaging; + +public class Constants { + public static final String NAME = "name"; + public static final String HEADER = "header"; + public static final String PAYLOAD = "payload"; + public static final String MEETING_ID = "meeting_id"; + public static final String TIMESTAMP = "timestamp"; + public static final String USER_ID = "userid"; + public static final String RECORDED = "recorded"; + public static final String MEETING_NAME = "meeting_name"; + public static final String VOICE_CONF = "voice_conf"; + public static final String DURATION = "duration"; + public static final String AUTH_TOKEN = "auth_token"; + public static final String ROLE = "role"; + public static final String EXT_USER_ID = "external_user_id"; + public static final String REQUESTER_ID = "requester_id"; + public static final String REPLY_TO = "reply_to"; + public static final String LOWERED_BY = "lowered_by"; + public static final String STREAM = "stream"; + public static final String LOCKED = "locked"; + public static final String SETTINGS = "settings"; + public static final String LOCK = "lock"; + public static final String EXCEPT_USERS = "except_users"; + public static final String STATUS = "status"; + public static final String VALUE = "value"; + public static final String NEW_PRESENTER_ID = "new_presenter_id"; + public static final String NEW_PRESENTER_NAME = "new_presenter_name"; + public static final String ASSIGNED_BY = "assigned_by"; + public static final String RECORDING = "recording"; + public static final String LAYOUT_ID = "layout_id"; + public static final String POLL = "poll"; + public static final String POLL_ID = "poll_id"; + public static final String FORCE = "force"; + public static final String RESPONSE = "response"; + public static final String PRESENTATION_ID = "presentation_id"; + public static final String X_OFFSET = "x_offset"; + public static final String Y_OFFSET = "y_offset"; + public static final String WIDTH_RATIO = "width_ratio"; + public static final String HEIGHT_RATIO = "height_ratio"; + public static final String PAGE = "page"; + public static final String SHARE = "share"; + public static final String PRESENTATIONS = "presentations"; + public static final String MESSAGE_KEY = "message_key"; + public static final String CODE = "code"; + public static final String PRESENTATION_NAME = "presentation_name"; + public static final String NUM_PAGES = "num_pages"; + public static final String MAX_NUM_PAGES = "max_num_pages"; + public static final String PAGES_COMPLETED = "pages_completed"; + public static final String MUTE = "mute"; + public static final String CALLER_ID_NUM = "caller_id_num"; + public static final String CALLER_ID_NAME = "caller_id_name"; + public static final String TALKING = "talking"; + public static final String USER = "user"; + public static final String MUTED = "muted"; + public static final String VOICE_USER = "voice_user"; + public static final String RECORDING_FILE = "recording_file"; + public static final String ANNOTATION = "annotation"; + public static final String WHITEBOARD_ID = "whiteboard_id"; + public static final String ENABLE = "enable"; + public static final String PRESENTER = "presenter"; + public static final String USERS = "users"; + public static final String RAISE_HAND = "raise_hand"; + public static final String HAS_STREAM = "has_stream"; + public static final String WEBCAM_STREAM = "webcam_stream"; + public static final String PHONE_USER = "phone_user"; + public static final String PERMISSIONS = "permissions"; + public static final String VALID = "valid"; + public static final String CHAT_HISTORY = "chat_history"; + public static final String MESSAGE = "message"; + public static final String SET_BY_USER_ID = "set_by_user_id"; + public static final String POLLS = "polls"; + public static final String REASON = "reason"; + public static final String RESPONDER = "responder"; + public static final String PRESENTATION_INFO = "presentation_info"; + public static final String SHAPES = "shapes"; + public static final String SHAPE = "shape"; + public static final String SHAPE_ID = "shape_id"; + public static final String PRESENTATION = "presentation"; + public static final String ID = "id"; + public static final String CURRENT = "current"; + public static final String PAGES = "pages"; + public static final String WEB_USER_ID = "web_user_id"; + public static final String JOINED = "joined"; + public static final String X_PERCENT = "x_percent"; + public static final String Y_PERCENT = "y_percent"; + public static final String KEEP_ALIVE_ID = "keep_alive_id"; + public static final String INTERNAL_USER_ID = "internal_user_id"; +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/CreateMeetingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/CreateMeetingMessage.java new file mode 100755 index 0000000000..def7d9593a --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/CreateMeetingMessage.java @@ -0,0 +1,20 @@ +package org.bigbluebutton.conference.service.messaging; + +public class CreateMeetingMessage implements IMessage { + public static final String CREATE_MEETING_REQUEST_EVENT = "create_meeting_request"; + public static final String VERSION = "0.0.1"; + + public final String id; + public final String name; + public final Boolean record; + public final String voiceBridge; + public final Long duration; + + public CreateMeetingMessage(String id, String name, Boolean record, String voiceBridge, Long duration) { + this.id = id; + this.name = name; + this.record = record; + this.voiceBridge = voiceBridge; + this.duration = duration; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/DestroyMeetingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/DestroyMeetingMessage.java new file mode 100755 index 0000000000..01106c1730 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/DestroyMeetingMessage.java @@ -0,0 +1,12 @@ +package org.bigbluebutton.conference.service.messaging; + +public class DestroyMeetingMessage implements IMessage { + public static final String DESTROY_MEETING_REQUEST_EVENT = "destroy_meeting_request_event"; + public static final String VERSION = "0.0.1"; + + public final String meetingId; + + public DestroyMeetingMessage(String meetingId) { + this.meetingId = meetingId; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/EndMeetingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/EndMeetingMessage.java new file mode 100755 index 0000000000..3a02401421 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/EndMeetingMessage.java @@ -0,0 +1,12 @@ +package org.bigbluebutton.conference.service.messaging; + +public class EndMeetingMessage implements IMessage { + public static final String END_MEETING_REQUEST_EVENT = "end_meeting_request_event"; + public static final String VERSION = "0.0.1"; + + public final String meetingId; + + public EndMeetingMessage(String meetingId) { + this.meetingId = meetingId; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/IMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/IMessage.java new file mode 100755 index 0000000000..2414f55a30 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/IMessage.java @@ -0,0 +1,5 @@ +package org.bigbluebutton.conference.service.messaging; + +public interface IMessage { + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/KeepAliveMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/KeepAliveMessage.java new file mode 100644 index 0000000000..6cebf71a4a --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/KeepAliveMessage.java @@ -0,0 +1,12 @@ +package org.bigbluebutton.conference.service.messaging; + +public class KeepAliveMessage implements IMessage { + public static final String KEEP_ALIVE_REQUEST = "keep_alive_request"; + public static final String VERSION = "0.0.1"; + + public final String keepAliveId; + + public KeepAliveMessage(String keepAliveId) { + this.keepAliveId = keepAliveId; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageBuilder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageBuilder.java new file mode 100755 index 0000000000..2137a063b5 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageBuilder.java @@ -0,0 +1,36 @@ +package org.bigbluebutton.conference.service.messaging; + +import java.util.concurrent.TimeUnit; + +import com.google.gson.Gson; + +public class MessageBuilder { + public final static String VERSION = "version"; + + public static long generateTimestamp() { + return TimeUnit.NANOSECONDS.toMillis(System.nanoTime()); + } + + public static java.util.HashMap buildHeader(String name, String version, String replyTo) { + java.util.HashMap header = new java.util.HashMap(); + header.put(Constants.NAME, name); + header.put(VERSION, version); + header.put(Constants.TIMESTAMP, generateTimestamp()); + if (replyTo != null && replyTo != "") + header.put(Constants.REPLY_TO, replyTo); + + return header; + } + + + public static String buildJson(java.util.HashMap header, + java.util.HashMap payload) { + + java.util.HashMap> message = new java.util.HashMap>(); + message.put(Constants.HEADER, header); + message.put(Constants.PAYLOAD, payload); + + Gson gson = new Gson(); + return gson.toJson(message); + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageFromJsonConverter.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageFromJsonConverter.java new file mode 100644 index 0000000000..10748e1914 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageFromJsonConverter.java @@ -0,0 +1,77 @@ +package org.bigbluebutton.conference.service.messaging; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +public class MessageFromJsonConverter { + + public static IMessage convert(String message) { + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + + if (obj.has("header") && obj.has("payload")) { + JsonObject header = (JsonObject) obj.get("header"); + JsonObject payload = (JsonObject) obj.get("payload"); + + if (header.has("name")) { + String messageName = header.get("name").getAsString(); + switch (messageName) { + case CreateMeetingMessage.CREATE_MEETING_REQUEST_EVENT: + return processCreateMeeting(payload); + case DestroyMeetingMessage.DESTROY_MEETING_REQUEST_EVENT: + return processDestroyMeeting(payload); + case EndMeetingMessage.END_MEETING_REQUEST_EVENT: + return processEndMeetingMessage(payload); + case KeepAliveMessage.KEEP_ALIVE_REQUEST: + return processKeepAlive(payload); + case RegisterUserMessage.REGISTER_USER: + System.out.println("Registering a user"); + return RegisterUserMessage.fromJson(message); + case ValidateAuthTokenMessage.VALIDATE_AUTH_TOKEN: + return processValidateAuthTokenMessage(header, payload); + case UserConnectedToGlobalAudio.USER_CONNECTED_TO_GLOBAL_AUDIO: + System.out.println("Converting message to UserConnectedToGlobalAudio"); + return UserConnectedToGlobalAudio.fromJson(message); + case UserDisconnectedFromGlobalAudio.USER_DISCONNECTED_FROM_GLOBAL_AUDIO: + System.out.println("Converting message to UserDisconnectedFromGlobalAudio"); + return UserDisconnectedFromGlobalAudio.fromJson(message); + } + } + } + return null; + } + + private static IMessage processValidateAuthTokenMessage(JsonObject header, JsonObject payload) { + String id = payload.get(Constants.MEETING_ID).getAsString(); + String userid = payload.get(Constants.USER_ID).getAsString(); + String authToken = payload.get(Constants.AUTH_TOKEN).getAsString(); + String replyTo = header.get(Constants.REPLY_TO).getAsString(); + + return new ValidateAuthTokenMessage(id, userid, authToken, replyTo); + } + + private static IMessage processCreateMeeting(JsonObject payload) { + String id = payload.get(Constants.MEETING_ID).getAsString(); + String name = payload.get(Constants.NAME).getAsString(); + Boolean record = payload.get(Constants.RECORDED).getAsBoolean(); + String voiceBridge = payload.get(Constants.VOICE_CONF).getAsString(); + Long duration = payload.get(Constants.DURATION).getAsLong(); + + return new CreateMeetingMessage(id, name, record, voiceBridge, duration); + } + + private static IMessage processDestroyMeeting(JsonObject payload) { + String id = payload.get(Constants.MEETING_ID).getAsString(); + return new DestroyMeetingMessage(id); + } + + private static IMessage processEndMeetingMessage(JsonObject payload) { + String id = payload.get(Constants.MEETING_ID).getAsString(); + return new EndMeetingMessage(id); + } + + private static IMessage processKeepAlive(JsonObject payload) { + String id = payload.get(Constants.KEEP_ALIVE_ID).getAsString(); + return new KeepAliveMessage(id); + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java old mode 100755 new mode 100644 index 1418bd522b..5d5e57aa1f --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java @@ -1,7 +1,7 @@ /** * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ * -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* Copyright (c) 2014 BigBlueButton Inc. and by respective authors (see below). * * This program is free software; you can redistribute it and/or modify it under the * terms of the GNU Lesser General Public License as published by the Free Software @@ -19,20 +19,36 @@ package org.bigbluebutton.conference.service.messaging; public class MessagingConstants { - //BigBlueButton Pattern - public static final String BIGBLUEBUTTON_PATTERN = "bigbluebutton:meeting:*"; - - //Messaging channels for each module - public static final String SYSTEM_CHANNEL = "bigbluebutton:meeting:system"; - public static final String PARTICIPANTS_CHANNEL = "bigbluebutton:meeting:participants"; - public static final String PRESENTATION_CHANNEL = "bigbluebutton:meeting:presentation"; - + public static final String FROM_BBB_APPS_CHANNEL = "bigbluebutton:from-bbb-apps"; + public static final String FROM_BBB_APPS_PATTERN = FROM_BBB_APPS_CHANNEL + ":*"; + public static final String FROM_SYSTEM_CHANNEL = FROM_BBB_APPS_CHANNEL + ":system"; + public static final String FROM_MEETING_CHANNEL = FROM_BBB_APPS_CHANNEL + ":meeting"; + public static final String FROM_PRESENTATION_CHANNEL = FROM_BBB_APPS_CHANNEL + ":presentation"; + public static final String FROM_POLLING_CHANNEL = FROM_BBB_APPS_CHANNEL + ":polling"; + public static final String FROM_USERS_CHANNEL = FROM_BBB_APPS_CHANNEL + ":users"; + public static final String FROM_CHAT_CHANNEL = FROM_BBB_APPS_CHANNEL + ":chat"; + public static final String FROM_WHITEBOARD_CHANNEL = FROM_BBB_APPS_CHANNEL + ":whiteboard"; + + public static final String TO_BBB_APPS_CHANNEL = "bigbluebutton:to-bbb-apps"; + public static final String TO_BBB_APPS_PATTERN = TO_BBB_APPS_CHANNEL + ":*"; + public static final String TO_MEETING_CHANNEL = TO_BBB_APPS_CHANNEL + ":meeting"; + public static final String TO_SYSTEM_CHANNEL = TO_BBB_APPS_CHANNEL + ":system"; + public static final String TO_PRESENTATION_CHANNEL = TO_BBB_APPS_CHANNEL + ":presentation"; + public static final String TO_POLLING_CHANNEL = TO_BBB_APPS_CHANNEL + ":polling"; + public static final String TO_USERS_CHANNEL = TO_BBB_APPS_CHANNEL + ":users"; + public static final String TO_CHAT_CHANNEL = TO_BBB_APPS_CHANNEL + ":chat"; + public static final String TO_WHITEBOARD_CHANNEL = TO_BBB_APPS_CHANNEL + ":whiteboard"; + + public static final String DESTROY_MEETING_REQUEST_EVENT = "DestroyMeetingRequestEvent"; + public static final String CREATE_MEETING_REQUEST_EVENT = "CreateMeetingRequestEvent"; public static final String END_MEETING_REQUEST_EVENT = "EndMeetingRequestEvent"; - public static final String MEETING_STARTED_EVENT = "MeetingStartedEvent"; - public static final String MEETING_ENDED_EVENT = "MeetingEndedEvent"; + public static final String MEETING_STARTED_EVENT = "meeting_created_message"; + public static final String MEETING_ENDED_EVENT = "meeting_ended_event"; + public static final String MEETING_DESTROYED_EVENT = "meeting_destroyed_event"; public static final String USER_JOINED_EVENT = "UserJoinedEvent"; public static final String USER_LEFT_EVENT = "UserLeftEvent"; - public static final String USER_STATUS_CHANGE_EVENT = "UserStatusChangeEvent"; + public static final String USER_STATUS_CHANGE_EVENT = "UserStatusChangeEvent"; + public static final String SEND_POLLS_EVENT = "SendPollsEvent"; public static final String RECORD_STATUS_EVENT = "RecordStatusEvent"; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java index f182ca5dda..8721b188ca 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java @@ -18,10 +18,10 @@ */ package org.bigbluebutton.conference.service.messaging; +import redis.clients.jedis.Jedis; + public interface MessagingService { - public void start(); - public void stop(); public void send(String channel, String message); - public void addListener(MessageListener listener); - public void removeListener(MessageListener listener); + public Jedis createRedisClient(); + public void dropRedisClient(Jedis jedis); } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java deleted file mode 100755 index d7b8d20244..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java +++ /dev/null @@ -1,159 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.messaging; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; - -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; - -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; -import redis.clients.jedis.JedisPubSub; - -public class RedisMessagingService implements MessagingService{ - - private static Logger log = Red5LoggerFactory.getLogger(RedisMessagingService.class, "bigbluebutton"); - - private JedisPool redisPool; - private final Executor exec = Executors.newSingleThreadExecutor(); - private Runnable pubsubListener; - - private final Set listeners = new HashSet(); - - public RedisMessagingService(){ - - } - - @Override - public void start() { - log.debug("Starting redis pubsub..."); - final Jedis jedis = redisPool.getResource(); - try { - pubsubListener = new Runnable() { - public void run() { - jedis.psubscribe(new PubSubListener(), MessagingConstants.BIGBLUEBUTTON_PATTERN); - } - }; - exec.execute(pubsubListener); - } catch (Exception e) { - log.error("Error subscribing to channels: " + e.getMessage()); - } - } - - @Override - public void stop() { - try { - redisPool.destroy(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - public void send(String channel, String message) { - Jedis jedis = redisPool.getResource(); - try { - jedis.publish(channel, message); - } catch(Exception e){ - log.warn("Cannot publish the message to redis", e); - }finally{ - redisPool.returnResource(jedis); - } - } - - @Override - public void addListener(MessageListener listener) { - listeners.add(listener); - } - - @Override - public void removeListener(MessageListener listener) { - listeners.remove(listener); - } - - public void setRedisPool(JedisPool redisPool){ - this.redisPool=redisPool; - } - - private class PubSubListener extends JedisPubSub { - - public PubSubListener() { - super(); - } - - @Override - public void onMessage(String channel, String message) { - // Not used. - } - - @Override - public void onPMessage(String pattern, String channel, String message) { - log.debug("Message Received in channel: " + channel); - Gson gson = new Gson(); - HashMap map = gson.fromJson(message, new TypeToken>() {}.getType()); - - if(channel.equalsIgnoreCase(MessagingConstants.SYSTEM_CHANNEL)){ - String meetingId = map.get("meetingId"); - String messageId = map.get("messageId"); - if(messageId != null){ - if(MessagingConstants.END_MEETING_REQUEST_EVENT.equalsIgnoreCase(messageId)){ - for (MessageListener listener : listeners) { - listener.endMeetingRequest(meetingId); - } - } - } - } - else if(channel.equalsIgnoreCase(MessagingConstants.PRESENTATION_CHANNEL)){ - for (MessageListener listener : listeners) { - listener.presentationUpdates(map); - } - } - - } - - @Override - public void onPSubscribe(String pattern, int subscribedChannels) { - log.debug("Subscribed to the pattern: " + pattern); - } - - @Override - public void onPUnsubscribe(String pattern, int subscribedChannels) { - // Not used. - } - - @Override - public void onSubscribe(String channel, int subscribedChannels) { - // Not used. - } - - @Override - public void onUnsubscribe(String channel, int subscribedChannels) { - // Not used. - } - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RegisterUserMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RegisterUserMessage.java new file mode 100644 index 0000000000..9e7dfe5259 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RegisterUserMessage.java @@ -0,0 +1,73 @@ +package org.bigbluebutton.conference.service.messaging; + +import java.util.HashMap; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +public class RegisterUserMessage implements IMessage { + public static final String REGISTER_USER = "register_user_request"; + public final String VERSION = "0.0.1"; + + public final String meetingID; + public final String internalUserId; + public final String fullname; + public final String role; + public final String externUserID; + public final String authToken; + + public RegisterUserMessage(String meetingID, String internalUserId, String fullname, String role, String externUserID, String authToken) { + this.meetingID = meetingID; + this.internalUserId = internalUserId; + this.fullname = fullname; + this.role = role; + this.externUserID = externUserID; + this.authToken = authToken; + } + + public String toJson() { + HashMap payload = new HashMap(); + + payload.put(Constants.MEETING_ID, meetingID); + payload.put(Constants.INTERNAL_USER_ID, internalUserId); + payload.put(Constants.NAME, fullname); + payload.put(Constants.ROLE, role); + payload.put(Constants.EXT_USER_ID, externUserID); + payload.put(Constants.AUTH_TOKEN, authToken); + + java.util.HashMap header = MessageBuilder.buildHeader(REGISTER_USER, VERSION, null); + + return MessageBuilder.buildJson(header, payload); + } + public static RegisterUserMessage fromJson(String message) { + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + + if (obj.has("header") && obj.has("payload")) { + JsonObject header = (JsonObject) obj.get("header"); + JsonObject payload = (JsonObject) obj.get("payload"); + + if (header.has("name")) { + String messageName = header.get("name").getAsString(); + if (REGISTER_USER.equals(messageName)) { + if (payload.has(Constants.MEETING_ID) + && payload.has(Constants.NAME) + && payload.has(Constants.ROLE) + && payload.has(Constants.EXT_USER_ID) + && payload.has(Constants.AUTH_TOKEN)) { + + String meetingID = payload.get(Constants.MEETING_ID).getAsString(); + String fullname = payload.get(Constants.NAME).getAsString(); + String role = payload.get(Constants.ROLE).getAsString(); + String externUserID = payload.get(Constants.EXT_USER_ID).getAsString(); + String authToken = payload.get(Constants.AUTH_TOKEN).getAsString(); + + //use externalUserId twice - once for external, once for internal + return new RegisterUserMessage(meetingID, externUserID, fullname, role, externUserID, authToken); + } + } + } + } + System.out.println("Failed to parse RegisterUserMessage"); + return null; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserConnectedToGlobalAudio.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserConnectedToGlobalAudio.java new file mode 100644 index 0000000000..3ae49d0faf --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserConnectedToGlobalAudio.java @@ -0,0 +1,59 @@ +package org.bigbluebutton.conference.service.messaging; + +import java.util.HashMap; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +public class UserConnectedToGlobalAudio implements IMessage { + public static final String USER_CONNECTED_TO_GLOBAL_AUDIO = "user_connected_to_global_audio"; + public static final String VERSION = "0.0.1"; + + public final String voiceConf; + public final String name; + public final String userid; + + + + public UserConnectedToGlobalAudio(String voiceConf, String userid, String name) { + this.voiceConf = voiceConf; + this.userid = userid; + this.name = name; + } + + public String toJson() { + HashMap payload = new HashMap(); + payload.put(Constants.VOICE_CONF, voiceConf); + payload.put(Constants.USER_ID, userid); + payload.put(Constants.NAME, name); + + java.util.HashMap header = MessageBuilder.buildHeader(USER_CONNECTED_TO_GLOBAL_AUDIO, VERSION, null); + + return MessageBuilder.buildJson(header, payload); + } + + public static UserConnectedToGlobalAudio fromJson(String message) { + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + + if (obj.has("header") && obj.has("payload")) { + JsonObject header = (JsonObject) obj.get("header"); + JsonObject payload = (JsonObject) obj.get("payload"); + + if (header.has("name")) { + String messageName = header.get("name").getAsString(); + if (USER_CONNECTED_TO_GLOBAL_AUDIO.equals(messageName)) { + if (payload.has(Constants.VOICE_CONF) + && payload.has(Constants.USER_ID) + && payload.has(Constants.NAME)) { + String voiceConf = payload.get(Constants.VOICE_CONF).getAsString(); + String userid = payload.get(Constants.USER_ID).getAsString(); + String name = payload.get(Constants.NAME).getAsString(); + return new UserConnectedToGlobalAudio(voiceConf, userid, name); + } + } + } + } + return null; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserDisconnectedFromGlobalAudio.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserDisconnectedFromGlobalAudio.java new file mode 100644 index 0000000000..8014ebba55 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserDisconnectedFromGlobalAudio.java @@ -0,0 +1,57 @@ +package org.bigbluebutton.conference.service.messaging; + +import java.util.HashMap; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +public class UserDisconnectedFromGlobalAudio implements IMessage { + public static final String USER_DISCONNECTED_FROM_GLOBAL_AUDIO = "user_disconnected_from_global_audio"; + public static final String VERSION = "0.0.1"; + + public final String voiceConf; + public final String name; + public final String userid; + + public UserDisconnectedFromGlobalAudio(String voiceConf, String userid, String name) { + this.voiceConf = voiceConf; + this.userid = userid; + this.name = name; + } + + public String toJson() { + HashMap payload = new HashMap(); + payload.put(Constants.VOICE_CONF, voiceConf); + payload.put(Constants.USER_ID, userid); + payload.put(Constants.NAME, name); + + java.util.HashMap header = MessageBuilder.buildHeader(USER_DISCONNECTED_FROM_GLOBAL_AUDIO, VERSION, null); + + return MessageBuilder.buildJson(header, payload); + } + + public static UserDisconnectedFromGlobalAudio fromJson(String message) { + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + + if (obj.has("header") && obj.has("payload")) { + JsonObject header = (JsonObject) obj.get("header"); + JsonObject payload = (JsonObject) obj.get("payload"); + + if (header.has("name")) { + String messageName = header.get("name").getAsString(); + if (USER_DISCONNECTED_FROM_GLOBAL_AUDIO.equals(messageName)) { + if (payload.has(Constants.VOICE_CONF) + && payload.has(Constants.USER_ID) + && payload.has(Constants.NAME)) { + String voiceConf = payload.get(Constants.VOICE_CONF).getAsString(); + String userid = payload.get(Constants.USER_ID).getAsString(); + String name = payload.get(Constants.NAME).getAsString(); + return new UserDisconnectedFromGlobalAudio(voiceConf, userid, name); + } + } + } + } + System.out.println("Failed to parse UserDisconnectedFromGlobalAudio"); + return null; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/ValidateAuthTokenMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/ValidateAuthTokenMessage.java new file mode 100644 index 0000000000..157f0ef404 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/ValidateAuthTokenMessage.java @@ -0,0 +1,18 @@ +package org.bigbluebutton.conference.service.messaging; + +public class ValidateAuthTokenMessage implements IMessage { + public static final String VALIDATE_AUTH_TOKEN = "validate_auth_token"; + public static final String VERSION = "0.0.1"; + + public final String meetingId; + public final String userId; + public final String token; + public final String replyTo; + + public ValidateAuthTokenMessage(String meetingId, String userId, String token, String replyTo) { + this.meetingId = meetingId; + this.userId = userId; + this.token = token; + this.replyTo = replyTo; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageDistributor.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageDistributor.java new file mode 100755 index 0000000000..d8518438ea --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageDistributor.java @@ -0,0 +1,25 @@ +package org.bigbluebutton.conference.service.messaging.redis; + +import java.util.Set; + +public class MessageDistributor { + private ReceivedMessageHandler handler; + private Set listeners; + + public void setMessageListeners(Set listeners) { + this.listeners = listeners; + } + + public void setMessageHandler(ReceivedMessageHandler handler) { + this.handler = handler; + if (handler != null) { + handler.setMessageDistributor(this); + } + } + + public void notifyListeners(String pattern, String channel, String message) { + for (MessageHandler listener : listeners) { + listener.handleMessage(pattern, channel, message); + } + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageHandler.java new file mode 100755 index 0000000000..64e25cb510 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageHandler.java @@ -0,0 +1,23 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.service.messaging.redis; + +public interface MessageHandler { + void handleMessage(String pattern, String channel, String message); +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageReceiver.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageReceiver.java new file mode 100755 index 0000000000..066171f5a7 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageReceiver.java @@ -0,0 +1,89 @@ +package org.bigbluebutton.conference.service.messaging.redis; + +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import org.bigbluebutton.conference.service.messaging.MessagingConstants; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPubSub; + +public class MessageReceiver { + private static Logger log = Red5LoggerFactory.getLogger(MessageReceiver.class, "bigbluebutton"); + + private ReceivedMessageHandler handler; + + private JedisPool redisPool; + private volatile boolean receiveMessage = false; + + private final Executor msgReceiverExec = Executors.newSingleThreadExecutor(); + + public void stop() { + receiveMessage = false; + } + + public void start() { + log.info("Ready to receive messages from Redis pubsub."); + try { + receiveMessage = true; + final Jedis jedis = redisPool.getResource(); + + Runnable messageReceiver = new Runnable() { + public void run() { + if (receiveMessage) { + jedis.psubscribe(new PubSubListener(), MessagingConstants.TO_BBB_APPS_PATTERN); + } + } + }; + msgReceiverExec.execute(messageReceiver); + } catch (Exception e) { + log.error("Error subscribing to channels: " + e.getMessage()); + } + } + + public void setRedisPool(JedisPool redisPool){ + this.redisPool = redisPool; + } + + public void setMessageHandler(ReceivedMessageHandler handler) { + this.handler = handler; + } + + private class PubSubListener extends JedisPubSub { + + public PubSubListener() { + super(); + } + + @Override + public void onMessage(String channel, String message) { + // Not used. + } + + @Override + public void onPMessage(String pattern, String channel, String message) { + handler.handleMessage(pattern, channel, message); + } + + @Override + public void onPSubscribe(String pattern, int subscribedChannels) { + log.debug("Subscribed to the pattern: " + pattern); + } + + @Override + public void onPUnsubscribe(String pattern, int subscribedChannels) { + // Not used. + } + + @Override + public void onSubscribe(String channel, int subscribedChannels) { + // Not used. + } + + @Override + public void onUnsubscribe(String channel, int subscribedChannels) { + // Not used. + } + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageSender.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageSender.java new file mode 100755 index 0000000000..d62103de1c --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageSender.java @@ -0,0 +1,67 @@ +package org.bigbluebutton.conference.service.messaging.redis; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; + +public class MessageSender { + private static Logger log = Red5LoggerFactory.getLogger(MessageSender.class, "bigbluebutton"); + + private JedisPool redisPool; + private volatile boolean sendMessage = false; + + private final Executor msgSenderExec = Executors.newSingleThreadExecutor(); + private BlockingQueue messages = new LinkedBlockingQueue(); + + public void stop() { + sendMessage = false; + } + + public void start() { + log.info("Redis message publisher starting!"); + try { + sendMessage = true; + + Runnable messageSender = new Runnable() { + public void run() { + while (sendMessage) { + try { + MessageToSend msg = messages.take(); + publish(msg.getChannel(), msg.getMessage()); + } catch (InterruptedException e) { + log.warn("Failed to get message from queue."); + } + } + } + }; + msgSenderExec.execute(messageSender); + } catch (Exception e) { + log.error("Error subscribing to channels: " + e.getMessage()); + } + } + + public void send(String channel, String message) { + MessageToSend msg = new MessageToSend(channel, message); + messages.add(msg); + } + + private void publish(String channel, String message) { + Jedis jedis = redisPool.getResource(); + try { + jedis.publish(channel, message); + } catch(Exception e){ + log.warn("Cannot publish the message to redis", e); + } finally { + redisPool.returnResource(jedis); + } + } + + public void setRedisPool(JedisPool redisPool){ + this.redisPool = redisPool; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageToSend.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageToSend.java new file mode 100755 index 0000000000..e01dfc84e1 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/MessageToSend.java @@ -0,0 +1,19 @@ +package org.bigbluebutton.conference.service.messaging.redis; + +public class MessageToSend { + private final String channel; + private final String message; + + public MessageToSend(String channel, String message) { + this.channel = channel; + this.message = message; + } + + public String getChannel() { + return channel; + } + + public String getMessage() { + return message; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/ReceivedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/ReceivedMessage.java new file mode 100755 index 0000000000..9319407276 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/ReceivedMessage.java @@ -0,0 +1,28 @@ +package org.bigbluebutton.conference.service.messaging.redis; + +public class ReceivedMessage { + + private final String pattern; + private final String channel; + private final String message; + + public ReceivedMessage(String pattern, String channel, String message) { + this.pattern = pattern; + this.channel = channel; + this.message = message; + } + + public String getPattern() { + return pattern; + } + + public String getChannel() { + return channel; + } + + public String getMessage() { + return message; + } + + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/ReceivedMessageHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/ReceivedMessageHandler.java new file mode 100755 index 0000000000..8f35167607 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/redis/ReceivedMessageHandler.java @@ -0,0 +1,69 @@ +package org.bigbluebutton.conference.service.messaging.redis; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; + +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +public class ReceivedMessageHandler { + private static Logger log = Red5LoggerFactory.getLogger(ReceivedMessageHandler.class, "bigbluebutton"); + + private BlockingQueue receivedMessages = new LinkedBlockingQueue(); + + private volatile boolean processMessage = false; + + private final Executor msgProcessorExec = Executors.newSingleThreadExecutor(); + + + private MessageDistributor handler; + + public void stop() { + processMessage = false; + } + + public void start() { + log.info("Ready to handle messages from Redis pubsub!"); + + try { + processMessage = true; + + Runnable messageProcessor = new Runnable() { + public void run() { + while (processMessage) { + try { + ReceivedMessage msg = receivedMessages.take(); + processMessage(msg); + } catch (InterruptedException e) { + log.warn("Error while taking received message from queue."); + } + } + } + }; + msgProcessorExec.execute(messageProcessor); + } catch (Exception e) { + log.error("Error subscribing to channels: " + e.getMessage()); + } + } + + private void processMessage(ReceivedMessage msg) { + if (handler != null) { + log.debug("Let's process this message: " + msg.getMessage()); + + handler.notifyListeners(msg.getPattern(), msg.getChannel(), msg.getMessage()); + } else { + log.warn("No listeners interested in messages from Redis!"); + } + } + + public void handleMessage(String pattern, String channel, String message) { + ReceivedMessage rm = new ReceivedMessage(pattern, channel, message); + receivedMessages.add(rm); + } + + public void setMessageDistributor(MessageDistributor h) { + this.handler = h; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java index 63375e2f59..f2f2540f97 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java @@ -1,7 +1,7 @@ /** * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ * -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* Copyright (c) 2014 BigBlueButton Inc. and by respective authors (see below). * * This program is free software; you can redistribute it and/or modify it under the * terms of the GNU Lesser General Public License as published by the Free Software @@ -20,151 +20,70 @@ package org.bigbluebutton.conference.service.participants; import org.slf4j.Logger; import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.Red5; - import java.util.ArrayList; -import java.util.Map; -import org.bigbluebutton.conference.ConnectionInvokerService; -import org.bigbluebutton.conference.RoomsManager; -import org.bigbluebutton.conference.Room; import org.bigbluebutton.conference.User; import org.bigbluebutton.conference.IRoomListener; -import org.bigbluebutton.conference.service.lock.LockSettings; - +import java.util.Map; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; + public class ParticipantsApplication { private static Logger log = Red5LoggerFactory.getLogger( ParticipantsApplication.class, "bigbluebutton" ); - private ConnectionInvokerService connInvokerService; - - private RoomsManager roomsManager; - - public boolean createRoom(String name, Boolean locked, LockSettings lockSettings) { - if(!roomsManager.hasRoom(name)){ - log.info("Creating room " + name); - roomsManager.addRoom(new Room(name, locked, lockSettings)); - return true; - } - return false; + private IBigBlueButtonInGW bbbInGW; + + public void userRaiseHand(String meetingId, String userId) { + bbbInGW.userRaiseHand(meetingId, userId); } - public boolean destroyRoom(String name) { - if (roomsManager.hasRoom(name)) { - log.info("Destroying room " + name); - roomsManager.removeRoom(name); - } else { - log.warn("Destroying non-existing room " + name); - } - return true; + public void lowerHand(String meetingId, String userId, String loweredBy) { + bbbInGW.lowerHand(meetingId, userId, loweredBy); } - public void destroyAllRooms() { - roomsManager.destroyAllRooms(); + public void shareWebcam(String meetingId, String userId, String stream) { + bbbInGW.shareWebcam(meetingId, userId, stream); } - public boolean hasRoom(String name) { - return roomsManager.hasRoom(name); - } - - public boolean addRoomListener(String room, IRoomListener listener) { - if (roomsManager.hasRoom(room)){ - roomsManager.addRoomListener(room, listener); - return true; - } - log.warn("Adding listener to a non-existant room " + room); - return false; + public void unshareWebcam(String meetingId, String userId) { + bbbInGW.unshareWebcam(meetingId, userId); } public void setParticipantStatus(String room, String userid, String status, Object value) { - roomsManager.changeParticipantStatus(room, userid, status, value); + bbbInGW.setUserStatus(room, userid, status, value); } - - public Map getParticipants(String roomName) { - log.debug("getParticipants - " + roomName); - if (! roomsManager.hasRoom(roomName)) { - log.warn("Could not find room " + roomName + ". Total rooms " + roomsManager.numberOfRooms()); - return null; - } - return roomsManager.getParticipants(roomName); + public boolean participantJoin(String roomName, String userid) { //is this used?! + log.debug("Participant " + userid + " joining room " + roomName); + System.out.println("\n\n\n\n participantJoin is being used \n\n\n"); + bbbInGW.userJoin(roomName, userid); + return true; } - - public boolean participantLeft(String roomName, String userid) { + + public boolean participantLeft(String roomName, String userid) { //is this used?! log.debug("Participant " + userid + " leaving room " + roomName); - if (roomsManager.hasRoom(roomName)) { - Room room = roomsManager.getRoom(roomName); - log.debug("Removing " + userid + " from room " + roomName); - room.removeParticipant(userid); - return true; - } - - return false; - } - - @SuppressWarnings("unchecked") - public boolean participantJoin(String roomName, String userid, String username, String role, String externUserID, Map status) { - log.debug("participant joining room " + roomName); - if (roomsManager.hasRoom(roomName)) { - Room room = roomsManager.getRoom(roomName); - Boolean userLocked = false; - - LockSettings ls = room.getLockSettings(); - - if(room.isLocked()) { - //If room is locked and it's not a moderator, user join as locked - if(!"MODERATOR".equals(role)) - userLocked = true; - else { - //If it's a moderator, check for lockSettings - if(ls.getAllowModeratorLocking()) { - userLocked = true; - } - } - } - - User p = new User(userid, username, role, externUserID, status, userLocked); - room.addParticipant(p); - - log.debug("participant joined room " + roomName); - return true; - } - log.debug("participant failed to join room " + roomName); - return false; - } - - public ArrayList getCurrentPresenter(String room){ - if (roomsManager.hasRoom(room)){ - return roomsManager.getCurrentPresenter(room); - } - log.warn("Getting presenter on a non-existant room " + room); - return null; - } - - public void assignPresenter(String room, ArrayList presenter){ - if (roomsManager.hasRoom(room)){ - roomsManager.assignPresenter(room, presenter); - return; - } - log.warn("Assigning presenter on a non-existant room " + room); - } - - public void setRoomsManager(RoomsManager r) { - log.debug("Setting room manager"); - roomsManager = r; - } - - public RoomsManager getRoomsManager() { - return roomsManager; - } - - private String getMeetingId(){ - return Red5.getConnectionLocal().getScope().getName(); - } - - public void setConnInvokerService(ConnectionInvokerService connInvokerService) { - this.connInvokerService = connInvokerService; + System.out.println("\n\n\n\n participantLeft is being used \n\n\n"); + bbbInGW.userLeft(roomName, userid); + return true; } - public void setRecordingStatus(String room, String userid, Boolean recording) { - roomsManager.changeRecordingStatus(room, userid, recording); + public boolean registerUser(String roomName, String userid, String username, String role, String externUserID) { + System.out.println("\n\n\n\n registerUser is being used \n\n\n"); + bbbInGW.registerUser(roomName, userid, username, role, externUserID, userid); + return true; } - public Boolean getRecordingStatus(String roomName) { - return roomsManager.getRecordingStatus(roomName); + public void assignPresenter(String room, String newPresenterID, String newPresenterName, String assignedBy){ + bbbInGW.assignPresenter(room, newPresenterID, newPresenterName, assignedBy); + } + + public void getUsers(String meetingID, String requesterID) { + bbbInGW.getUsers(meetingID, requesterID); + } + + public void setBigBlueButtonInGW(IBigBlueButtonInGW inGW) { + bbbInGW = inGW; + } + + public void setRecordingStatus(String meetingId, String userId, Boolean recording) { + bbbInGW.setRecordingStatus(meetingId, userId, recording); + } + + public void getRecordingStatus(String meetingId, String userId) { + bbbInGW.getRecordingStatus(meetingId, userId); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java deleted file mode 100755 index 6707060bbb..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java +++ /dev/null @@ -1,115 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference.service.participants; - -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import org.bigbluebutton.conference.service.recorder.Recorder; -import org.bigbluebutton.conference.IRoomListener; -import org.bigbluebutton.conference.BigBlueButtonUtils; import org.red5.server.api.so.ISharedObject; -import org.bigbluebutton.conference.User; -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; - -public class ParticipantsEventSender implements IRoomListener { - - private static Logger log = Red5LoggerFactory.getLogger( ParticipantsEventSender.class, "bigbluebutton" ); - - Recorder recorder; - private ISharedObject so; - String name = "PARTICIPANT_EVENT_SENDER"; - - private final String RECORD_EVENT_JOIN="join"; - private final String RECORD_EVENT_LEAVE="leave"; - private final String RECORD_EVENT_STATUS_CHANGE="status_change"; - private final String RECORD_EVENT_LEAVE_ALL="leave_all"; - - - public ParticipantsEventSender(ISharedObject so) { - this.so = so; - } - - @SuppressWarnings({ "rawtypes" }) - @Override - public void endAndKickAll() { - so.sendMessage("logout", new ArrayList()); - } - - @SuppressWarnings("unchecked") - @Override - public void assignPresenter(ArrayList presenter) { - log.debug("calling assignPresenterCallback " + presenter.get(0) + ", " + presenter.get(1) + " " + presenter.get(2)); - so.sendMessage("assignPresenterCallback", presenter); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void participantJoined(User p) { - log.debug("A participant has joined " + p.getInternalUserID()); - ArrayList args = new ArrayList(); - args.add(p.toMap()); - log.debug("Sending participantJoined " + p.getExternalUserID() + " to client."); - so.sendMessage("participantJoined", args); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void participantLeft(User p) { - ArrayList args = new ArrayList(); - args.add(p.getInternalUserID()); - so.sendMessage("participantLeft", args); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void participantStatusChange(User p, String status, Object value) { - log.debug("A participant's status has changed " + p.getInternalUserID() + " " + status + " " + value); - ArrayList args = new ArrayList(); - args.add(p.getInternalUserID()); - args.add(status); - args.add(value); - so.sendMessage("participantStatusChange", args); - } - - @Override - public String getName() { - // TODO Auto-generated method stub - return name; - } - - @Override - public void lockSettingsChange(Map lockSettings) { - List list = new ArrayList(); - list.add(lockSettings); - so.sendMessage("lockSettingsChange", list); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void recordingStatusChange(User p, Boolean recording) { - log.debug("The recording status has changed " + p.getInternalUserID() + " " + recording); - ArrayList args = new ArrayList(); - args.add(p.getInternalUserID()); - args.add(recording); - so.sendMessage("recordingStatusChange", args); - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java index 0ad87eda02..9eb0e84eee 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java @@ -25,21 +25,19 @@ import org.red5.server.api.IConnection; import org.slf4j.Logger; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.scope.IScope; -import org.red5.server.api.so.ISharedObject; import org.red5.server.adapter.ApplicationAdapter; -import org.red5.server.api.Red5; +import org.red5.server.api.Red5; import java.util.HashMap; -import java.util.Map; import org.bigbluebutton.conference.BigBlueButtonSession; import org.bigbluebutton.conference.Constants; import org.bigbluebutton.conference.service.recorder.RecorderApplication; -import org.bigbluebutton.conference.service.recorder.participants.ParticipantsEventRecorder; +import java.util.Map; +import org.bigbluebutton.conference.BigBlueButtonSession; +import org.bigbluebutton.conference.Constants; public class ParticipantsHandler extends ApplicationAdapter implements IApplication{ private static Logger log = Red5LoggerFactory.getLogger( ParticipantsHandler.class, "bigbluebutton" ); - - private static final String PARTICIPANTS_SO = "participantsSO"; + private static final String APP = "USERS"; private ParticipantsApplication participantsApplication; - private RecorderApplication recorderApplication; @Override public boolean appConnect(IConnection conn, Object[] params) { @@ -88,23 +86,13 @@ public class ParticipantsHandler extends ApplicationAdapter implements IApplicat @Override public boolean roomConnect(IConnection connection, Object[] params) { log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********"); - - ISharedObject so = getSharedObject(connection.getScope(), PARTICIPANTS_SO, false); - ParticipantsEventSender sender = new ParticipantsEventSender(so); - ParticipantsEventRecorder recorder = new ParticipantsEventRecorder(connection.getScope().getName(), recorderApplication); - - log.debug("Adding room listener " + connection.getScope().getName()); - participantsApplication.addRoomListener(connection.getScope().getName(), recorder); - participantsApplication.addRoomListener(connection.getScope().getName(), sender); - log.debug("Done setting up recorder and listener"); - return true; } @Override public boolean roomJoin(IClient client, IScope scope) { log.debug(APP + ":roomJoin " + scope.getName() + " - " + scope.getParent().getName()); - participantJoin(); + registerUser(); return true; } @@ -114,20 +102,15 @@ public class ParticipantsHandler extends ApplicationAdapter implements IApplicat BigBlueButtonSession bbbSession = getBbbSession(); if (bbbSession == null) { log.debug("roomLeave - session is null"); - } else { - participantsApplication.participantLeft(scope.getName(), bbbSession.getInternalUserID()); } } @Override public void roomStop(IScope scope) { log.debug("***** " + APP + " [ " + " roomStop [ " + scope.getName() + "] *********"); - if (hasSharedObject(scope, PARTICIPANTS_SO)) { - clearSharedObjects(scope, PARTICIPANTS_SO); - } } - public boolean participantJoin() { + public void registerUser() { log.debug(APP + ":participantJoin - getting userid"); BigBlueButtonSession bbbSession = getBbbSession(); if (bbbSession != null) { @@ -141,21 +124,19 @@ public class ParticipantsHandler extends ApplicationAdapter implements IApplicat status.put("raiseHand", false); status.put("presenter", false); status.put("hasStream", false); - return participantsApplication.participantJoin(room, userid, username, role, bbbSession.getExternUserID(), status); + + participantsApplication.registerUser(room, userid, username, role, bbbSession.getExternUserID()); } log.warn("Can't send user join as session is null."); - return false; } public void setParticipantsApplication(ParticipantsApplication a) { participantsApplication = a; } - public void setRecorderApplication(RecorderApplication a) { - recorderApplication = a; - } private BigBlueButtonSession getBbbSession() { return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } + } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java new file mode 100644 index 0000000000..265fcf77d4 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java @@ -0,0 +1,56 @@ + +package org.bigbluebutton.conference.service.participants; + + +import org.bigbluebutton.conference.service.messaging.MessagingConstants; +import org.bigbluebutton.conference.service.messaging.redis.MessageHandler; +//import org.bigbluebutton.core.api.*; + +import org.bigbluebutton.core.api.IBigBlueButtonInGW; +import com.google.gson.JsonParser; +import com.google.gson.JsonObject; + +public class ParticipantsListener implements MessageHandler{ + + private IBigBlueButtonInGW bbbInGW; + + public void setBigBlueButtonInGW(IBigBlueButtonInGW bbbInGW) { + this.bbbInGW = bbbInGW; + } + + @Override + public void handleMessage(String pattern, String channel, String message) { + if (channel.equalsIgnoreCase(MessagingConstants.TO_USERS_CHANNEL)) { + System.out.println("AntonChannel=(participants)" + channel); + + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + JsonObject headerObject = (JsonObject) obj.get("header"); + JsonObject payloadObject = (JsonObject) obj.get("payload"); + + String eventName = headerObject.get("name").toString().replace("\"", ""); + + if(eventName.equalsIgnoreCase("user_leaving_request") || + eventName.equalsIgnoreCase("raise_user_hand_request")){ + + String roomName = payloadObject.get("meeting_id").toString().replace("\"", ""); + String userID = payloadObject.get("userid").toString().replace("\"", ""); + + if(eventName.equalsIgnoreCase("user_leaving_request")){ + bbbInGW.userLeft(roomName, userID); + } + else if(eventName.equalsIgnoreCase("raise_user_hand_request")){ + boolean raise = Boolean.parseBoolean(payloadObject.get("raise").toString().replace("\"", "")); + + if(raise){ + bbbInGW.userRaiseHand(roomName, userID); + } + else { + String requesterID = payloadObject.get("requester_id").toString().replace("\"", ""); + bbbInGW.lowerHand(roomName, userID, requesterID); + } + } + } + } + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java index 99bf26f3ad..ed73bcd480 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java @@ -20,96 +20,85 @@ package org.bigbluebutton.conference.service.participants; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.Red5; import org.red5.server.api.scope.IScope; +import java.util.Map; +import org.bigbluebutton.conference.BigBlueButtonSession; +import org.bigbluebutton.conference.Constants; + -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; import org.bigbluebutton.conference.User; - public class ParticipantsService { - private static Logger log = Red5LoggerFactory.getLogger( ParticipantsService.class, "bigbluebutton" ); private ParticipantsApplication application; - @SuppressWarnings("unchecked") - public void assignPresenter(String userid, String name, Long assignedBy) { - log.info("Receive assignPresenter request from client [" + userid + "," + name + "," + assignedBy + "]"); + public void assignPresenter(Map msg) { + IScope scope = Red5.getConnectionLocal().getScope(); - ArrayList presenter = new ArrayList(); - presenter.add(userid); - presenter.add(name); - presenter.add(assignedBy.toString()); - ArrayList curPresenter = application.getCurrentPresenter(scope.getName()); - application.setParticipantStatus(scope.getName(), userid, "presenter", true); - - if (curPresenter != null){ - String curUserid = (String) curPresenter.get(0); - if (! curUserid.equals(userid)){ - log.info("Changing the current presenter [" + curPresenter.get(0) + "] to viewer."); - application.setParticipantStatus(scope.getName(), curPresenter.get(0), "presenter", false); - } - } else { - log.info("No current presenter. So do nothing."); - } - application.assignPresenter(scope.getName(), presenter); + log.debug("Checking assignPresenter values " + msg.get("newPresenterID") + " " + msg.get("newPresenterName") + " " + msg.get("assignedBy")); + application.assignPresenter(scope.getName(), (String) msg.get("newPresenterID"), (String) msg.get("newPresenterName"), (String) msg.get("assignedBy")); } - @SuppressWarnings("unchecked") - public Map getParticipants() { - String roomName = Red5.getConnectionLocal().getScope().getName(); - log.info("Client is requesting for list of participants in [" + roomName + "]."); - Map p = application.getParticipants(roomName); - Map participants = new HashMap(); - if (p == null) { - participants.put("count", 0); - log.debug("partipants of " + roomName + " is null"); - } else { - - participants.put("count", p.size()); - log.debug("number of partipants is " + p.size()); - if (p.size() > 0) { - /** - * Somehow we need to convert to Map so the client will be - * able to decode it. Need to figure out if we can send Participant - * directly. (ralam - 2/20/2009) - */ - Collection pc = p.values(); - Map pm = new HashMap(); - for (Iterator it = pc.iterator(); it.hasNext();) { - User ap = (User) it.next(); - pm.put(ap.getInternalUserID(), ap.toMap()); - } - participants.put("participants", pm); - } - } - return participants; + public void getParticipants() { + IScope scope = Red5.getConnectionLocal().getScope(); + application.getUsers(scope.getName(), getBbbSession().getInternalUserID()); } - public void setParticipantStatus(String userid, String status, Object value) { + public void userRaiseHand() { + IScope scope = Red5.getConnectionLocal().getScope(); + String userId = getBbbSession().getInternalUserID(); + application.userRaiseHand(scope.getName(), userId); + } + + public void lowerHand(Map msg) { + String userId = (String) msg.get("userId"); + String loweredBy = (String) msg.get("loweredBy"); + IScope scope = Red5.getConnectionLocal().getScope(); + application.lowerHand(scope.getName(), userId, loweredBy); + } + + public void shareWebcam(String stream) { + IScope scope = Red5.getConnectionLocal().getScope(); + String userId = getBbbSession().getInternalUserID(); + application.shareWebcam(scope.getName(), userId, stream); + } + + public void unshareWebcam() { + IScope scope = Red5.getConnectionLocal().getScope(); + String userId = getBbbSession().getInternalUserID(); + application.unshareWebcam(scope.getName(), userId); + } + + public void setParticipantStatus(Map msg) { String roomName = Red5.getConnectionLocal().getScope().getName(); - log.debug("Setting participant status " + roomName + " " + userid + " " + status + " " + value); - application.setParticipantStatus(roomName, userid, status, value); + + application.setParticipantStatus(roomName, (String) msg.get("userID"), (String) msg.get("status"), (Object) msg.get("value")); } public void setParticipantsApplication(ParticipantsApplication a) { log.debug("Setting Participants Applications"); application = a; } - - public void setRecordingStatus(String userid, Boolean recording) { + + public void setRecordingStatus(Map msg) { String roomName = Red5.getConnectionLocal().getScope().getName(); - log.debug("Setting recording status " + roomName + " " + userid + " " + recording); - application.setRecordingStatus(roomName, userid, recording); + application.setRecordingStatus(roomName, (String)msg.get("userId"), (Boolean) msg.get("recording")); } - public Boolean getRecordingStatus() { + public void getRecordingStatus() { String roomName = Red5.getConnectionLocal().getScope().getName(); log.info("Client is requesting the recording status in [" + roomName + "]."); - return application.getRecordingStatus(roomName); + application.getRecordingStatus(roomName, getMyUserId()); } + + public String getMyUserId() { + BigBlueButtonSession bbbSession = (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); + assert bbbSession != null; + return bbbSession.getInternalUserID(); + } + + private BigBlueButtonSession getBbbSession() { + return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); + } + } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/IPollRoomListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/IPollRoomListener.java deleted file mode 100644 index 0c3bf97bbf..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/IPollRoomListener.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.bigbluebutton.conference.service.poll; -import java.util.ArrayList; -import org.bigbluebutton.conference.service.poll.Poll; - -public interface IPollRoomListener { - public String getName(); - public void savePoll(Poll poll ); -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/Poll.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/Poll.java deleted file mode 100644 index 95b3ae187e..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/Poll.java +++ /dev/null @@ -1,116 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 2.1 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference.service.poll; - -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; - -import net.jcip.annotations.ThreadSafe; -import java.util.concurrent.ConcurrentHashMap; -import java.util.ArrayList; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -@ThreadSafe -public class Poll{ - - // Poll URL http://142.204.133.24/bigbluebutton/polls.jsp?poll={webKey} - - /* KEY PLACES TO UPDATE, WHEN ADDING NEW FIELDS TO THE HASH: - * PollService.java, getPoll() - * PollInvoker.java, invoke() - * PollRecorder.java, record() - * Don't forget the client side as well (key locations found in PollObject.as) - */ - - private static Logger log = Red5LoggerFactory.getLogger( Poll.class, "bigbluebutton" ); - - private String LOGNAME = "[Poll]"; - - // IMPORTANT: For every field you add to the hash, add one to the value of otherFields. - // The value MUST always reflect how many fields are in the hash, except for answers and votes. - - private static int otherFields = 10; - - public final String title; // 1 - public final String room; // 2 - public final Boolean isMultiple; // 3 - public final String question; // 4 - public ArrayList answers; // -- - public ArrayList votes; // -- - public String time; // 5 - public int totalVotes; // 6 - public Boolean status; // 7 - public int didNotVote; // 8 - public Boolean publishToWeb; // 9 - public String webKey; // 10 - - @SuppressWarnings("unchecked") - public Poll (ArrayList otherPoll){ - title = otherPoll.get(0).toString(); - room = otherPoll.get(1).toString(); - isMultiple = (Boolean)otherPoll.get(2); - question = otherPoll.get(3).toString(); - answers = (ArrayList)otherPoll.get(4); - votes = (ArrayList)otherPoll.get(5); - time = otherPoll.get(6).toString(); - totalVotes = Integer.parseInt(otherPoll.get(7).toString()); - status = (Boolean)otherPoll.get(8); - didNotVote = Integer.parseInt(otherPoll.get(9).toString()); - publishToWeb = (Boolean)otherPoll.get(10); - if (publishToWeb && webKey != null){ - webKey = otherPoll.get(11).toString(); - } - else{ - webKey = ""; - } - } - - public String getRoom() { - return room; - } - - public void checkObject(){ - // This just loops through the Poll and does a bunch of log.debug messages to verify the contents. - if (this != null){ - log.debug(LOGNAME + "Running CheckObject on the poll with title " + title); - log.debug(LOGNAME + "Room is: " + room); - log.debug(LOGNAME + "isMultiple is: " + isMultiple.toString()); - log.debug(LOGNAME + "Question is: " + question); - log.debug(LOGNAME + "Answers are: " + answers); - log.debug(LOGNAME + "Votes are: " + votes); - log.debug(LOGNAME + "Time is: " + time); - log.debug(LOGNAME + "TotalVotes is: " + totalVotes); - log.debug(LOGNAME + "Status is: " + status.toString()); - log.debug(LOGNAME + "DidNotVote is: " + didNotVote); - log.debug(LOGNAME + "PublishToWeb is: " + publishToWeb.toString()); - log.debug(LOGNAME + "WebKey is: " + webKey); - }else{ - log.error(LOGNAME + "This Poll is NULL."); - } - } - - public static int getOtherFields(){ - return otherFields; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollApplication.java deleted file mode 100644 index 0b5736c7a5..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollApplication.java +++ /dev/null @@ -1,230 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 2.1 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference.service.poll; - -import java.net.*; -import java.util.List; - -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; - -import java.util.ArrayList; -import java.io.*; -import java.util.Scanner; - -import org.bigbluebutton.conference.service.poll.PollRoomsManager; -import org.bigbluebutton.conference.service.poll.PollRoom; -import org.bigbluebutton.conference.service.poll.IPollRoomListener; -import org.bigbluebutton.conference.service.recorder.polling.PollRecorder; -import org.bigbluebutton.conference.service.recorder.polling.PollInvoker; - -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; - -public class PollApplication { - - private static Logger log = Red5LoggerFactory.getLogger( PollApplication.class, "bigbluebutton" ); - - private static final String APP = "Poll"; - private PollRoomsManager roomsManager; - private String CURRENTKEY = "bbb-polling-webID"; - private Integer MAX_WEBKEYS = 9999; - private Integer MIN_WEBKEYS = 1000; - private static String BBB_FILE = "/var/lib/tomcat6/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties"; - private static String BBB_SERVER_FIELD = "bigbluebutton.web.serverURL"; - - public PollHandler handler; - - public boolean createRoom(String name) { - roomsManager.addRoom(new PollRoom(name)); - return true; - } - - public boolean destroyRoom(String name) { - if (roomsManager.hasRoom(name)) - roomsManager.removeRoom(name); - destroyPolls(name); - return true; - } - - public void destroyPolls(String name){ - // Destroy polls that were created in the room - Jedis jedis = dbConnect(); - ArrayList polls = titleList(); - for (int i = 0; i < polls.size(); i++){ - String pollKey = name + "-" + polls.get(i).toString(); - Poll doomedPoll = getPoll(pollKey); - if (doomedPoll.publishToWeb){ - cutOffWebPoll(pollKey); - } - try{ - jedis.del(pollKey); - } - catch (Exception e){ - log.error("Poll deletion failed."); - } - } - } - - public void cutOffWebPoll(String pollKey){ - Jedis jedis = dbConnect(); - String webKey = jedis.hget(pollKey, "webKey"); - try{ - jedis.del(webKey); - } - catch (Exception e){ - log.error("Error in deleting web key " + webKey); - } - } - - public boolean hasRoom(String name) { - return roomsManager.hasRoom(name); - } - - public boolean addRoomListener(String room, IPollRoomListener listener) { - if (roomsManager.hasRoom(room)){ - roomsManager.addRoomListener(room, listener); - return true; - } - log.error("Adding listener to a non-existant room " + room); - return false; - } - - public void setRoomsManager(PollRoomsManager r) { - log.debug("Setting room manager"); - roomsManager = r; - } - - public void savePoll(Poll poll) { - PollRecorder pollRecorder = new PollRecorder(); - pollRecorder.record(poll); - } - - public Poll getPoll(String pollKey) - { - PollInvoker pollInvoker = new PollInvoker(); - return pollInvoker.invoke(pollKey); - } - - // AnswerIDs comes in as an array of each answer the user voted for - // If they voted for answers 3 and 5, the array could be [0] = 3, [1] = 5 or the other way around, shouldn't matter - public void vote(String pollKey, Object[] answerIDs, Boolean webVote){ - PollRecorder recorder = new PollRecorder(); - Poll poll = getPoll(pollKey); - recorder.vote(pollKey, poll, answerIDs, webVote); - } - - public ArrayList titleList() - { - PollInvoker pollInvoker = new PollInvoker(); - ArrayList titles = pollInvoker.titleList(); - return titles; - } - - public void setStatus(String pollKey, Boolean status){ - PollRecorder pollRecorder = new PollRecorder(); - pollRecorder.setStatus(pollKey, status); - } - - public ArrayList generate(String pollKey){ - Jedis jedis = dbConnect(); - if (!jedis.exists(CURRENTKEY)){ - Integer base = MIN_WEBKEYS -1; - jedis.set(CURRENTKEY, base.toString()); - } - // The value stored in the bbb-polling-webID key represents the next available web-friendly poll ID - ArrayList webInfo = new ArrayList(); - - String nextWebKey = webKeyIncrement(Integer.parseInt(jedis.get(CURRENTKEY)), jedis); - jedis.del(nextWebKey); - jedis.set(nextWebKey, pollKey); - // Save the webKey that is being used as part of the poll key, for quick reference later - jedis.hset(pollKey, "webKey", nextWebKey); - // Replace the value stored in bbb-polling-webID - jedis.set(CURRENTKEY, nextWebKey); - webInfo.add(nextWebKey); - String hostname = getLocalIP(); - webInfo.add(hostname); - - return webInfo; - } - - private String webKeyIncrement(Integer index, Jedis jedis){ - String nextIndex; - if (++index <= MAX_WEBKEYS){ - nextIndex = index.toString(); - }else{ - nextIndex = MIN_WEBKEYS.toString(); - } - return nextIndex; - } - - public static Jedis dbConnect(){ - String serverIP = "127.0.0.1"; - //String serverIP = getLocalIP(); - //serverIP = serverIP.substring(7); - JedisPool redisPool = new JedisPool(serverIP, 6379); - try{ - return redisPool.getResource(); - } - catch (Exception e){ - log.error("Error in PollApplication.dbConnect():"); - log.error(e.toString()); - } - log.error("Returning NULL from dbConnect()"); - return null; - } - - private static String getLocalIP() - { - File parseFile = new File(BBB_FILE); - try{ - Scanner scanner = new Scanner(new FileReader(parseFile)); - Boolean found = false; - String serverAddress = ""; - while (!found && scanner.hasNextLine()){ - serverAddress = processLine(scanner.nextLine()); - if (!serverAddress.equals("")){ - found = true; - } - } - scanner.close(); - return serverAddress; - } - catch (Exception e){ - log.error("Error in scanning " + BBB_FILE + " to find server address."); - } - return null; - } - - private static String processLine(String line){ - //use a second Scanner to parse the content of each line - Scanner scanner = new Scanner(line); - scanner.useDelimiter("="); - if ( scanner.hasNext() ){ - String name = scanner.next(); - if (name.equals(BBB_SERVER_FIELD)){ - String value = scanner.next(); - return value; - } - } - return ""; - } -} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollHandler.java deleted file mode 100755 index 5a95fb4c80..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 2.1 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference.service.poll; - -import org.red5.server.adapter.IApplication; -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; -import org.red5.server.adapter.ApplicationAdapter; -import org.red5.server.api.scope.IScope; -import org.bigbluebutton.conference.service.recorder.RecorderApplication; - -public class PollHandler extends ApplicationAdapter implements IApplication { - - private static Logger log = Red5LoggerFactory.getLogger( PollHandler.class, "bigbluebutton" ); - private static final String APP = "POLL"; - private PollApplication pollApplication; - - - @Override - public boolean roomStart(IScope scope) { - log.debug(APP + " roomStart " + scope.getName()); - pollApplication.createRoom(scope.getName()); - log.debug(APP + " inside roomStart startin room"); - return true; - } - - @Override - public void roomStop(IScope scope) { - log.debug(APP +"roomStop ", scope.getName()); - pollApplication.destroyRoom(scope.getName()); - } - - - public void setPollApplication(PollApplication a) { - log.debug("Setting chat application"); - pollApplication = a; - pollApplication.handler = this; - } - - public void setRecorderApplication(RecorderApplication a) { - log.debug(APP + " Setting poll archive application"); - } - - - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollRoom.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollRoom.java deleted file mode 100644 index d998b7eb48..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollRoom.java +++ /dev/null @@ -1,67 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 2.1 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference.service.poll; - -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; -import net.jcip.annotations.ThreadSafe; -import java.util.concurrent.ConcurrentHashMap; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /* Contains information about a PollRoom. - */ -@ThreadSafe -public class PollRoom { - private static Logger log = Red5LoggerFactory.getLogger( PollRoom.class, "bigbluebutton" ); - - private final String name; - private final Map listeners; - ArrayList messages; - - public PollRoom(String name) { - this.name = name; - listeners = new ConcurrentHashMap(); - this.messages = new ArrayList(); - } - - public String getName() { - return name; - } - - public void addRoomListener(IPollRoomListener listener) { - if (! listeners.containsKey(listener.getName())) { - listeners.put(listener.getName(), listener); - } - } - - public void removeRoomListener(IPollRoomListener listener) { - listeners.remove(listener); - } - - @SuppressWarnings("unchecked") - public void savePoll(Poll poll){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - IPollRoomListener listener = (IPollRoomListener) iter.next(); - listener.savePoll(poll); - } - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollRoomsManager.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollRoomsManager.java deleted file mode 100644 index f37d6405c8..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollRoomsManager.java +++ /dev/null @@ -1,81 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 2.1 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.poll; - -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; -import net.jcip.annotations.ThreadSafe; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * This encapsulates access to PollRoom and messages. This class must be threadsafe. - */ -@ThreadSafe -public class PollRoomsManager { - private static Logger log = Red5LoggerFactory.getLogger( PollRoomsManager.class, "bigbluebutton" ); - - private final Map rooms; - - public PollRoomsManager() { - rooms = new ConcurrentHashMap(); - } - - public void addRoom(PollRoom room) { - rooms.put(room.getName(), room); - } - - public void removeRoom(String name) { - rooms.remove(name); - } - - public boolean hasRoom(String name) { - - return rooms.containsKey(name); - } - - - /** - * Keeping getRoom private so that all access to PollRoom goes through here. - */ - private PollRoom getRoom(String name) { - return rooms.get(name); - } - - public void savePoll(Poll poll) { - String room = poll.room; - PollRoom r = getRoom(room); - if (r != null) { - r.savePoll(poll); - } else { - log.warn("Sending message to a non-existing room " + poll.room); - } - } - - public void addRoomListener(String roomName, IPollRoomListener listener) { - PollRoom r = getRoom(roomName); - if (r != null) { - r.addRoomListener(listener); - return; - } - log.warn("Adding listener to a non-existing room " + roomName); - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollService.java old mode 100644 new mode 100755 index 381ba4cdae..7e4004f625 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/PollService.java @@ -18,89 +18,68 @@ */ package org.bigbluebutton.conference.service.poll; -import org.apache.commons.lang.time.DateFormatUtils; -import org.bigbluebutton.conference.service.poll.PollApplication; -import org.bigbluebutton.conference.service.poll.Poll; -import java.util.ArrayList; - -import java.util.List; - import org.slf4j.Logger; +import org.bigbluebutton.conference.BigBlueButtonSession; +import org.bigbluebutton.conference.Constants; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.so.ISharedObject; - import org.red5.server.api.Red5; +import org.red5.server.api.scope.IScope; -import redis.clients.jedis.Jedis; - - -public class PollService { - +public class PollService { private static Logger log = Red5LoggerFactory.getLogger( PollService.class, "bigbluebutton" ); - private PollApplication application; - private String LOGNAME = "[PollService]"; - private Poll poll; + private IBigBlueButtonInGW bbbInGW; - public void savePoll(ArrayList clientSidePoll){ - String pollTime = DateFormatUtils.formatUTC(System.currentTimeMillis(), "MM/dd/yy HH:mm"); - clientSidePoll.set(6, pollTime); - poll = new Poll(clientSidePoll); - application.savePoll(poll); + public void setBigBlueButtonInGW(IBigBlueButtonInGW inGW) { + bbbInGW = inGW; } - public ArrayList publish(ArrayList clientSidePoll, String pollKey){ - savePoll(clientSidePoll); - return getPoll(pollKey); + public void getPolls() { + bbbInGW.getPolls(getMeetingID(), getRequesterID()); } - public void setPollApplication(PollApplication a) { - log.debug(LOGNAME + "Setting Poll Applications"); - application = a; - } - - public ArrayList getPoll(String pollKey) - { - Poll poll = application.getPoll(pollKey); + public void createPoll(String msg){ + System.out.println("*** PollService:: create poll \n" + msg + "\n"); - ArrayList values = new ArrayList(); - values.add(poll.title); - values.add(poll.room); - values.add(poll.isMultiple); - values.add(poll.question); - values.add(poll.answers); - values.add(poll.votes); - values.add(poll.time); - values.add(poll.totalVotes); - values.add(poll.status); - values.add(poll.didNotVote); - values.add(poll.publishToWeb); - values.add(poll.webKey); - return values; + bbbInGW.createPoll(getMeetingID(), getRequesterID(), msg); + } + + public void updatePoll(String msg){ + System.out.println("*** PollService:: update poll \n" + msg + "\n"); + bbbInGW.updatePoll(getMeetingID(), getRequesterID(), msg); } - public ArrayList vote(String pollKey, ArrayList answerIDs, Boolean webVote) - { - application.vote(pollKey, answerIDs.toArray(), webVote); - return getPoll(pollKey); + public void startPoll(String msg){ + System.out.println("*** PollService:: start poll \n" + msg + "\n"); + bbbInGW.startPoll(getMeetingID(), getRequesterID(), msg); } - public ArrayList titleList() - { - return application.titleList(); + public void stopPoll(String msg){ + System.out.println("*** PollService:: stop poll \n" + msg + "\n"); + bbbInGW.stopPoll(getMeetingID(), getRequesterID(), msg); } - public void setStatus(String pollKey, Boolean status){ - application.setStatus(pollKey, status); + public void removePoll(String msg){ + System.out.println("*** PollService:: remove poll \n" + msg + "\n"); + bbbInGW.removePoll(getMeetingID(), getRequesterID(), msg); } - public ArrayList generate(String pollKey){ - ArrayList webInfo = new ArrayList(); - webInfo = application.generate(pollKey); - return webInfo; + public void respondPoll(String msg){ + System.out.println("*** PollService:: respond poll \n" + msg + "\n"); + bbbInGW.respondPoll(getMeetingID(), getRequesterID(), msg); } - public void cutOffWebPoll(String pollKey){ - application.cutOffWebPoll(pollKey); + private String getMeetingID() { + IScope scope = Red5.getConnectionLocal().getScope(); + return scope.getName(); + } + + private String getRequesterID() { + return getBbbSession().getInternalUserID(); + } + + private BigBlueButtonSession getBbbSession() { + return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/messaging/redis/PollRedisMessageHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/messaging/redis/PollRedisMessageHandler.java new file mode 100755 index 0000000000..b142018d03 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/poll/messaging/redis/PollRedisMessageHandler.java @@ -0,0 +1,43 @@ +package org.bigbluebutton.conference.service.poll.messaging.redis; + + +import org.bigbluebutton.conference.service.messaging.MessagingConstants; +import org.bigbluebutton.conference.service.messaging.redis.MessageHandler; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +public class PollRedisMessageHandler implements MessageHandler { + private static Logger log = Red5LoggerFactory.getLogger(PollRedisMessageHandler.class, "bigbluebutton"); + + private IBigBlueButtonInGW bbbGW; + + @Override + public void handleMessage(String pattern, String channel, String message) { +// log.debug("Checking message: " + pattern + " " + channel + " " + message); + if (channel.equalsIgnoreCase(MessagingConstants.TO_POLLING_CHANNEL)){ + Gson gson = new Gson(); + JsonParser parser = new JsonParser(); + JsonObject obj = parser.parse(message).getAsJsonObject(); + String messageId = gson.fromJson(obj.get("messageId"), String.class); + + //HashMap map = gson.fromJson(message, new TypeToken>() {}.getType()); + + //String messageId = map.get("messageId"); + if (messageId != null){ + if (MessagingConstants.SEND_POLLS_EVENT.equalsIgnoreCase(messageId)){ + String meetingId = gson.fromJson(obj.get("meetingId"), String.class); + bbbGW.preCreatedPoll(meetingId, message); + } + } + } + } + + public void setBigBlueButtonInGW(IBigBlueButtonInGW bbbGW) { + this.bbbGW = bbbGW; + } + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesMessageListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesMessageListener.java deleted file mode 100755 index 555336f993..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesMessageListener.java +++ /dev/null @@ -1,112 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.presentation; - -import org.slf4j.Logger; -import org.apache.commons.lang.StringEscapeUtils; -import org.red5.logging.Red5LoggerFactory; - -import java.util.HashMap; -import java.util.Map; - -public class ConversionUpdatesMessageListener { - private static Logger log = Red5LoggerFactory.getLogger(ConversionUpdatesMessageListener.class, "bigbluebutton"); - - private ConversionUpdatesProcessor conversionUpdatesProcessor; - - public static final String OFFICE_DOC_CONVERSION_SUCCESS_KEY = "OFFICE_DOC_CONVERSION_SUCCESS"; - public static final String OFFICE_DOC_CONVERSION_FAILED_KEY = "OFFICE_DOC_CONVERSION_FAILED"; - public static final String SUPPORTED_DOCUMENT_KEY = "SUPPORTED_DOCUMENT"; - public static final String UNSUPPORTED_DOCUMENT_KEY = "UNSUPPORTED_DOCUMENT"; - public static final String PAGE_COUNT_FAILED_KEY = "PAGE_COUNT_FAILED"; - public static final String PAGE_COUNT_EXCEEDED_KEY = "PAGE_COUNT_EXCEEDED"; - public static final String GENERATED_SLIDE_KEY = "GENERATED_SLIDE"; - public static final String GENERATING_THUMBNAIL_KEY = "GENERATING_THUMBNAIL"; - public static final String GENERATED_THUMBNAIL_KEY = "GENERATED_THUMBNAIL"; - public static final String CONVERSION_COMPLETED_KEY = "CONVERSION_COMPLETED"; - - public void start() { - log.debug("Starting conversion updates receiver."); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void handleReceivedMessage(Map mapMessage) { - try{ - String code = (String) mapMessage.get("returnCode"); - String room = (String) mapMessage.get("room"); - String presentationName = (String) mapMessage.get("presentationName"); - String conference = (String) mapMessage.get("conference"); - String messageKey = (String) mapMessage.get("messageKey"); - - Map message = new HashMap(); - message.put("conference", conference); - message.put("room", room); - message.put("code", code); - message.put("presentationName", presentationName); - message.put("messageKey", messageKey); - - log.debug("Message: " + messageKey + "[ " + presentationName + "]"); - - if(messageKey.equalsIgnoreCase(OFFICE_DOC_CONVERSION_SUCCESS_KEY)|| - messageKey.equalsIgnoreCase(OFFICE_DOC_CONVERSION_FAILED_KEY)|| - messageKey.equalsIgnoreCase(SUPPORTED_DOCUMENT_KEY)|| - messageKey.equalsIgnoreCase(UNSUPPORTED_DOCUMENT_KEY)|| - messageKey.equalsIgnoreCase(GENERATING_THUMBNAIL_KEY)|| - messageKey.equalsIgnoreCase(GENERATED_THUMBNAIL_KEY)|| - messageKey.equalsIgnoreCase(PAGE_COUNT_FAILED_KEY)){ - - conversionUpdatesProcessor.process(message); - } - else if(messageKey.equalsIgnoreCase(PAGE_COUNT_EXCEEDED_KEY)){ - Integer numberOfPages = new Integer((String) mapMessage.get("numberOfPages")); - Integer maxNumberPages = new Integer((String) mapMessage.get("maxNumberPages")); - message.put("numberOfPages", numberOfPages); - message.put("maxNumberPages", maxNumberPages); - conversionUpdatesProcessor.process(message); - } - else if(messageKey.equalsIgnoreCase(GENERATED_SLIDE_KEY)){ - Integer numberOfPages = new Integer((String)mapMessage.get("numberOfPages")); - Integer pagesCompleted = new Integer((String)mapMessage.get("pagesCompleted")); - message.put("numberOfPages", numberOfPages); - message.put("pagesCompleted", pagesCompleted); - - conversionUpdatesProcessor.process(message); - } - else if(messageKey.equalsIgnoreCase(CONVERSION_COMPLETED_KEY)){ - String slidesInfo = (String) mapMessage.get("slidesInfo"); - message.put("slidesInfo", StringEscapeUtils.unescapeXml(slidesInfo)); - conversionUpdatesProcessor.process(message); - } - else{ - log.error("Cannot handle recieved message."); - } - }catch(Exception ex){ - log.warn(ex.getMessage()); - } - } - - public void stop() { - log.debug("Stopping conversion updates receiver."); - } - - public void setConversionUpdatesProcessor(ConversionUpdatesProcessor p) { - log.debug("Setting ConversionUpdatesProcessor"); - conversionUpdatesProcessor = p; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java index f08451e6b8..1cf384454c 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java @@ -18,7 +18,6 @@ */ package org.bigbluebutton.conference.service.presentation; -import java.util.Map; import org.slf4j.Logger; import org.red5.logging.Red5LoggerFactory; public class ConversionUpdatesProcessor { @@ -26,12 +25,35 @@ public class ConversionUpdatesProcessor { private PresentationApplication presentationApplication; - public void process(Map message) { - presentationApplication.sendUpdateMessage(message); + public void sendConversionUpdate(String messageKey, String conference, + String code, String presId, String presName) { + presentationApplication.sendConversionUpdate(messageKey, conference, + code, presId, presName); + } + + public void sendPageCountError(String messageKey, String conference, + String code, String presId, int numberOfPages, + int maxNumberPages, String presName) { + presentationApplication.sendPageCountError(messageKey, conference, + code, presId, numberOfPages, + maxNumberPages, presName); + } + + public void sendSlideGenerated(String messageKey, String conference, + String code, String presId, int numberOfPages, + int pagesCompleted, String presName) { + presentationApplication.sendSlideGenerated(messageKey, conference, + code, presId, numberOfPages, pagesCompleted, presName); + } + + public void sendConversionCompleted(String messageKey, String conference, + String code, String presId, Integer numberOfPages, String presName, + String presBaseUrl) { + presentationApplication.sendConversionCompleted(messageKey, conference, + code, presId, numberOfPages, presName, presBaseUrl); } public void setPresentationApplication(PresentationApplication a) { - log.debug("Setting presentation application"); presentationApplication = a; } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java index cf6a62cfa7..2acd1eb691 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java @@ -19,159 +19,83 @@ package org.bigbluebutton.conference.service.presentation; import org.slf4j.Logger; -import org.bigbluebutton.conference.ClientMessage; -import org.bigbluebutton.conference.ConnectionInvokerService; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.Red5; import java.util.ArrayList; +import org.red5.server.api.Red5; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; - + public class PresentationApplication { private static Logger log = Red5LoggerFactory.getLogger( PresentationApplication.class, "bigbluebutton" ); - private PresentationRoomsManager roomsManager; - private ConnectionInvokerService connInvokerService; + private IBigBlueButtonInGW bbbInGW; - public boolean createRoom(String name) { - roomsManager.addRoom(new PresentationRoom(name)); - return true; - } - - public boolean destroyRoom(String name) { - if (roomsManager.hasRoom(name)) { - roomsManager.removeRoom(name); - } - return true; - } - - public boolean hasRoom(String name) { - return roomsManager.hasRoom(name); - } - - public boolean addRoomListener(String room, IPresentationRoomListener listener) { - if (roomsManager.hasRoom(room)){ - roomsManager.addRoomListener(room, listener); - return true; - } - log.warn("Adding listener to a non-existant room " + room); - return false; - } - - @SuppressWarnings("unchecked") - public void sendUpdateMessage(Map message){ - - String room = (String) message.get("room"); - if (roomsManager.hasRoom(room)){ - roomsManager.sendUpdateMessage(message); - return; - } - log.warn("Sending update message to a non-existant room " + room); + public void setBigBlueButtonInGW(IBigBlueButtonInGW inGW) { + bbbInGW = inGW; } - public ArrayList getPresentations(String room){ - if (roomsManager.hasRoom(room)){ - return roomsManager.getPresentations(room); - } - log.warn("Getting presentations on a non-existant room " + room); - return null; - } - - public void removePresentation(String room, String name){ - if (roomsManager.hasRoom(room)){ - roomsManager.removePresentation(room, name); - } else { - log.warn("Removing presentation from a non-existant room " + room); - } - } - - public int getCurrentSlide(String room){ - if (roomsManager.hasRoom(room)){ - return roomsManager.getCurrentSlide(room); - } - log.warn("Getting slide on a non-existant room " + room); - return -1; - } - - public String getCurrentPresentation(String room){ - if (roomsManager.hasRoom(room)){ - return roomsManager.getCurrentPresentation(room); - } - log.warn("Getting current presentation on a non-existant room " + room); - return null; - } - - public Map getPresenterSettings(String room){ - if (roomsManager.hasRoom(room)){ - return roomsManager.getPresenterSettings(room); - } - log.warn("Getting settings information on a non-existant room " + room); - return null; - } - - public Boolean getSharingPresentation(String room){ - if (roomsManager.hasRoom(room)){ - return roomsManager.getSharingPresentation(room); - } - log.warn("Getting share information on a non-existant room " + room); - return null; - } - - public void sendCursorUpdate(String room, Double xPercent, Double yPercent) { - if (roomsManager.hasRoom(room)){ - log.debug("Request to update cursor[" + xPercent + "," + yPercent + "]"); - roomsManager.sendCursorUpdate(room, xPercent, yPercent); - - Map message = new HashMap(); - message.put("xPercent", xPercent); - message.put("yPercent", yPercent); - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), "PresentationCursorUpdateCommand", message); - connInvokerService.sendMessage(m); - - return; - } - - log.warn("Sending cursor update on a non-existant room " + room); - } - - public void resizeAndMoveSlide(String room, Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) { - if (roomsManager.hasRoom(room)){ - log.debug("Request to resize and move slide[" + xOffset + "," + yOffset + "," + widthRatio + "," + heightRatio + "]"); - roomsManager.resizeAndMoveSlide(room, xOffset, yOffset, widthRatio, heightRatio); - return; - } - log.warn("resizeAndMoveSlide on a non-existant room " + room); - } + public void clear(String meetingID) { - public void gotoSlide(String room, int slide){ - if (roomsManager.hasRoom(room)){ - log.debug("Request to go to slide " + slide + " for room " + room); - roomsManager.gotoSlide(room, slide); - return; - } - log.warn("Changing slide on a non-existant room " + room); - } - - public void sharePresentation(String room, String presentationName, Boolean share){ - if (roomsManager.hasRoom(room)){ - log.debug("Request to share presentation " + presentationName + " " + share + " for room " + room); - roomsManager.sharePresentation(room, presentationName, share); - return; - } - log.warn("Sharing presentation on a non-existant room " + room); - } - - public void setRoomsManager(PresentationRoomsManager r) { - log.debug("Setting room manager"); - roomsManager = r; - log.debug("Done setting room manager"); } - private String getMeetingId(){ - return Red5.getConnectionLocal().getScope().getName(); + public void sendConversionUpdate(String messageKey, String meetingId, + String code, String presentationId, String presName) { + bbbInGW.sendConversionUpdate(messageKey, meetingId, code, + presentationId, presName); + } + + public void sendPageCountError(String messageKey, String meetingId, + String code, String presentationId, int numberOfPages, + int maxNumberPages, String presName) { + bbbInGW.sendPageCountError(messageKey, meetingId, code, + presentationId, numberOfPages, maxNumberPages, presName); } + public void sendSlideGenerated(String messageKey, String meetingId, + String code, String presentationId, int numberOfPages, + int pagesCompleted, String presName) { + bbbInGW.sendSlideGenerated(messageKey, meetingId, code, + presentationId, numberOfPages, pagesCompleted, presName); + } + + public void sendConversionCompleted(String messageKey, String meetingId, + String code, String presentation, int numberOfPages, + String presName, String presBaseUrl) { + bbbInGW.sendConversionCompleted(messageKey, meetingId, + code, presentation, numberOfPages, presName, presBaseUrl); + } + + public void removePresentation(String meetingID, String presentationID){ + bbbInGW.removePresentation(meetingID, presentationID); + } - public void setConnInvokerService(ConnectionInvokerService connInvokerService) { - this.connInvokerService = connInvokerService; - } + public void getPresentationInfo(String meetingID, String requesterID) { + // Just hardcode as we don't really need it for flash client. (ralam may 7, 2014) + String replyTo = meetingID + "/" + requesterID; + bbbInGW.getPresentationInfo(meetingID, requesterID, replyTo); + } + + public void sendCursorUpdate(String meetingID, Double xPercent, Double yPercent) { + bbbInGW.sendCursorUpdate(meetingID, xPercent, yPercent); + } + + public void resizeAndMoveSlide(String meetingID, Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) { + bbbInGW.resizeAndMoveSlide(meetingID, xOffset, yOffset, widthRatio, heightRatio); + } + + public void gotoSlide(String meetingID, String pageId){ + bbbInGW.gotoSlide(meetingID, pageId); + } + + public void sharePresentation(String meetingID, String presentationID, Boolean share){ + bbbInGW.sharePresentation(meetingID, presentationID, share); + } + + public void getSlideInfo(String meetingID, String requesterID) { + // Just hardcode as we don't really need it for flash client. (ralam may 7, 2014) + String replyTo = meetingID + "/" + requesterID; + bbbInGW.getSlideInfo(meetingID, requesterID, replyTo); + } + } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationEventSender.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationEventSender.java deleted file mode 100755 index eef58dafa1..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationEventSender.java +++ /dev/null @@ -1,164 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.presentation; - -import java.util.ArrayList; -import java.util.Map; -import org.bigbluebutton.conference.service.recorder.Recorder; import org.red5.server.api.so.ISharedObject; -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; - -public class PresentationEventSender implements IPresentationRoomListener { - private static Logger log = Red5LoggerFactory.getLogger( PresentationEventSender.class, "bigbluebutton" ); - - private static final String OFFICE_DOC_CONVERSION_SUCCESS_KEY = "OFFICE_DOC_CONVERSION_SUCCESS"; - private static final String OFFICE_DOC_CONVERSION_FAILED_KEY = "OFFICE_DOC_CONVERSION_FAILED"; - private static final String SUPPORTED_DOCUMENT_KEY = "SUPPORTED_DOCUMENT"; - private static final String UNSUPPORTED_DOCUMENT_KEY = "UNSUPPORTED_DOCUMENT"; - private static final String PAGE_COUNT_FAILED_KEY = "PAGE_COUNT_FAILED"; - private static final String PAGE_COUNT_EXCEEDED_KEY = "PAGE_COUNT_EXCEEDED"; - private static final String GENERATED_SLIDE_KEY = "GENERATED_SLIDE"; - private static final String GENERATING_THUMBNAIL_KEY = "GENERATING_THUMBNAIL"; - private static final String GENERATED_THUMBNAIL_KEY = "GENERATED_THUMBNAIL"; - private static final String CONVERSION_COMPLETED_KEY = "CONVERSION_COMPLETED"; - - Recorder recorder; - private ISharedObject so; - - String APP_NAME = "PRESENTATION"; - - public void acceptRecorder(Recorder recorder){ - log.debug("Accepting IRecorder"); - this.recorder = recorder; - } - - public String getName() { - return APP_NAME; - } - - - public PresentationEventSender(ISharedObject so) { - this.so = so; - } - - @SuppressWarnings("unchecked") - public void sendUpdateMessage(Map message){ - handleReceivedMessage(message); - } - - @SuppressWarnings("unchecked") - private void handleReceivedMessage(Map message){ - String code = (String) message.get("returnCode"); - String room = (String) message.get("room"); - String presentationName = (String) message.get("presentationName"); - String conference = (String) message.get("conference"); - String messageKey = (String) message.get("messageKey"); - - ArrayList list = new ArrayList(); - list.add(conference); - list.add(room); - list.add(code); - list.add(presentationName); - list.add(messageKey); - - log.debug("message " + messageKey + "[" + presentationName + "]"); - - if(messageKey.equalsIgnoreCase(OFFICE_DOC_CONVERSION_SUCCESS_KEY)|| - messageKey.equalsIgnoreCase(OFFICE_DOC_CONVERSION_FAILED_KEY)|| - messageKey.equalsIgnoreCase(SUPPORTED_DOCUMENT_KEY)|| - messageKey.equalsIgnoreCase(UNSUPPORTED_DOCUMENT_KEY)|| - messageKey.equalsIgnoreCase(GENERATING_THUMBNAIL_KEY)|| - messageKey.equalsIgnoreCase(GENERATED_THUMBNAIL_KEY)|| - messageKey.equalsIgnoreCase(PAGE_COUNT_FAILED_KEY)){ - - // no extra data to send - so.sendMessage("conversionUpdateMessageCallback", list); - } - else if(messageKey.equalsIgnoreCase(PAGE_COUNT_EXCEEDED_KEY)){ - list.add(message.get("numberOfPages")); - list.add(message.get("maxNumberPages")); - so.sendMessage("pageCountExceededUpdateMessageCallback", list); - } - else if(messageKey.equalsIgnoreCase(GENERATED_SLIDE_KEY)){ - list.add(message.get("numberOfPages")); - list.add(message.get("pagesCompleted")); - so.sendMessage("generatedSlideUpdateMessageCallback", list); - } - else if(messageKey.equalsIgnoreCase(CONVERSION_COMPLETED_KEY)){ - list.add(message.get("slidesInfo")); - so.sendMessage("conversionCompletedUpdateMessageCallback", list); - } - else{ - log.error("Cannot handle recieved message."); - } - } - - - @SuppressWarnings("unchecked") - public void removePresentation(String name){ - log.debug("calling removePresentationCallback " + name); - ArrayList list=new ArrayList(); - list.add(name); - so.sendMessage("removePresentationCallback", list); - } - - @SuppressWarnings("unchecked") - public void gotoSlide(int slide){ - log.debug("calling gotoSlideCallback " + slide); - ArrayList list=new ArrayList(); - list.add(slide); - so.sendMessage("gotoSlideCallback", list); - } - - @SuppressWarnings("unchecked") - @Override - public void sharePresentation(String presentationName, Boolean share){ - log.debug("calling sharePresentationCallback " + presentationName + " " + share); - ArrayList list=new ArrayList(); - list.add(presentationName); - list.add(share); - so.sendMessage("sharePresentationCallback", list); - } - - @Override - public void sendCursorUpdate(Double xPercent, Double yPercent) { - // Disable. We are using connection invoke now. (ralam Oct 1, 2012). - // We'll have to convert all other messages to use conn invoke soon. - -// log.debug("calling updateCursorCallback[" + xPercent + "," + yPercent + "]"); -// ArrayList list=new ArrayList(); -// list.add(xPercent); -// list.add(yPercent); -// so.sendMessage("updateCursorCallback", list); - } - - @SuppressWarnings("unchecked") - @Override - public void resizeAndMoveSlide(Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) { - log.debug("calling moveCallback[" + xOffset + "," + yOffset + "," + widthRatio + "," + heightRatio + "]"); - ArrayList list=new ArrayList(); - list.add(xOffset); - list.add(yOffset); - list.add(widthRatio); - list.add(heightRatio); - so.sendMessage("moveCallback", list); - } - - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java index aebd1941c6..553ee2a372 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java @@ -26,11 +26,11 @@ import org.red5.server.api.IConnection; import org.slf4j.Logger; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.scope.IScope; -import org.red5.server.api.so.ISharedObject; import org.red5.server.adapter.ApplicationAdapter; import org.red5.server.api.Red5; +import org.bigbluebutton.conference.BigBlueButtonSession; +import org.bigbluebutton.conference.Constants; import org.bigbluebutton.conference.service.recorder.RecorderApplication; -import org.bigbluebutton.conference.service.recorder.presentation.PresentationEventRecorder; public class PresentationHandler extends ApplicationAdapter implements IApplication{ private static Logger log = Red5LoggerFactory.getLogger( PresentationHandler.class, "bigbluebutton" ); @@ -41,7 +41,6 @@ public class PresentationHandler extends ApplicationAdapter implements IApplicat private RecorderApplication recorderApplication; private PresentationApplication presentationApplication; - private ConversionUpdatesMessageListener conversionUpdatesMessageListener; @Override public boolean appConnect(IConnection conn, Object[] params) { @@ -68,26 +67,18 @@ public class PresentationHandler extends ApplicationAdapter implements IApplicat @Override public boolean appStart(IScope scope) { log.debug("***** " + APP + " [ " + " appStart [ " + scope.getName() + "] *********"); - conversionUpdatesMessageListener.start(); return true; } @Override public void appStop(IScope scope) { log.debug("***** " + APP + " [ " + " appStop [ " + scope.getName() + "] *********"); - conversionUpdatesMessageListener.stop(); } @Override public boolean roomConnect(IConnection connection, Object[] params) { log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********"); - ISharedObject so = getSharedObject(connection.getScope(), PRESENTATION_SO, false); - PresentationEventSender sender = new PresentationEventSender(so); - PresentationEventRecorder recorder = new PresentationEventRecorder(connection.getScope().getName(), recorderApplication); - presentationApplication.addRoomListener(connection.getScope().getName(), recorder); - presentationApplication.addRoomListener(connection.getScope().getName(), sender); - return true; } @@ -110,40 +101,13 @@ public class PresentationHandler extends ApplicationAdapter implements IApplicat @Override public boolean roomStart(IScope scope) { log.debug("***** " + APP + " [ " + " roomStart [ " + scope.getName() + "] *********"); - - presentationApplication.createRoom(scope.getName()); - - log.debug(APP + " - scanning for presentations - " + scope.getName()); - try { - // TODO: this is hard-coded, and not really a great abstraction. need to fix this up later - String folderPath = "/var/bigbluebutton/" + scope.getName() + "/" + scope.getName(); - File folder = new File(folderPath); - //log.debug("folder: {} - exists: {} - isDir: {}", folder.getAbsolutePath(), folder.exists(), folder.isDirectory()); - if (folder.exists() && folder.isDirectory()) { - File[] presentations = folder.listFiles(new FileFilter() { - public boolean accept(File path) { - log.debug("\tfound: " + path.getAbsolutePath()); - return path.isDirectory(); - } - }); - for (File presFile : presentations) { - log.debug("\tshare: " + presFile.getName()); - presentationApplication.sharePresentation(scope.getName(), presFile.getName(), true); - } - } - } catch (Exception ex) { - log.error(scope.getName() + ": error scanning for existing presentations [" + ex.getMessage() + "]", ex); - } + return true; } @Override public void roomStop(IScope scope) { log.debug("***** " + APP + " [ " + " roomStop [ " + scope.getName() + "] *********"); - presentationApplication.destroyRoom(scope.getName()); - if (hasSharedObject(scope, PRESENTATION_SO)) { - clearSharedObjects(scope, PRESENTATION_SO); - } } public void setPresentationApplication(PresentationApplication a) { @@ -156,9 +120,7 @@ public class PresentationHandler extends ApplicationAdapter implements IApplicat recorderApplication = a; } - public void setConversionUpdatesMessageListener(ConversionUpdatesMessageListener service) { - log.debug("Setting conversionUpdatesMessageListener"); - conversionUpdatesMessageListener = service; + private BigBlueButtonSession getBbbSession() { + return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } - } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java new file mode 100755 index 0000000000..fd530e5600 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java @@ -0,0 +1,104 @@ +package org.bigbluebutton.conference.service.presentation; + +import java.util.HashMap; +import java.util.Map; +import org.bigbluebutton.conference.service.messaging.MessagingConstants; +import org.bigbluebutton.conference.service.messaging.redis.MessageHandler; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +public class PresentationMessageListener implements MessageHandler { + public static final String OFFICE_DOC_CONVERSION_SUCCESS_KEY = "OFFICE_DOC_CONVERSION_SUCCESS"; + public static final String OFFICE_DOC_CONVERSION_FAILED_KEY = "OFFICE_DOC_CONVERSION_FAILED"; + public static final String SUPPORTED_DOCUMENT_KEY = "SUPPORTED_DOCUMENT"; + public static final String UNSUPPORTED_DOCUMENT_KEY = "UNSUPPORTED_DOCUMENT"; + public static final String PAGE_COUNT_FAILED_KEY = "PAGE_COUNT_FAILED"; + public static final String PAGE_COUNT_EXCEEDED_KEY = "PAGE_COUNT_EXCEEDED"; + public static final String GENERATED_SLIDE_KEY = "GENERATED_SLIDE"; + public static final String GENERATING_THUMBNAIL_KEY = "GENERATING_THUMBNAIL"; + public static final String GENERATED_THUMBNAIL_KEY = "GENERATED_THUMBNAIL"; + public static final String CONVERSION_COMPLETED_KEY = "CONVERSION_COMPLETED"; + + private ConversionUpdatesProcessor conversionUpdatesProcessor; + + public void setConversionUpdatesProcessor(ConversionUpdatesProcessor p) { + conversionUpdatesProcessor = p; + } + + private void sendConversionUpdate(String messageKey, String conference, + String code, String presId, String filename) { + conversionUpdatesProcessor.sendConversionUpdate(messageKey, conference, + code, presId, filename); + } + + public void sendPageCountError(String messageKey, String conference, + String code, String presId, Integer numberOfPages, + Integer maxNumberPages, String filename) { + conversionUpdatesProcessor.sendPageCountError(messageKey, conference, + code, presId, numberOfPages, + maxNumberPages, filename); + } + + private void sendSlideGenerated(String messageKey, String conference, + String code, String presId, Integer numberOfPages, + Integer pagesCompleted, String filename) { + conversionUpdatesProcessor.sendSlideGenerated(messageKey, conference, + code, presId, numberOfPages, + pagesCompleted, filename); + } + + private void sendConversionCompleted(String messageKey, String conference, + String code, String presId, Integer numberOfPages, + String filename, String presBaseUrl) { + + conversionUpdatesProcessor.sendConversionCompleted(messageKey, conference, + code, presId, numberOfPages, filename, presBaseUrl); + } + + + @Override + public void handleMessage(String pattern, String channel, String message) { + if (channel.equalsIgnoreCase(MessagingConstants.TO_PRESENTATION_CHANNEL)) { + + Gson gson = new Gson(); + HashMap map = gson.fromJson(message, new TypeToken>() {}.getType()); + + String code = (String) map.get("returnCode"); + String presId = (String) map.get("presentationId"); + String filename = (String) map.get("filename"); + String conference = (String) map.get("conference"); + String messageKey = (String) map.get("messageKey"); + + if (messageKey.equalsIgnoreCase(OFFICE_DOC_CONVERSION_SUCCESS_KEY)|| + messageKey.equalsIgnoreCase(OFFICE_DOC_CONVERSION_FAILED_KEY)|| + messageKey.equalsIgnoreCase(SUPPORTED_DOCUMENT_KEY)|| + messageKey.equalsIgnoreCase(UNSUPPORTED_DOCUMENT_KEY)|| + messageKey.equalsIgnoreCase(GENERATING_THUMBNAIL_KEY)|| + messageKey.equalsIgnoreCase(GENERATED_THUMBNAIL_KEY)|| + messageKey.equalsIgnoreCase(PAGE_COUNT_FAILED_KEY)){ + + sendConversionUpdate(messageKey, conference, code, presId, filename); + + } else if(messageKey.equalsIgnoreCase(PAGE_COUNT_EXCEEDED_KEY)){ + Integer numberOfPages = new Integer((String) map.get("numberOfPages")); + Integer maxNumberPages = new Integer((String) map.get("maxNumberPages")); + + sendPageCountError(messageKey, conference, code, + presId, numberOfPages, maxNumberPages, filename); + + } else if(messageKey.equalsIgnoreCase(GENERATED_SLIDE_KEY)){ + Integer numberOfPages = new Integer((String) map.get("numberOfPages")); + Integer pagesCompleted = new Integer((String) map.get("pagesCompleted")); + + sendSlideGenerated(messageKey, conference, code, + presId, numberOfPages, pagesCompleted, filename); + + } else if(messageKey.equalsIgnoreCase(CONVERSION_COMPLETED_KEY)){ + Integer numberOfPages = new Integer((String) map.get("numberOfPages")); + String presBaseUrl = (String) map.get("presentationBaseUrl"); + sendConversionCompleted(messageKey, conference, code, + presId, numberOfPages, filename, presBaseUrl); + } + } + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoom.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoom.java deleted file mode 100755 index 8151040680..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoom.java +++ /dev/null @@ -1,217 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.presentation; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.red5.logging.Red5LoggerFactory; - -import net.jcip.annotations.ThreadSafe; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; -import java.util.List; -import java.util.Map; -/** - * Contains information about a PresentationRoom. - */ -@ThreadSafe -public class PresentationRoom { - private static Logger log = Red5LoggerFactory.getLogger( PresentationRoom.class, "bigbluebutton" ); - - private final String name; - private final Map listeners; - - int currentSlide = 0; - Boolean sharing = false; - String currentPresentation = ""; - Double xOffset = 0D; - Double yOffset = 0D; - Double widthRatio = 0D; - Double heightRatio = 0D; - - /* cursor location */ - Double xPercent = 0D; - Double yPercent = 0D; - - ArrayList presentationNames = new ArrayList(); - - public PresentationRoom(String name) { - this.name = name; - listeners = new ConcurrentHashMap(); - } - - public String getName() { - return name; - } - - public void addRoomListener(IPresentationRoomListener listener) { - if (! listeners.containsKey(listener.getName())) { - log.debug("adding room listener"); - listeners.put(listener.getName(), listener); - } - } - - public void removeRoomListener(IPresentationRoomListener listener) { - log.debug("removing room listener"); - listeners.remove(listener); - } - - @SuppressWarnings("unchecked") - public void sendUpdateMessage(Map message){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - log.debug("calling on listener"); - IPresentationRoomListener listener = (IPresentationRoomListener) iter.next(); - log.debug("calling sendUpdateMessage on listener " + listener.getName()); - listener.sendUpdateMessage(message); - } - - storePresentationNames(message); - } - - @SuppressWarnings("unchecked") - private void storePresentationNames(Map message){ - String presentationName = (String) message.get("presentationName"); - String messageKey = (String) message.get("messageKey"); - - if (messageKey.equalsIgnoreCase("CONVERSION_COMPLETED")) { - log.debug(messageKey + "[" + presentationName + "]"); - presentationNames.add(presentationName); - } - } - - public void sendCursorUpdate(Double xPercent, Double yPercent) { - this.xPercent = xPercent; - this.yPercent = yPercent; - - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - log.debug("calling on listener"); - IPresentationRoomListener listener = (IPresentationRoomListener) iter.next(); - log.debug("calling sendCursorUpdate on listener " + listener.getName()); - listener.sendCursorUpdate(xPercent,yPercent); - } - } - - public void resizeAndMoveSlide(Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) { - this.xOffset = xOffset; - this.yOffset = yOffset; - this.widthRatio = widthRatio; - this.heightRatio = heightRatio; - - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - log.debug("calling on listener"); - IPresentationRoomListener listener = (IPresentationRoomListener) iter.next(); - log.debug("calling sendUpdateMessage on listener " + listener.getName()); - listener.resizeAndMoveSlide(xOffset, yOffset, widthRatio, heightRatio); - } - } - - @SuppressWarnings("unchecked") - public void gotoSlide(int curslide){ - log.debug("Request to go to slide " + curslide + "for room " + name); - currentSlide = curslide; - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - log.debug("calling on listener"); - IPresentationRoomListener listener = (IPresentationRoomListener) iter.next(); - log.debug("calling sendUpdateMessage on listener " + listener.getName()); - listener.gotoSlide(curslide); - } - } - - @SuppressWarnings("unchecked") - public void sharePresentation(String presentationName, Boolean share){ - log.debug("Request share presentation " + presentationName + " " + share + " for room " + name); - sharing = share; - if (share) { - currentPresentation = presentationName; - if (! presentationNames.contains(presentationName)) { - log.debug("Adding [" + presentationName + "] to list of presentations."); - presentationNames.add(presentationName); - } else { - log.debug("[" + presentationName + "] is already in list of presentations."); - } - } else { - currentPresentation = ""; - } - - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - log.debug("calling on listener"); - IPresentationRoomListener listener = (IPresentationRoomListener) iter.next(); - log.debug("calling sharePresentation on listener " + listener.getName()); - listener.sharePresentation(presentationName, share); - } - } - - public void removePresentation(String presentationName){ - log.debug("Request remove presentation " + presentationName); - int index = presentationNames.indexOf(presentationName); - - if (index < 0) { - log.warn("Request remove presentation " + presentationName + ". Presentation not found."); - return; - } - - String remPresentation = presentationNames.remove(index); - log.debug("Removed [" + remPresentation + "] presentation."); - - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - - IPresentationRoomListener listener = (IPresentationRoomListener) iter.next(); - log.debug("calling removePresentation on listener " + listener.getName()); - listener.removePresentation(presentationName); - } - - if (currentPresentation.equals(presentationName)) { - log.debug("[" + remPresentation + "] is the current presentation. Unsharing that presentation."); - sharePresentation(presentationName, false); - } - } - - public String getCurrentPresentation() { - return currentPresentation; - } - - public int getCurrentSlide() { - return currentSlide; - } - - public Boolean getSharing() { - return sharing; - } - - public ArrayList getPresentationNames() { - return presentationNames; - } - - public Double getxOffset() { - return xOffset; - } - - public Double getyOffset() { - return yOffset; - } - - public Double getWidthRatio() { - return widthRatio; - } - - public Double getHeightRatio() { - return heightRatio; - } - - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoomsManager.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoomsManager.java deleted file mode 100755 index 5b3cb200e8..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoomsManager.java +++ /dev/null @@ -1,195 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.presentation; - -import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; - -import net.jcip.annotations.ThreadSafe; -import java.util.concurrent.ConcurrentHashMap; -/** - * This encapsulates access to Room and messages. This class must be threadsafe. - */ -@ThreadSafe -public class PresentationRoomsManager { - private static Logger log = Red5LoggerFactory.getLogger( PresentationRoomsManager.class, "bigbluebutton" ); - - private final Map rooms; - - public PresentationRoomsManager() { - log.debug("In PresentationRoomsManager constructor"); - rooms = new ConcurrentHashMap(); - } - - public void addRoom(PresentationRoom room) { - log.debug("In PresentationRoomsManager adding room " + room.getName()); - rooms.put(room.getName(), room); - } - - public void removeRoom(String name) { - log.debug("In PresentationRoomsManager remove room " + name); - rooms.remove(name); - } - - public boolean hasRoom(String name) { - log.debug("In PresentationRoomsManager has Room " + name); - return rooms.containsKey(name); - } - - - /** - * Keeping getRoom private so that all access to ChatRoom goes through here. - */ - private PresentationRoom getRoom(String name) { - log.debug("In PresentationRoomsManager get room " + name); - return rooms.get(name); - } - - public void addRoomListener(String roomName, IPresentationRoomListener listener) { - PresentationRoom r = getRoom(roomName); - if (r != null) { - r.addRoomListener(listener); - return; - } - log.warn("Adding listener to a non-existing room " + roomName); - } - //TODO: where is roomName??? - /*public void removeRoomListener(IPresentationRoomListener listener) { - PresentationRoom r = getRoom(roomName); - if (r != null) { - r.removeRoomListener(listener); - return; - } - log.warn("Removing listener from a non-existing room ${roomName}"); - }*/ - - public void sendUpdateMessage(Map message){ - String room = (String) message.get("room"); - PresentationRoom r = getRoom(room); - if (r != null) { - r.sendUpdateMessage(message); - return; - } - log.warn("Sending update message to a non-existing room " + room); - } - - public Boolean getSharingPresentation(String room){ - PresentationRoom r = getRoom(room); - if (r != null) { - return r.getSharing(); - } - log.warn("Getting sharing from a non-existing room " + room); - return null; - } - - @SuppressWarnings("unchecked") - public Map getPresenterSettings(String room){ - PresentationRoom r = getRoom(room); - if (r != null){ - Map settings = new HashMap(); - settings.put("xOffset", r.getxOffset()); - settings.put("yOffset", r.getyOffset()); - settings.put("widthRatio", r.getWidthRatio()); - settings.put("heightRatio", r.getHeightRatio()); - return settings; - } - log.warn("Getting settings information on a non-existant room " + room); - return null; - } - - public void sendCursorUpdate(String room, Double xPercent, Double yPercent) { - PresentationRoom r = getRoom(room); - if (r != null){ - log.debug("Request to update cursor[" + xPercent + "," + yPercent + "]"); - r.sendCursorUpdate(xPercent, yPercent); - return; - } - log.warn("resizeAndMoveSlide on a non-existant room " + room); - } - - public void resizeAndMoveSlide(String room, Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) { - PresentationRoom r = getRoom(room); - if (r != null){ - log.debug("Request to resize and move slide[" + xOffset + "," + yOffset + "," + widthRatio + "," + heightRatio + "]"); - r.resizeAndMoveSlide(xOffset, yOffset, widthRatio, heightRatio); - return; - } - log.warn("resizeAndMoveSlide on a non-existant room " + room); - } - - public void gotoSlide(String room, int slide){ - PresentationRoom r = getRoom(room); - if (r != null) { - log.debug("Request to go to slide " + slide + " for room " + room); - r.gotoSlide(slide); - return; - } - log.warn("Changing slide on a non-existing room " + room); - } - - public void sharePresentation(String room, String presentationName, Boolean share){ - PresentationRoom r = getRoom(room); - if (r != null) { - log.debug("Request share presentation " + presentationName + " " + share + " for room " + room); - r.sharePresentation(presentationName, share); - return; - } - log.warn("Sharing presentation on a non-existing room " + room); - } - - public int getCurrentSlide(String room){ - PresentationRoom r = getRoom(room); - if (r != null) { - return r.getCurrentSlide(); - } - log.warn("Getting slide on a non-existing room " + room); - return -1; - } - - public String getCurrentPresentation(String room){ - PresentationRoom r = getRoom(room); - if (r != null) { - return r.getCurrentPresentation(); - } - log.warn("Getting current presentation on a non-existing room " + room); - return null; - } - - public ArrayList getPresentations(String room){ - PresentationRoom r = getRoom(room); - if (r != null) { - return r.getPresentationNames(); - } - log.warn("Getting current presentation on a non-existing room " + room); - return null; - } - - public void removePresentation (String room, String name){ - PresentationRoom r = getRoom(room); - if (r != null) { - r.removePresentation(name); - } else { - log.warn("Removing presentation from a non-existing room " + room); - } - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java index 859d7b2e33..0873b641ed 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java @@ -17,103 +17,129 @@ * */ package org.bigbluebutton.conference.service.presentation; - import java.util.ArrayList; -import java.util.HashMap; + import java.util.Map; + import org.slf4j.Logger; -import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.Red5; import org.red5.server.api.scope.IScope; -import org.bigbluebutton.conference.service.participants.ParticipantsApplication; +import org.red5.logging.Red5LoggerFactory; +import org.red5.server.api.Red5; +import org.red5.server.api.scope.IScope; +import org.bigbluebutton.conference.BigBlueButtonSession; +import org.bigbluebutton.conference.Constants; public class PresentationService { private static Logger log = Red5LoggerFactory.getLogger( PresentationService.class, "bigbluebutton" ); - private ParticipantsApplication participantsApplication; private PresentationApplication presentationApplication; - public void removePresentation(String name) { - log.debug("removePresentation " + name); + public void removePresentation(Map msg) { + String presentationID = (String) msg.get("presentationID"); + IScope scope = Red5.getConnectionLocal().getScope(); - presentationApplication.removePresentation(scope.getName(), name); + presentationApplication.removePresentation(scope.getName(), presentationID); } - @SuppressWarnings("unchecked") - public Map getPresentationInfo() { - log.debug("Getting presentation information."); + public void getSlideInfo() { IScope scope = Red5.getConnectionLocal().getScope(); - ArrayList curPresenter = participantsApplication.getCurrentPresenter(scope.getName()); - int curSlide = presentationApplication.getCurrentSlide(scope.getName()); - Boolean isSharing = presentationApplication.getSharingPresentation(scope.getName()); - String currentPresentation = presentationApplication.getCurrentPresentation(scope.getName()); - Map presentersSettings = presentationApplication.getPresenterSettings(scope.getName()); - ArrayList presentationNames = presentationApplication.getPresentations(scope.getName()); + log.debug("Getting slide info for meeting [{}]", scope.getName()); + presentationApplication.getSlideInfo(scope.getName(), getBbbSession().getInternalUserID()); + } + + public void clear() { + IScope scope = Red5.getConnectionLocal().getScope(); + presentationApplication.clear(scope.getName()); + } + + public void getPresentationInfo() { + IScope scope = Red5.getConnectionLocal().getScope(); + log.debug("Getting presentation info for meeting [{}]", scope.getName()); + presentationApplication.getPresentationInfo(scope.getName(), getBbbSession().getInternalUserID()); + } + + public void gotoSlide(Map msg) { + String pageId = (String) msg.get("page"); - Map presenter = new HashMap(); - if (curPresenter != null) { - presenter.put("hasPresenter", true); - presenter.put("user", curPresenter.get(0)); - presenter.put("name", curPresenter.get(1)); - presenter.put("assignedBy",curPresenter.get(2)); - log.debug("Presenter: " + curPresenter.get(0) + " " + curPresenter.get(1) + " " + curPresenter.get(2)); + IScope scope = Red5.getConnectionLocal().getScope(); + log.debug("Got GotoSlide for meeting [{}] page=[{}]", scope.getName(), pageId); + + presentationApplication.gotoSlide(scope.getName(), pageId); + } + + public void sharePresentation(Map msg) { + String presentationID = (String) msg.get("presentationID"); + Boolean share = (Boolean) msg.get("share"); + + IScope scope = Red5.getConnectionLocal().getScope(); + presentationApplication.sharePresentation(scope.getName(), presentationID, share); + } + + public void sendCursorUpdate(Map msg) { + IScope scope = Red5.getConnectionLocal().getScope(); + + Double xPercent; + if (msg.get("xPercent") instanceof Integer) { + Integer tempXOffset = (Integer) msg.get("xPercent"); + xPercent = tempXOffset.doubleValue(); } else { - presenter.put("hasPresenter", false); + xPercent = (Double) msg.get("xPercent"); } - - Map presentation = new HashMap(); - if (isSharing.booleanValue()) { - presentation.put("sharing", true); - presentation.put("slide", curSlide); - presentation.put("currentPresentation", currentPresentation); - if (presentersSettings!=null) { - presentation.put("xOffset", presentersSettings.get("xOffset")); - presentation.put("yOffset", presentersSettings.get("yOffset")); - presentation.put("widthRatio", presentersSettings.get("widthRatio")); - presentation.put("heightRatio", presentersSettings.get("heightRatio")); - } - log.debug("Presentation: presentation=" + currentPresentation + " slide=" + curSlide); + + Double yPercent; + + if (msg.get("yPercent") instanceof Integer) { + Integer tempYOffset = (Integer) msg.get("yPercent"); + yPercent = tempYOffset.doubleValue(); } else { - presentation.put("sharing", false); + yPercent = (Double) msg.get("yPercent"); } - Map presentationInfo = new HashMap(); - presentationInfo.put("presenter", presenter); - presentationInfo.put("presentation", presentation); - presentationInfo.put("presentations", presentationNames); - - log.info("getPresentationInfo::service - Sending presentation information..."); - return presentationInfo; - } - - public void gotoSlide(int slideNum) { - log.debug("Request to go to slide " + slideNum); - IScope scope = Red5.getConnectionLocal().getScope(); - presentationApplication.gotoSlide(scope.getName(), slideNum); - } - - public void sharePresentation(String presentationName, Boolean share) { - log.debug("Request to go to sharePresentation " + presentationName + " " + share); - IScope scope = Red5.getConnectionLocal().getScope(); - presentationApplication.sharePresentation(scope.getName(), presentationName, share); - } - - public void sendCursorUpdate(Double xPercent,Double yPercent) { - log.debug("Request update cursor[" + xPercent + "," + yPercent + "]" ); - IScope scope = Red5.getConnectionLocal().getScope(); presentationApplication.sendCursorUpdate(scope.getName(), xPercent, yPercent); } - public void resizeAndMoveSlide(Double xOffset,Double yOffset,Double widthRatio,Double heightRatio) { - log.debug("Request to resize and move slide[" + xOffset + "," + yOffset + "," + widthRatio + "," + heightRatio); + public void resizeAndMoveSlide(Map msg) { + Double xOffset; + if (msg.get("xOffset") instanceof Integer) { + Integer tempXOffset = (Integer) msg.get("xOffset"); + xOffset = tempXOffset.doubleValue(); + } else { + xOffset = (Double) msg.get("xOffset"); + } + + Double yOffset; + + if (msg.get("yOffset") instanceof Integer) { + Integer tempYOffset = (Integer) msg.get("yOffset"); + yOffset = tempYOffset.doubleValue(); + } else { + yOffset = (Double) msg.get("yOffset"); + } + + Double widthRatio; + if (msg.get("widthRatio") instanceof Integer) { + Integer tempWRatio = (Integer) msg.get("widthRatio"); + widthRatio = tempWRatio.doubleValue(); + } else { + widthRatio = (Double) msg.get("widthRatio"); + } + + + Double heightRatio; + if (msg.get("heightRatio") instanceof Integer) { + Integer tempHRatio = (Integer) msg.get("heightRatio"); + heightRatio = tempHRatio.doubleValue(); + } else { + heightRatio = (Double) msg.get("heightRatio"); + } + IScope scope = Red5.getConnectionLocal().getScope(); presentationApplication.resizeAndMoveSlide(scope.getName(), xOffset, yOffset, widthRatio, heightRatio); } - public void setParticipantsApplication(ParticipantsApplication a) { - log.debug("Setting participants application"); - participantsApplication = a; - } - public void setPresentationApplication(PresentationApplication a) { - log.debug("Setting Presentation Applications"); presentationApplication = a; } + + private BigBlueButtonSession getBbbSession() { + return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); + } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PreuploadedPresentation.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PreuploadedPresentation.java new file mode 100755 index 0000000000..0c05f23f20 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PreuploadedPresentation.java @@ -0,0 +1,12 @@ +package org.bigbluebutton.conference.service.presentation; + +public class PreuploadedPresentation { + + public final String id; + public final int numPages; + + public PreuploadedPresentation(String id, int numPages) { + this.id = id; + this.numPages = numPages; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PreuploadedPresentationsUtil.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PreuploadedPresentationsUtil.java new file mode 100755 index 0000000000..8ca2c8fa7b --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PreuploadedPresentationsUtil.java @@ -0,0 +1,48 @@ +package org.bigbluebutton.conference.service.presentation; + +import java.io.File; +import java.io.FileFilter; +import java.io.FilenameFilter; +import java.util.ArrayList; + +public class PreuploadedPresentationsUtil { + + public ArrayList getPreuploadedPresentations(String meetingID) { + ArrayList preuploadedPresentations = new ArrayList(); + + try { + // TODO: this is hard-coded, and not really a great abstraction. need to fix this up later + String folderPath = "/var/bigbluebutton/" + meetingID + "/" + meetingID; + File folder = new File(folderPath); + //log.debug("folder: {} - exists: {} - isDir: {}", folder.getAbsolutePath(), folder.exists(), folder.isDirectory()); + if (folder.exists() && folder.isDirectory()) { + File[] presentations = folder.listFiles(new FileFilter() { + public boolean accept(File path) { + return path.isDirectory(); + } + }); + for (File presFile : presentations) { + int numPages = getNumPages(presFile); + PreuploadedPresentation p = new PreuploadedPresentation(presFile.getName(), numPages); + preuploadedPresentations.add(p); + } + } + } catch (Exception ex) { + + } + + System.out.println("Number of pre-uploaded presentations [" + preuploadedPresentations.size() + "]"); + return preuploadedPresentations; + } + + private int getNumPages(File presDir) { + File[] files = presDir.listFiles(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.toLowerCase().endsWith(".swf"); + } + }); + + return files.length; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RecordEvent.java index 7e8a55fa4c..a8cf016b6e 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RecordEvent.java @@ -33,6 +33,10 @@ public abstract class RecordEvent { protected final static String MEETING = "meetingId"; protected final static String EVENT = "eventName"; + public final String getMeetingID() { + return eventMap.get(MEETING); + } + /** * Set the module that generated the event. * @param module diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RecorderApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RecorderApplication.java index bcab7dc1bf..6c6d1d4934 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RecorderApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RecorderApplication.java @@ -19,9 +19,14 @@ package org.bigbluebutton.conference.service.recorder; import org.slf4j.Logger; +import org.bigbluebutton.service.recording.RedisListRecorder; import org.red5.logging.Red5LoggerFactory; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; /** * @@ -32,41 +37,76 @@ import java.util.concurrent.ConcurrentHashMap; public class RecorderApplication { private static Logger log = Red5LoggerFactory.getLogger(RecorderApplication.class, "bigbluebutton"); - private final Map recordingSessions; + private static final int NTHREADS = 1; + private static final Executor exec = Executors.newFixedThreadPool(NTHREADS); + + private BlockingQueue messages; + private volatile boolean recordEvents = false; + + private RedisListRecorder redisListRecorder; + private Recorder recorder; public RecorderApplication() { - recordingSessions = new ConcurrentHashMap(); - log.debug("Instantiated ArchiveApplication"); + messages = new LinkedBlockingQueue(); +// recordingSessions = new ConcurrentHashMap(); + } + + public void start() { + recordEvents = true; + Runnable sender = new Runnable() { + public void run() { + while (recordEvents) { + RecordEvent message; + try { + message = messages.take(); + recordEvent(message); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + } + }; + exec.execute(sender); } - /** - * Destroy a Record Session - * @param sessionName a bigbluebutton session - */ - public void destroyRecordSession(String sessionName) { - recordingSessions.remove(sessionName); + public void stop() { + recordEvents = false; + } + + public void destroyRecordSession(String meetingID) { +// recordingSessions.remove(meetingID); } - /** - * Creates a record session if there wasn't one created already. - * @param conference name of a BigBlueButton conference - * @param room name of a room - * @param sessionName name of a session - */ - public void createRecordSession(String sessionName) { - recordingSessions.put(sessionName, sessionName); + public void createRecordSession(String meetingID) { +// recordingSessions.put(meetingID, meetingID); } - public void record(String session, RecordEvent message) { - if (recordingSessions.containsKey(session)) { - recorder.record(session, message); - } + public void record(String meetingID, RecordEvent message) { + messages.offer(message); + + /** + * Comment this out for now. Just setting up for transition on how + * we store the events in Redis (ralam may 6, 2014) + */ + //redisListRecorder.record(message); + } + + private void recordEvent(RecordEvent message) { +// if (recordingSessions.containsKey(message.getMeetingID())) { + recorder.record(message.getMeetingID(), message); +// } } public void setRecorder(Recorder recorder) { this.recorder = recorder; log.debug("setting recorder"); } + + public void setRedisListRecorder(RedisListRecorder rec) { + redisListRecorder = rec; + } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java index ec8c73d805..877f50dc7e 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java @@ -28,7 +28,7 @@ public class RedisDispatcher implements Recorder { private static final String COLON=":"; JedisPool redisPool; - public RedisDispatcher(){ + public RedisDispatcher() { super(); log.debug("setting redis dispatcher"); } @@ -53,5 +53,5 @@ public class RedisDispatcher implements Recorder { this.redisPool = redisPool; } - + } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/chat/ChatEventRecorder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/chat/ChatEventRecorder.java deleted file mode 100755 index 37ccbb70bc..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/chat/ChatEventRecorder.java +++ /dev/null @@ -1,55 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.recorder.chat; - -import org.bigbluebutton.conference.service.chat.ChatMessageVO; -import org.bigbluebutton.conference.service.chat.IChatRoomListener; -import org.bigbluebutton.conference.service.recorder.RecorderApplication; - -public class ChatEventRecorder implements IChatRoomListener { - private final RecorderApplication recorder; - private final String session; - - String name = "RECORDER:CHAT"; - - public ChatEventRecorder(String session, RecorderApplication recorder){ - this.recorder = recorder; - this.session = session; - } - - public String getName() { - return name; - } - - @Override - public void newChatMessage(ChatMessageVO chatobj) { - recorder.record(session, buildEvent(chatobj)); - } - - private PublicChatRecordEvent buildEvent(ChatMessageVO chatobj) { - PublicChatRecordEvent ev = new PublicChatRecordEvent(); - ev.setTimestamp(System.currentTimeMillis()); - ev.setMeetingId(session); - ev.setSender(chatobj.fromUsername); - ev.setMessage(chatobj.message); - ev.setLocale(chatobj.fromLang); - ev.setColor(chatobj.fromColor); - return ev; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java deleted file mode 100755 index b717e0f8b1..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java +++ /dev/null @@ -1,118 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.recorder.participants; - -import java.util.ArrayList; -import java.util.Map; - -import org.bigbluebutton.conference.IRoomListener; -import org.bigbluebutton.conference.User; -import org.bigbluebutton.conference.service.recorder.RecorderApplication; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class ParticipantsEventRecorder implements IRoomListener { - private static Logger log = Red5LoggerFactory.getLogger(ParticipantsEventRecorder.class, "bigbluebutton"); - private final RecorderApplication recorder; - private final String session; - - String name = "RECORDER:PARTICIPANT"; - - public ParticipantsEventRecorder(String session, RecorderApplication recorder) { - this.recorder = recorder; - this.session = session; - } - - @Override - public void endAndKickAll() { - ParticipantEndAndKickAllRecordEvent ev = new ParticipantEndAndKickAllRecordEvent(); - ev.setTimestamp(System.currentTimeMillis()); - ev.setMeetingId(session); - recorder.record(session, ev); - } - - @Override - public void participantJoined(User p) { - ParticipantJoinRecordEvent ev = new ParticipantJoinRecordEvent(); - ev.setTimestamp(System.currentTimeMillis()); - ev.setUserId(p.getInternalUserID()); - ev.setName(p.getName()); - ev.setMeetingId(session); - ev.setStatus(p.getStatus().toString()); - ev.setRole(p.getRole()); - - recorder.record(session, ev); - } - - @Override - public void participantLeft(User p) { - ParticipantLeftRecordEvent ev = new ParticipantLeftRecordEvent(); - ev.setTimestamp(System.currentTimeMillis()); - ev.setUserId(p.getInternalUserID()); - ev.setMeetingId(session); - - recorder.record(session, ev); - } - - @Override - public void participantStatusChange(User p, String status, Object value) { - ParticipantStatusChangeRecordEvent ev = new ParticipantStatusChangeRecordEvent(); - ev.setTimestamp(System.currentTimeMillis()); - ev.setUserId(p.getInternalUserID()); - ev.setMeetingId(session); - ev.setStatus(status); - ev.setValue(value.toString()); - - recorder.record(session, ev); - } - - @Override - public void assignPresenter(ArrayList presenter) { - log.debug("RECORD module:presentation event:assign_presenter"); - AssignPresenterRecordEvent event = new AssignPresenterRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setUserId(presenter.get(0).toString()); - event.setName(presenter.get(1).toString()); - event.setAssignedBy(presenter.get(2).toString()); - - recorder.record(session, event); - } - - @Override - public String getName() { - return this.name; - } - - @Override - public void lockSettingsChange(Map lockSettings) { - - } - - @Override - public void recordingStatusChange(User p, Boolean recording) { - RecordStatusRecordEvent ev = new RecordStatusRecordEvent(); - ev.setTimestamp(System.currentTimeMillis()); - ev.setUserId(p.getInternalUserID()); - ev.setMeetingId(session); - ev.setRecordingStatus(recording.toString()); - - recorder.record(session, ev); - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonUtils.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/AbstractPollRecordEvent.java similarity index 74% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonUtils.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/AbstractPollRecordEvent.java index 78e0f633c3..b95e18e37a 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonUtils.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/AbstractPollRecordEvent.java @@ -1,29 +1,29 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference; - -import org.red5.server.api.Red5; - -public class BigBlueButtonUtils{ - - public BigBlueButtonSession getBbbSession() { - return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); - } -} +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.service.recorder.polling; + +import org.bigbluebutton.conference.service.recorder.RecordEvent; + +public abstract class AbstractPollRecordEvent extends RecordEvent { + + public AbstractPollRecordEvent() { + setModule("POLL"); + } +} + diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollClearedRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollClearedRecordEvent.java new file mode 100755 index 0000000000..3eb9b25730 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollClearedRecordEvent.java @@ -0,0 +1,35 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.service.recorder.polling; + + +public class PollClearedRecordEvent extends AbstractPollRecordEvent { + + private static final String POLL_ID = "pollID"; + + public PollClearedRecordEvent(){ + super(); + setEvent("PollClearedEvent"); + } + + public void setPollID(String pollID) { + eventMap.put(POLL_ID, pollID); + } + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollCreatedRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollCreatedRecordEvent.java new file mode 100755 index 0000000000..d1003abdef --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollCreatedRecordEvent.java @@ -0,0 +1,66 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.service.recorder.polling; + + +public class PollCreatedRecordEvent extends AbstractPollRecordEvent { + + private static final String POLL_ID = "pollID"; + private static final String TITLE = "title"; + + private static final String QUESTION_PATTERN = "question"; + private static final String QUESTION_TEXT = "text"; + private static final String QUESTION_MULTIRESPONSE = "multiresponse"; + + private static final String RESPONSE_PATTERN = "response"; + private static final String RESPONSE_TEXT = "text"; + + private static final String RESPONDER_PATTERN = "responder"; + private static final String RESPONDER_USER = "user"; + + private static final String SEPARATOR = "-"; + + + public PollCreatedRecordEvent() { + super(); + setEvent("PollCreatedEvent"); + } + + public void setPollID(String pollID) { + eventMap.put(POLL_ID, pollID); + } + + public void setTitle(String title) { + eventMap.put(TITLE, title); + } + + public void addQuestion(String id, String question, Boolean multiresponse) { + eventMap.put(QUESTION_PATTERN + SEPARATOR + id + SEPARATOR + QUESTION_TEXT, question); + eventMap.put(QUESTION_PATTERN + SEPARATOR + id + SEPARATOR + QUESTION_MULTIRESPONSE, multiresponse.toString()); + } + + public void addResponse(String questionID, String responseID, String response) { + eventMap.put(QUESTION_PATTERN + SEPARATOR + questionID + SEPARATOR + RESPONSE_PATTERN + SEPARATOR + responseID + RESPONSE_TEXT, response); + } + + /*public void addResponder(String questionID, String responseID, String responderID, String userID) { + eventMap.put(QUESTION_PATTERN + SEPARATOR + questionID + SEPARATOR + RESPONSE_PATTERN + SEPARATOR + responseID + RESPONSE_TEXT, response); + }*/ + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollInvoker.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollInvoker.java deleted file mode 100644 index 8f7781b70f..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollInvoker.java +++ /dev/null @@ -1,128 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 2.1 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference.service.recorder.polling; - -import java.io.File; -import java.io.FileReader; -import java.lang.reflect.Array; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.Scanner; - -import javax.servlet.ServletRequest; - -import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.Red5; -import org.slf4j.Logger; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; - -import org.apache.commons.lang.time.DateFormatUtils; - -import org.bigbluebutton.conference.service.poll.Poll; -import org.bigbluebutton.conference.service.poll.PollApplication; - - -public class PollInvoker { - - private String BBB_FILE = "/var/lib/tomcat6/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties"; - private String BBB_SERVER_FIELD = "bigbluebutton.web.serverURL"; - - private static Logger log = Red5LoggerFactory.getLogger( PollInvoker.class, "bigbluebutton"); - JedisPool redisPool; - - public PollInvoker(){ - super(); - } - - public JedisPool getRedisPool() { - return redisPool; - } - - public void setRedisPool(JedisPool pool) { - this.redisPool = pool; - } - - // The invoke method is called after already determining which poll is going to be used - // (ie, the presenter has chosen this poll from a list and decided to use it, or it is being used immediately after creation) - public Poll invoke(String pollKey){ - Jedis jedis = PollApplication.dbConnect(); - if (jedis.exists(pollKey)) - { - // Get Boolean values from string-based Redis hash - boolean pMultiple = false; - boolean pStatus = false; - boolean pWebPublish = false; - if (jedis.hget(pollKey, "multiple").compareTo("true") == 0) - pMultiple = true; - if (jedis.hget(pollKey, "status").compareTo("true") == 0) - pStatus = true; - if (jedis.hget(pollKey, "publishToWeb").compareTo("true") == 0) - pWebPublish = true; - - // ANSWER EXTRACTION - long pollSize = jedis.hlen(pollKey); - // otherFields is defined in Poll.java as the number of fields the hash has which are not answers or votes. - long numAnswers = (pollSize-Poll.getOtherFields())/2; - - // Create an ArrayList of Strings for answers, and one of ints for answer votes - ArrayList pAnswers = new ArrayList (); - ArrayList pVotes = new ArrayList (); - for (int j = 1; j <= numAnswers; j++) - { - pAnswers.add(jedis.hget(pollKey, "answer"+j+"text")); - pVotes.add(Integer.parseInt(jedis.hget(pollKey, "answer"+j))); - } - - ArrayList retrievedPoll = new ArrayList(); - - retrievedPoll.add(jedis.hget(pollKey, "title")); - retrievedPoll.add(jedis.hget(pollKey, "room")); - retrievedPoll.add(pMultiple); - retrievedPoll.add(jedis.hget(pollKey, "question")); - retrievedPoll.add(pAnswers); - retrievedPoll.add(pVotes); - retrievedPoll.add(jedis.hget(pollKey, "time")); - retrievedPoll.add(jedis.hget(pollKey, "totalVotes")); - retrievedPoll.add(pStatus); - retrievedPoll.add(jedis.hget(pollKey, "didNotVote")); - retrievedPoll.add(pWebPublish); - retrievedPoll.add(jedis.hget(pollKey, "webKey")); - - Poll poll = new Poll(retrievedPoll); - return poll; - } - log.error("[ERROR] A poll is being invoked that does not exist. Null exception will be thrown."); - return null; - } - - // Gets the ID of the current room, and returns a list of all available polls. - public ArrayList titleList() - { - Jedis jedis = PollApplication.dbConnect(); - String roomName = Red5.getConnectionLocal().getScope().getName(); - ArrayList pollTitleList = new ArrayList (); - for (String s : jedis.keys(roomName+"*")) - { - pollTitleList.add(jedis.hget(s, "title")); - } - return pollTitleList; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollRecorder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollRecorder.java deleted file mode 100644 index 39d00ae875..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollRecorder.java +++ /dev/null @@ -1,110 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 2.1 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ - -package org.bigbluebutton.conference.service.recorder.polling; - -import java.net.InetAddress; - -import javax.servlet.ServletRequest; - -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; -import java.util.ArrayList; - -import org.apache.commons.lang.time.DateFormatUtils; - -import org.bigbluebutton.conference.service.poll.Poll; -import org.bigbluebutton.conference.service.poll.PollApplication; - -public class PollRecorder { - private static Logger log = Red5LoggerFactory.getLogger( PollRecorder.class, "bigbluebutton"); - - JedisPool redisPool; - - public PollRecorder() { - super(); - } - - public JedisPool getRedisPool() { - return redisPool; - } - - public void setRedisPool(JedisPool pool) { - this.redisPool = pool; - } - - public void record(Poll poll) { - Jedis jedis = PollApplication.dbConnect(); - // Merges the poll title, room into a single string seperated by a hyphen - String pollKey = poll.room + "-" + poll.title; - // Saves all relevant information about the poll as fields in a hash - jedis.hset(pollKey, "title", poll.title); - jedis.hset(pollKey, "question", poll.question); - jedis.hset(pollKey, "multiple", poll.isMultiple.toString()); - jedis.hset(pollKey, "room", poll.room); - jedis.hset(pollKey, "time", poll.time); - // Dynamically creates enough fields in the hash to store all of the answers and their corresponding votes. - // If the poll is freshly created and has no votes yet, the votes are initialized at zero; - // otherwise it fetches the previous number of votes. - for (int i = 1; i <= poll.answers.size(); i++) - { - jedis.hset(pollKey, "answer"+i+"text", poll.answers.toArray()[i-1].toString()); - if (poll.votes == null){ - jedis.hset(pollKey, "answer"+i, "0"); - }else{ - jedis.hset(pollKey, "answer"+i, poll.votes.toArray()[i-1].toString()); - } - } - Integer tv = poll.totalVotes; - String totalVotesStr = tv.toString(); - Integer dnv = poll.didNotVote; - String didNotVoteStr = dnv.toString(); - if (totalVotesStr == null){ - jedis.hset(pollKey, "totalVotes", "0"); - }else{ - jedis.hset(pollKey, "totalVotes", totalVotesStr); - } - jedis.hset(pollKey, "status", poll.status.toString()); - jedis.hset(pollKey, "didNotVote", didNotVoteStr); - jedis.hset(pollKey, "publishToWeb", poll.publishToWeb.toString()); - jedis.hset(pollKey, "webKey", poll.webKey); - } - - public void setStatus(String pollKey, Boolean status){ - Jedis jedis = PollApplication.dbConnect(); - jedis.hset(pollKey, "status", status.toString()); - } - - public void vote(String pollKey, Poll poll, Object[] answerIDs, Boolean webVote){ - Jedis jedis = PollApplication.dbConnect(); - for (int i = 0; i < answerIDs.length; i++){ - // Extract the index value stored at element i of answerIDs - Integer index = Integer.parseInt(answerIDs[i].toString()) + 1; - // Increment the votes for answer - jedis.hincrBy(pollKey, "answer"+index, 1); - } - if (answerIDs.length > 0){ - if (!webVote) - jedis.hincrBy(pollKey, "didNotVote", -1); - jedis.hincrBy(pollKey, "totalVotes", 1); - } - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollRemovedRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollRemovedRecordEvent.java new file mode 100755 index 0000000000..2b4b445d34 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollRemovedRecordEvent.java @@ -0,0 +1,37 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.service.recorder.polling; + + +public class PollRemovedRecordEvent extends AbstractPollRecordEvent { + + private static final String POLL_ID = "pollID"; + + public PollRemovedRecordEvent(){ + super(); + setEvent("PollRemovedEvent"); + } + + public void setPollID(String pollID) { + eventMap.put(POLL_ID, pollID); + } + +} + + diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollStartedRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollStartedRecordEvent.java new file mode 100755 index 0000000000..b86592ee5a --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollStartedRecordEvent.java @@ -0,0 +1,35 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.service.recorder.polling; + + +public class PollStartedRecordEvent extends AbstractPollRecordEvent { + + private static final String POLL_ID = "pollID"; + + public PollStartedRecordEvent(){ + super(); + setEvent("PollStartedEvent"); + } + + public void setPollID(String pollID) { + eventMap.put(POLL_ID, pollID); + } + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollStoppedRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollStoppedRecordEvent.java new file mode 100755 index 0000000000..efe04ba4de --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollStoppedRecordEvent.java @@ -0,0 +1,35 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.service.recorder.polling; + + +public class PollStoppedRecordEvent extends AbstractPollRecordEvent { + + private static final String POLL_ID = "pollID"; + + public PollStoppedRecordEvent(){ + super(); + setEvent("PollStoppedEvent"); + } + + public void setPollID(String pollID) { + eventMap.put(POLL_ID, pollID); + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollUpdatedRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollUpdatedRecordEvent.java new file mode 100755 index 0000000000..f26b1eef8e --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/polling/PollUpdatedRecordEvent.java @@ -0,0 +1,60 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.conference.service.recorder.polling; + + +public class PollUpdatedRecordEvent extends AbstractPollRecordEvent { + private static final String POLL_ID = "pollID"; + private static final String TITLE = "title"; + + private static final String QUESTION_PATTERN = "question"; + private static final String QUESTION_TEXT = "text"; + private static final String QUESTION_MULTIRESPONSE = "multiresponse"; + + private static final String RESPONSE_PATTERN = "response"; + private static final String RESPONSE_TEXT = "text"; + + private static final String RESPONDER_PATTERN = "responder"; + private static final String RESPONDER_USER = "user"; + + private static final String SEPARATOR = "-"; + + public PollUpdatedRecordEvent(){ + super(); + setEvent("PollUpdatedEvent"); + } + + public void setPollID(String pollID) { + eventMap.put(POLL_ID, pollID); + } + + public void setTitle(String title) { + eventMap.put(TITLE, title); + } + + public void addQuestion(String id, String question, Boolean multiresponse) { + eventMap.put(QUESTION_PATTERN + SEPARATOR + id + SEPARATOR + QUESTION_TEXT, question); + eventMap.put(QUESTION_PATTERN + SEPARATOR + id + SEPARATOR + QUESTION_MULTIRESPONSE, multiresponse.toString()); + } + + public void addResponse(String questionID, String responseID, String response) { + eventMap.put(QUESTION_PATTERN + SEPARATOR + questionID + SEPARATOR + RESPONSE_PATTERN + SEPARATOR + responseID + RESPONSE_TEXT, response); + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/ConversionCompletedPresentationRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/ConversionCompletedPresentationRecordEvent.java index 77fcdb8bb1..a134d7e4c1 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/ConversionCompletedPresentationRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/ConversionCompletedPresentationRecordEvent.java @@ -30,6 +30,10 @@ public class ConversionCompletedPresentationRecordEvent extends eventMap.put("presentationName", name); } + public void setOriginalFilename(String name) { + eventMap.put("originalFilename", name); + } + public void setSlidesInfo(String slidesInfo) { eventMap.put("slidesInfo", slidesInfo); } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/GotoSlidePresentationRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/GotoSlidePresentationRecordEvent.java index 6a25e7d167..4462c72408 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/GotoSlidePresentationRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/GotoSlidePresentationRecordEvent.java @@ -29,4 +29,48 @@ public class GotoSlidePresentationRecordEvent extends public void setSlide(int slide) { eventMap.put("slide", Integer.toString(slide)); } + + public void setId(String id) { + eventMap.put("id", id); + } + + public void setNum(int num) { + eventMap.put("num", Integer.toString(num)); + } + + public void setCurrent(boolean current) { + eventMap.put("current", Boolean.toString(current)); + } + + public void setThumbUri(String thumbUri) { + eventMap.put("thumbUri", thumbUri); + } + + public void setSwfUri(String swfUri) { + eventMap.put("swfUri", swfUri); + } + + public void setTxtUri(String txtUri) { + eventMap.put("txtUri", txtUri); + } + + public void setPngUri(String pngUri) { + eventMap.put("pngUri", pngUri); + } + + public void setXOffset(double offset) { + eventMap.put("xOffset", Double.toString(offset)); + } + + public void setYOffset(double offset) { + eventMap.put("yOffset", Double.toString(offset)); + } + + public void setWidthRatio(double ratio) { + eventMap.put("widthRatio", Double.toString(ratio)); + } + + public void setHeightRatio(double ratio) { + eventMap.put("heightRatio", Double.toString(ratio)); + } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/PresentationEventRecorder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/PresentationEventRecorder.java deleted file mode 100755 index 3c88c99a93..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/PresentationEventRecorder.java +++ /dev/null @@ -1,147 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.recorder.presentation; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import org.bigbluebutton.conference.service.recorder.RecorderApplication; -import org.bigbluebutton.conference.service.presentation.IPresentationRoomListener; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class PresentationEventRecorder implements IPresentationRoomListener { - private static Logger log = Red5LoggerFactory.getLogger( PresentationEventRecorder.class, "bigbluebutton" ); - private static final String GENERATED_SLIDE_KEY = "GENERATED_SLIDE"; - private static final String CONVERSION_COMPLETED_KEY = "CONVERSION_COMPLETED"; - - String APP_NAME = "RECORDER:PRESENTATION"; - private final RecorderApplication recorder; - private final String session; - - public PresentationEventRecorder(String session, RecorderApplication recorder) { - this.recorder = recorder; - this.session = session; - } - - @Override - public String getName() { - return APP_NAME; - } - - @SuppressWarnings("rawtypes") - @Override - public void sendUpdateMessage(Map message) { - String messageKey = (String) message.get("messageKey"); - - if(messageKey.equalsIgnoreCase(GENERATED_SLIDE_KEY)){ - handleGeneratedSlideEvent(message); - } - else if(messageKey.equalsIgnoreCase(CONVERSION_COMPLETED_KEY)){ - handleConversionCompletedEvent(message); - } - else{ - log.error("NOT recording received message " + messageKey); - } - } - - private void handleGeneratedSlideEvent(Map message) { - log.debug("Generated Slide Event [" + message.get("presentationName") + "]"); - - GenerateSlidePresentationRecordEvent event = new GenerateSlidePresentationRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentationName((String)message.get("presentationName")); - event.setNumberOfPages((Integer)message.get("numberOfPages")); - event.setPagesCompleted((Integer)message.get("pagesCompleted")); - recorder.record(session, event); - } - - private void handleConversionCompletedEvent(Map message) { - log.debug("Conversion Completed Event [" + message.get("presentationName") + "]"); - - ConversionCompletedPresentationRecordEvent event = new ConversionCompletedPresentationRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentationName((String)message.get("presentationName")); - event.setSlidesInfo((String)message.get("slidesInfo")); - recorder.record(session, event); - } - - @Override - public void gotoSlide(int curslide) { - log.debug("RECORD module:presentation event:update_slide"); - GotoSlidePresentationRecordEvent event = new GotoSlidePresentationRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setSlide(curslide); - recorder.record(session, event); - } - - @Override - public void resizeAndMoveSlide(Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) { - log.debug("RECORD module:presentation event:resize_move_slide"); - - ResizeAndMoveSlidePresentationRecordEvent event = new ResizeAndMoveSlidePresentationRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setXOffset(xOffset.doubleValue()); - event.setYOffset(yOffset.doubleValue()); - event.setWidthRatio(widthRatio.doubleValue()); - event.setHeightRatio(heightRatio.doubleValue()); - - recorder.record(session, event); - } - - @Override - public void removePresentation(String name) { - log.debug("RECORD module:presentation event:remove_presentation"); - RemovePresentationPresentationRecordEvent event = new RemovePresentationPresentationRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentationName(name); - - recorder.record(session, event); - } - - @Override - public void sharePresentation(String presentationName, Boolean share) { - log.debug("RECORD module:presentation event:share_presentation"); - SharePresentationPresentationRecordEvent event = new SharePresentationPresentationRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentationName(presentationName); - event.setShare(share.booleanValue()); - recorder.record(session, event); - } - - @Override - public void sendCursorUpdate(Double xPercent, Double yPercent) { - log.debug("RECORD module:presentation event:CursorMoveEvent"); - - CursorUpdateRecordEvent event = new CursorUpdateRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setXPercent(xPercent.doubleValue()); - event.setYPercent(yPercent.doubleValue()); - - recorder.record(session, event); - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/RemovePresentationPresentationRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/RemovePresentationPresentationRecordEvent.java index a85855ddd0..01d371cc7d 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/RemovePresentationPresentationRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/RemovePresentationPresentationRecordEvent.java @@ -29,4 +29,5 @@ public class RemovePresentationPresentationRecordEvent extends public void setPresentationName(String name) { eventMap.put("presentationName", name); } + } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/ResizeAndMoveSlidePresentationRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/ResizeAndMoveSlidePresentationRecordEvent.java index b6cc59511e..bf55a97ce2 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/ResizeAndMoveSlidePresentationRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/ResizeAndMoveSlidePresentationRecordEvent.java @@ -26,6 +26,34 @@ public class ResizeAndMoveSlidePresentationRecordEvent extends setEvent("ResizeAndMoveSlideEvent"); } + public void setId(String id) { + eventMap.put("id", id); + } + + public void setNum(int num) { + eventMap.put("num", Integer.toString(num)); + } + + public void setCurrent(boolean current) { + eventMap.put("current", Boolean.toString(current)); + } + + public void setThumbUri(String thumbUri) { + eventMap.put("thumbUri", thumbUri); + } + + public void setSwfUri(String swfUri) { + eventMap.put("swfUri", swfUri); + } + + public void setTxtUri(String txtUri) { + eventMap.put("txtUri", txtUri); + } + + public void setPngUri(String pngUri) { + eventMap.put("pngUri", pngUri); + } + public void setXOffset(double offset) { eventMap.put("xOffset", Double.toString(offset)); } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/SharePresentationPresentationRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/SharePresentationPresentationRecordEvent.java index 1d59342bc8..0efd6273fc 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/SharePresentationPresentationRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/presentation/SharePresentationPresentationRecordEvent.java @@ -30,6 +30,10 @@ public class SharePresentationPresentationRecordEvent extends eventMap.put("presentationName", name); } + public void setOriginalFilename(String name) { + eventMap.put("originalFilename", name); + } + public void setShare(boolean share) { eventMap.put("share", Boolean.toString(share)); } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java deleted file mode 100755 index 7a886aff47..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java +++ /dev/null @@ -1,120 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.recorder.whiteboard; - -import org.bigbluebutton.conference.service.recorder.RecorderApplication; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; -import org.bigbluebutton.conference.service.whiteboard.IWhiteboardRoomListener; -import org.bigbluebutton.conference.service.whiteboard.Presentation; -import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation; - -public class WhiteboardEventRecorder implements IWhiteboardRoomListener{ - private static Logger log = Red5LoggerFactory.getLogger( WhiteboardEventRecorder.class, "bigbluebutton" ); - private final RecorderApplication recorder;; - private final String session; - String name = "RECORDER:WHITEBOARD"; - - public WhiteboardEventRecorder(String session, RecorderApplication recorder){ - this.recorder = recorder; - this.session = session; - } - - @Override - public String getName() { - return name; - } - - - @Override - public void addAnnotation(Annotation annotation, Presentation presentation) { - AddShapeWhiteboardRecordEvent event = new AddShapeWhiteboardRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentation(presentation.getName()); - event.setPageNumber(presentation.getActivePage().getPageIndex()); - event.addAnnotation(annotation.getAnnotation()); - recorder.record(session, event); - } - - @Override - public void addText(Annotation text, Presentation presentation) { - AddTextWhiteboardRecordEvent event = new AddTextWhiteboardRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentation(presentation.getName()); - event.setPageNumber(presentation.getActivePage().getPageIndex()); - event.addAnnotation(text.getAnnotation()); - recorder.record(session, event); - } - - @Override - public void clearPage(Presentation presentation) { - ClearPageWhiteboardRecordEvent event = new ClearPageWhiteboardRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentation(presentation.getName()); - event.setPageNumber(presentation.getActivePage().getPageIndex()); - - recorder.record(session, event); - } - - @Override - public void undoWBGraphic(Presentation presentation) { - UndoShapeWhiteboardRecordEvent event = new UndoShapeWhiteboardRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentation(presentation.getName()); - event.setPageNumber(presentation.getActivePage().getPageIndex()); - - recorder.record(session, event); - } - - @Override - public void toggleGrid(boolean enabled, Presentation presentation) { - ToggleGridWhiteboardRecordEvent event = new ToggleGridWhiteboardRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentation(presentation.getName()); - event.setPageNumber(presentation.getActivePage().getPageIndex()); - event.setGridEnabled(enabled); - - recorder.record(session, event); - - } - - @Override - public void modifyText(Annotation text, Presentation presentation) { - ModifyTextWhiteboardRecordEvent event = new ModifyTextWhiteboardRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - event.setPresentation(presentation.getName()); - event.setPageNumber(presentation.getActivePage().getPageIndex()); - event.addAnnotation(text.getAnnotation()); - recorder.record(session, event); - } - - @Override - public void undoShape(Presentation presentation) { - UndoShapeWhiteboardRecordEvent event = new UndoShapeWhiteboardRecordEvent(); - event.setMeetingId(session); - event.setTimestamp(System.currentTimeMillis()); - recorder.record(session, event); - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java index d2961bf0cd..264806db51 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java @@ -26,17 +26,13 @@ import org.red5.server.api.scope.IScope; import org.red5.server.api.so.ISharedObject; import org.red5.server.adapter.ApplicationAdapter; import org.red5.server.api.Red5; import org.bigbluebutton.conference.BigBlueButtonSession; import org.bigbluebutton.conference.Constants; import org.red5.logging.Red5LoggerFactory; -import org.bigbluebutton.webconference.voice.ConferenceService; -import org.bigbluebutton.webconference.red5.voice.ClientNotifier; + public class VoiceHandler extends ApplicationAdapter implements IApplication{ private static Logger log = Red5LoggerFactory.getLogger(VoiceHandler.class, "bigbluebutton"); private static final String VOICE_SO = "meetMeUsersSO"; private static final String APP = "VOICE"; - private ClientNotifier clientManager; - private ConferenceService conferenceService; - @Override public boolean appConnect(IConnection conn, Object[] params) { log.debug("***** " + APP + " [ " + " appConnect *********"); @@ -62,13 +58,13 @@ public class VoiceHandler extends ApplicationAdapter implements IApplication{ @Override public boolean appStart(IScope scope) { log.debug("***** " + APP + " [ " + " appStart [ " + scope.getName() + "] *********"); - return conferenceService.startup(); + return true; } @Override public void appStop(IScope scope) { log.debug("***** " + APP + " [ " + " appStop [ " + scope.getName() + "] *********"); - conferenceService.shutdown(); + } @Override @@ -91,7 +87,7 @@ public class VoiceHandler extends ApplicationAdapter implements IApplication{ String voiceBridge = (String) scope.getAttribute(VOICE_BRIDGE); String userID = getBbbSession().getExternUserID(); log.info("User has left the meeting. Try to hangup user=[" + userID + "] from [" + voiceBridge + "] "); - conferenceService.hangupUser(userID, voiceBridge); +// conferenceService.hangupUser(userID, voiceBridge); } } @@ -119,10 +115,7 @@ public class VoiceHandler extends ApplicationAdapter implements IApplication{ connection.getScope().setAttribute(VOICE_BRIDGE, getBbbSession().getVoiceBridge()); } - log.debug("Setting up voiceBridge " + voiceBridge); - clientManager.addSharedObject(connection.getScope().getName(), voiceBridge, so); - conferenceService.createConference(voiceBridge, meetingid, record, muted); - + return true; } @@ -131,30 +124,9 @@ public class VoiceHandler extends ApplicationAdapter implements IApplication{ @Override public void roomStop(IScope scope) { log.debug("***** " + APP + " [ " + " roomStop [ " + scope.getName() + "] *********"); - /** - * Remove the voicebridge from the list of running - * voice conference. - */ - String voiceBridge = (String) scope.getAttribute(VOICE_BRIDGE); - conferenceService.destroyConference(voiceBridge); - clientManager.removeSharedObject(scope.getName()); - if (hasSharedObject(scope, VOICE_SO)) { - clearSharedObjects(scope, VOICE_SO); - } - } - - public void setClientNotifier(ClientNotifier c) { - log.debug("Setting voice application"); - clientManager = c; - } - - public void setConferenceService(ConferenceService s) { - log.debug("Setting voice server"); - conferenceService = s; - log.debug("Setting voice server DONE"); - } - + } + private BigBlueButtonSession getBbbSession() { return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java index e634fd0793..5c552296ce 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java @@ -17,45 +17,22 @@ * */ package org.bigbluebutton.conference.service.voice; - import java.util.ArrayList; -import java.util.HashMap; + import org.slf4j.Logger; import org.red5.server.api.Red5; import org.bigbluebutton.conference.BigBlueButtonSession; import org.bigbluebutton.conference.Constants; import org.bigbluebutton.core.api.IBigBlueButtonInGW; +import org.red5.logging.Red5LoggerFactory; import java.util.List; import java.util.Map; - -import org.bigbluebutton.conference.BigBlueButtonSession; -import org.bigbluebutton.conference.Constants; -import org.bigbluebutton.webconference.voice.ConferenceService; -import org.bigbluebutton.webconference.voice.Participant; -import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.Red5; -import org.slf4j.Logger; public class VoiceService { private static Logger log = Red5LoggerFactory.getLogger( VoiceService.class, "bigbluebutton" ); - private ConferenceService conferenceService; - - @SuppressWarnings("unchecked") - public Map getMeetMeUsers() { - String voiceBridge = getBbbSession().getVoiceBridge(); - - log.debug("GetMeetmeUsers request for room[" + voiceBridge + "]"); - ArrayList p = conferenceService.getParticipants(voiceBridge); - - Map participants = new HashMap(); - if (p == null) { - participants.put("count", 0); - } else { - participants.put("count", p.size()); - if (p.size() > 0) { - participants.put("participants", arrayListToMap(p)); - } - } - log.info("MeetMe::service - Sending " + p.size() + " current users..."); - return participants; - } + private IBigBlueButtonInGW bbbInGW; + public void setBigBlueButtonInGW(IBigBlueButtonInGW inGW) { + bbbInGW = inGW; + } + + /* private Map arrayListToMap(ArrayList alp) { log.debug("Converting arraylist to Map " + alp.size()); Map result = new HashMap(); @@ -72,42 +49,56 @@ public class VoiceService { return result; } +*/ public void muteAllUsers(boolean mute, List dontMuteThese) { String conference = getBbbSession().getVoiceBridge(); log.debug("Mute all users in room[" + conference + "], dontLockThese list size = " + dontMuteThese.size()); - conferenceService.muteAllBut(conference, mute, dontMuteThese); + + log.error("TODO: Implement this"); + +// conferenceService.muteAllBut(conference, mute, dontMuteThese); } - public void muteAllUsers(boolean mute) { - String conference = getBbbSession().getVoiceBridge(); - log.debug("Mute all users in room[" + conference + "]"); - conferenceService.mute(conference, mute); + public void muteAllUsers(Map msg) { + String meetingID = Red5.getConnectionLocal().getScope().getName(); + String requesterID = getBbbSession().getInternalUserID(); + Boolean mute = (Boolean) msg.get("mute"); + bbbInGW.muteAllUsers(meetingID, requesterID, mute); + } + + public void isRoomMuted(){ + String meetingID = Red5.getConnectionLocal().getScope().getName(); + String requesterID = getBbbSession().getInternalUserID(); + bbbInGW.isMeetingMuted(meetingID, requesterID); } - public boolean isRoomMuted(){ - String conference = getBbbSession().getVoiceBridge(); - return conferenceService.isRoomMuted(conference); + public void muteUnmuteUser(Map msg) { + Boolean mute = (Boolean) msg.get("mute"); + String userid = (String) msg.get("userId"); + + String meetingID = Red5.getConnectionLocal().getScope().getName(); + String requesterID = getBbbSession().getInternalUserID(); + bbbInGW.muteUser(meetingID, requesterID, userid, mute); } - public void muteUnmuteUser(Integer userid,Boolean mute) { - String conference = getBbbSession().getVoiceBridge(); - log.debug("MuteUnmute request for user [" + userid + "] in room[" + conference + "]"); - conferenceService.mute(userid, conference, mute); + public void lockMuteUser(Map msg) { + Boolean lock = (Boolean) msg.get("lock"); + String userid = (String) msg.get("userId"); + + String meetingID = Red5.getConnectionLocal().getScope().getName(); + String requesterID = getBbbSession().getInternalUserID(); + bbbInGW.lockUser(meetingID, requesterID, userid, lock); } - public void kickUSer(Integer userid) { - String conference = getBbbSession().getVoiceBridge(); - log.debug("KickUser " + userid + " from " + conference); - conferenceService.eject(userid, conference); + public void kickUSer(Map msg) { + String userid = (String) msg.get("userId"); + String meetingID = Red5.getConnectionLocal().getScope().getName(); + String requesterID = getBbbSession().getInternalUserID(); + bbbInGW.ejectUser(meetingID, requesterID, userid); + } - - public void setConferenceService(ConferenceService s) { - log.debug("Setting voice server"); - conferenceService = s; - log.debug("Setting voice server DONE"); - } - + private BigBlueButtonSession getBbbSession() { return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java deleted file mode 100755 index a422d9b7e8..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java +++ /dev/null @@ -1,34 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard; - -import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation; - -public interface IWhiteboardRoomListener { - public String getName(); - - public void addAnnotation(Annotation annotation, Presentation presentation); - public void undoShape(Presentation presentation); -// public void addShape(Annotation shape, Presentation presentation); - public void addText(Annotation shape, Presentation presentation); - public void modifyText(Annotation shape, Presentation presentation); - public void undoWBGraphic(Presentation presentation); - public void toggleGrid(boolean value, Presentation presentation); - public void clearPage(Presentation presentation); -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java deleted file mode 100755 index 80d1d86b38..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java +++ /dev/null @@ -1,107 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation; - -public class Page { - private ArrayList annotations; - private int pageIndex; - private boolean isGrid = false; - - public Page(int pageIndex){ - annotations = new ArrayList(); - this.setPageIndex(pageIndex); - } - - public void addAnnotation(Annotation annotation) { - annotations.add(annotation); - } - - public List getAnnotations() { - List a = new ArrayList(); - for (Annotation v : annotations) { - a.add(v); - } - - return a; - } - - public void deleteAnnotation(String id) { - int foundIndex = findAnnotation(id); - if (foundIndex >= 0) annotations.remove(foundIndex); - } - - public void clear() { - annotations.clear(); - } - - public void undo() { - if (!annotations.isEmpty()) { - annotations.remove(annotations.size() - 1); - } - } - - public int getNumShapesOnPage() { - return annotations.size(); - } - - public void modifyText(String id, Annotation annotation){ - int foundIndex = findAnnotation(id); - if (foundIndex >= 0) { - annotations.set(foundIndex, annotation); - } - } - - private int findAnnotation(String id) { - int foundIndex = -1; - for (int i=0; i < annotations.size(); i++) { - Annotation annotation = annotations.get(i); - if (annotation.getID().equals(id)) { - foundIndex = i; - break; - } - } - return foundIndex; - - } - - public void toggleGrid() { - System.out.println("Toggling grid mode on page " + pageIndex); - isGrid = !isGrid; - } - - public boolean isGrid() { - return isGrid; - } - - public void setPageIndex(int pageIndex) { - this.pageIndex = pageIndex; - } - - public int getPageIndex() { - return pageIndex; - } - - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Presentation.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Presentation.java deleted file mode 100755 index bdbd9fd8f8..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Presentation.java +++ /dev/null @@ -1,60 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard; - -import java.util.ArrayList; - -public class Presentation { - private String name; - private ArrayList pages; - - private Page activePage; - - public Presentation(String name, int numPages){ - this.name = name; - this.pages = new ArrayList(numPages); - for (int i = 1; i <= numPages; i++){ - pages.add(new Page(i)); - } - this.activePage = getPage(1); - } - - public String getName() { - return name; - } - - public Page getActivePage(){ - return activePage; - } - - public void setActivePage(int index){ - if ((index > pages.size()) || (index == activePage.getPageIndex())) return; - - activePage = getPage(index); - } - - public Page getPage(int pageNumber) { - for (int i = 0; i < pages.size(); i++){ - Page p = pages.get(i); - if (p.getPageIndex() == pageNumber) return p; - } - - return null; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java deleted file mode 100755 index 39c649bc47..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java +++ /dev/null @@ -1,122 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard; - - -import org.red5.compatibility.flex.messaging.io.ArrayCollection; - -public class ShapeGraphic extends WBGraphic { - - private String type; - private int thickness; - private int color; - private int fillColor; - - private boolean fill; - private boolean transparent; - - private double[] shape; - - public static final String PENCIL = "pencil"; - public static final String RECTANGLE = "rectangle"; - public static final String ELLIPSE = "ellipse"; - public static final String TEXT = "text"; - public static final String TRIANGLE = "triangle"; - public static final String HIGHLIGHTER = "highlighter"; - public static final String ERASER = "eraser"; - public static final String LINE = "line"; - - public ShapeGraphic(double[] shape, String type, int color, int thickness, boolean fill, int fillColor, boolean transparent, String id, String status){ - super(WBGraphic.Type.SHAPE); - this.shape = shape; - this.type = type; - this.color = color; - this.thickness = thickness; - this.fill = fill; - this.fillColor = fillColor; - this.transparent = transparent; - this.ID = id; - this.status = status; - } - - @Override - public ArrayCollection toList(){ - ArrayCollection sendableList = new ArrayCollection(); - sendableList.add(graphicType); - sendableList.add(shape); - sendableList.add(type); - sendableList.add(color); - sendableList.add(thickness); - sendableList.add(fill); - sendableList.add(fillColor); - sendableList.add(transparent); - sendableList.add(ID); - sendableList.add(status); - return sendableList; - } - - @Override - public Object[] toObjectArray(){ - Object[] objects = new Object[10]; - objects[0] = graphicType; - objects[1] = shape; - objects[2] = type; - objects[3] = color; - objects[4] = thickness; - objects[5] = fill; - objects[6] = fillColor; - objects[7] = transparent; - objects[8] = ID; - objects[9] = status; - return objects; - } - - public String getShape(){ - String dataToString = ""; - for (int i=0; i. -* -*/ -package org.bigbluebutton.conference.service.whiteboard; - -import org.red5.compatibility.flex.messaging.io.ArrayCollection; - -public class TextGraphic extends WBGraphic { - - private String text; - private int textColor; - private int bgColor; - private boolean bgColorVisible; - private int x; - private int y; - private int textSize; - - - public TextGraphic() { - super(WBGraphic.Type.TEXT); - } - - public TextGraphic(String text, int textColor, int bgColor, boolean bgColorVisible, int x, int y, int textSize, String id, String status) { - super(WBGraphic.Type.TEXT); - this.text = text; - this.textColor = textColor; - this.bgColor = bgColor; - this.bgColorVisible = bgColorVisible; - this.x = x; - this.y = y; - this.textSize = textSize; - this.ID = id; - this.status = status; - } - - @Override - public ArrayCollection toList() { - ArrayCollection sendableList = new ArrayCollection(); - sendableList.add(graphicType); - sendableList.add(text); - sendableList.add(textColor); - sendableList.add(bgColor); - sendableList.add(bgColorVisible); - sendableList.add(x); - sendableList.add(y); - sendableList.add(textSize); - sendableList.add(ID); - sendableList.add(status); - return sendableList; - } - - @Override - public Object[] toObjectArray() { - Object[] objects = new Object[10]; - objects[0] = graphicType; - objects[1] = text; - objects[2] = textColor; - objects[3] = bgColor; - objects[4] = bgColorVisible; - objects[5] = x; - objects[6] = y; - objects[7] = textSize; - objects[8] = ID; - objects[9] = status; - return objects; - } - - public String getText() { - return text; - } - - public int getTextColor() { - return textColor; - } - - public int getBgColor() { - return bgColor; - } - - public boolean getBgColorVisible() { - return bgColorVisible; - } - - public int getX() { - return x; - } - - public int getY() { - return y; - } - - public String getLocation() { - return x + "," + y; - } - - public int getTextSize() { - return textSize; - } - - public void setTextSize(int textSize) { - this.textSize = textSize; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/UIDGenerator.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/UIDGenerator.java deleted file mode 100755 index b8228cebaa..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/UIDGenerator.java +++ /dev/null @@ -1,32 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard; - -public class UIDGenerator { - private int count = 0; - - /* - * synchronized for safe access by multiple threads. should not degrade performance much because - * this method is called only when new 'objects' on the whiteboard are created/published and not - * while they are being updated and transmitted to other clients - */ - public synchronized int generateUID() { - return count++; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java index cd3cbe9821..add2ea3250 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java @@ -18,77 +18,54 @@ */ package org.bigbluebutton.conference.service.whiteboard; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.bigbluebutton.conference.BigBlueButtonSession; -import org.bigbluebutton.conference.ClientMessage; -import org.bigbluebutton.conference.ConnectionInvokerService; -import org.bigbluebutton.conference.Constants; import org.red5.logging.Red5LoggerFactory; import org.red5.server.adapter.ApplicationAdapter; import org.red5.server.adapter.IApplication; import org.red5.server.api.IClient; import org.red5.server.api.IConnection; -import org.red5.server.api.Red5; import org.red5.server.api.scope.IScope; import org.slf4j.Logger; -import org.bigbluebutton.conference.service.recorder.RecorderApplication; -import org.bigbluebutton.conference.service.recorder.whiteboard.WhiteboardEventRecorder; -import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation; +import org.bigbluebutton.core.api.IBigBlueButtonInGW; public class WhiteboardApplication extends ApplicationAdapter implements IApplication { private static Logger log = Red5LoggerFactory.getLogger(WhiteboardApplication.class, "bigbluebutton"); + + private IBigBlueButtonInGW bbbInGW; - private WhiteboardRoomManager roomManager; - private RecorderApplication recorderApplication; - private ConnectionInvokerService connInvokerService; - private static final String APP = "WHITEBOARD"; + public void setBigBlueButtonInGW(IBigBlueButtonInGW inGW) { + bbbInGW = inGW; + } @Override public boolean appConnect(IConnection conn, Object[] params) { - log.debug("***** " + APP + " [ " + " appConnect *********"); return true; } @Override public void appDisconnect(IConnection conn) { - log.debug("***** " + APP + " [ " + " appDisconnect *********"); } @Override public boolean appJoin(IClient client, IScope scope) { - log.debug("***** " + APP + " [ " + " appJoin [ " + scope.getName() + "] *********"); return true; } @Override public void appLeave(IClient client, IScope scope) { - log.debug("***** " + APP + " [ " + " appLeave [ " + scope.getName() + "] *********"); } @Override public boolean appStart(IScope scope) { - log.debug("***** " + APP + " [ " + " appStart [ " + scope.getName() + "] *********"); return true; } @Override public void appStop(IScope scope) { - log.debug("***** " + APP + " [ " + " appStop [ " + scope.getName() + "] *********"); - roomManager.removeRoom(getMeetingId()); } @Override public boolean roomConnect(IConnection connection, Object[] params) { - log.debug("WHITEBOARD - getting record parameters"); - if (getBbbSession().getRecord()){ - log.debug("WHITEBOARD - recording : true"); - WhiteboardEventRecorder recorder = new WhiteboardEventRecorder(getMeetingId(), recorderApplication); - roomManager.getRoom(getMeetingId()).addRoomListener(recorder); - log.debug("event session is " + getMeetingId()); - } + return true; } @@ -108,145 +85,39 @@ public class WhiteboardApplication extends ApplicationAdapter implements IApplic @Override public boolean roomStart(IScope scope) { - roomManager.addRoom(scope.getName()); - return true; + return true; } @Override public void roomStop(IScope scope) { - roomManager.removeRoom(scope.getName()); } - public void setActivePresentation(String presentationID, int numPages) { - WhiteboardRoom room = roomManager.getRoom(getMeetingId()); - if (room.presentationExists(presentationID)) { - room.setActivePresentation(presentationID); - } else { - room.addPresentation(presentationID, numPages); - } + public void requestAnnotationHistory(String meetingID, String requesterID, String whiteboardId) { + // Just hardcode as we don't really need it for flash client. (ralam may 7, 2014) + String replyTo = meetingID + "/" + requesterID; + bbbInGW.requestWhiteboardAnnotationHistory(meetingID, requesterID, whiteboardId, replyTo); + } + + public void sendWhiteboardAnnotation(String meetingID, String requesterID, java.util.Map shape) { + bbbInGW.sendWhiteboardAnnotation(meetingID, requesterID, shape); + } + + public void clearWhiteboard(String meetingID, String requesterID, String whiteboardId) { + bbbInGW.clearWhiteboard(meetingID, requesterID, whiteboardId); + } + + public void undoWhiteboard(String meetingID, String requesterID, String whiteboardId) { + bbbInGW.undoWhiteboard(meetingID, requesterID, whiteboardId); + } - Map message = new HashMap(); - message.put("presentationID", presentationID); - message.put("numberOfPages", numPages); - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), "WhiteboardChangePresentationCommand", message); - connInvokerService.sendMessage(m); + public void setWhiteboardEnable(String meetingID, String requesterID, Boolean enable) { + bbbInGW.enableWhiteboard(meetingID, requesterID, enable); } - public void enableWhiteboard(boolean enabled) { - roomManager.getRoom(getMeetingId()).setWhiteboardEnabled(enabled); - - Map message = new HashMap(); - message.put("enabled", roomManager.getRoom(getMeetingId()).isWhiteboardEnabled()); - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), "WhiteboardEnableWhiteboardCommand", message); - connInvokerService.sendMessage(m); + public void setIsWhiteboardEnabled(String meetingID, String requesterID) { + // Just hardcode as we don't really need it for flash client. (ralam may 7, 2014) + String replyTo = meetingID + "/" + requesterID; + bbbInGW.isWhiteboardEnabled(meetingID, requesterID, replyTo); } - public void isWhiteboardEnabled(String userid) { - Map message = new HashMap(); - message.put("enabled", roomManager.getRoom(getMeetingId()).isWhiteboardEnabled()); - ClientMessage m = new ClientMessage(ClientMessage.DIRECT, userid, "WhiteboardIsWhiteboardEnabledReply", message); - connInvokerService.sendMessage(m); - } - - public void sendAnnotationHistory(String userid, String presentationID, Integer pageNumber) { - Map message = new HashMap(); - List annotations = roomManager.getRoom(getMeetingId()).getAnnotations(presentationID, pageNumber); - message.put("count", new Integer(annotations.size())); - - /** extract annotation into a Map */ - List> a = new ArrayList>(); - for (Annotation v : annotations) { - a.add(v.getAnnotation()); - } - - message.put("presentationID", presentationID); - message.put("pageNumber", pageNumber); - message.put("annotations", a); - ClientMessage m = new ClientMessage(ClientMessage.DIRECT, userid, "WhiteboardRequestAnnotationHistoryReply", message); - connInvokerService.sendMessage(m); - } - - private static final String TEXT_CREATED = "textCreated"; - private static final String TEXT_TYPE = "text"; - private static final String PENCIL_TYPE = "pencil"; - private static final String RECTANGLE_TYPE = "rectangle"; - private static final String ELLIPSE_TYPE = "ellipse"; - private static final String TRIANGLE_TYPE = "triangle"; - private static final String LINE_TYPE = "line"; - - public void sendAnnotation(Annotation annotation) { - String status = annotation.getStatus(); - - if ("textCreated".equals(status)) { - roomManager.getRoom(getMeetingId()).addAnnotation(annotation); - } else if (PENCIL_TYPE.equals(annotation.getType()) && "DRAW_START".equals(status)) { - roomManager.getRoom(getMeetingId()).addAnnotation(annotation); - } else if ("DRAW_END".equals(status) && (RECTANGLE_TYPE.equals(annotation.getType()) - || ELLIPSE_TYPE.equals(annotation.getType()) - || TRIANGLE_TYPE.equals(annotation.getType()) - || LINE_TYPE.equals(annotation.getType()))) { - roomManager.getRoom(getMeetingId()).addAnnotation(annotation); - } else { - if ("text".equals(annotation.getType())) { - roomManager.getRoom(getMeetingId()).modifyText(annotation); - } - } - - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), "WhiteboardNewAnnotationCommand", annotation.getAnnotation()); - connInvokerService.sendMessage(m); - } - - public void changePage(int pageNum) { - Presentation pres = roomManager.getRoom(getMeetingId()).getActivePresentation(); - pres.setActivePage(pageNum); - - Map message = new HashMap(); - message.put("pageNum", pageNum); - message.put("numAnnotations", pres.getActivePage().getNumShapesOnPage()); - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), "WhiteboardChangePageCommand", message); - connInvokerService.sendMessage(m); - } - - public void clear() { - roomManager.getRoom(getMeetingId()).clear(); - - Map message = new HashMap(); - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), "WhiteboardClearCommand", message); - connInvokerService.sendMessage(m); - } - - public void undo() { - roomManager.getRoom(getMeetingId()).undo(); - - Map message = new HashMap(); - ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), "WhiteboardUndoCommand", message); - connInvokerService.sendMessage(m); - } - - public void toggleGrid(){ -// System.out.println("toggling grid mode "); -// roomManager.getRoom(getLocalScope().getName()).toggleGrid(); -// ISharedObject drawSO = getSharedObject(getLocalScope(), WHITEBOARD_SHARED_OBJECT); -// drawSO.sendMessage("toggleGridCallback", new ArrayList()); - } - - public void setRoomManager(WhiteboardRoomManager manager) { - this.roomManager = manager; - } - - private String getMeetingId(){ - return Red5.getConnectionLocal().getScope().getName(); - } - - private BigBlueButtonSession getBbbSession() { - return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); - } - - public void setRecorderApplication(RecorderApplication a) { - recorderApplication = a; - } - - public void setConnInvokerService(ConnectionInvokerService connInvokerService) { - this.connInvokerService = connInvokerService; - } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardKeyUtil.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardKeyUtil.java new file mode 100755 index 0000000000..7d635ba285 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardKeyUtil.java @@ -0,0 +1,16 @@ +package org.bigbluebutton.conference.service.whiteboard; + +public class WhiteboardKeyUtil { + + public static final String TEXT_TYPE = "text"; + public static final String PENCIL_TYPE = "pencil"; + public static final String RECTANGLE_TYPE = "rectangle"; + public static final String ELLIPSE_TYPE = "ellipse"; + public static final String TRIANGLE_TYPE = "triangle"; + public static final String LINE_TYPE = "line"; + + public static final String TEXT_CREATED_STATUS = "textCreated"; + public static final String DRAW_START_STATUS = "DRAW_START"; + public static final String DRAW_END_STATUS = "DRAW_END"; + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardListener.java new file mode 100644 index 0000000000..47bc7b68c6 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardListener.java @@ -0,0 +1,52 @@ + +package org.bigbluebutton.conference.service.whiteboard; + + +import org.bigbluebutton.conference.service.messaging.MessagingConstants; +import org.bigbluebutton.conference.service.messaging.redis.MessageHandler; + +import org.bigbluebutton.core.api.IBigBlueButtonInGW; +import com.google.gson.JsonParser; +import com.google.gson.JsonObject; + +public class WhiteboardListener implements MessageHandler{ + + private IBigBlueButtonInGW bbbInGW; + + public void setBigBlueButtonInGW(IBigBlueButtonInGW bbbInGW) { + this.bbbInGW = bbbInGW; + } + + @Override + public void handleMessage(String pattern, String channel, String message) { + if (channel.equalsIgnoreCase(MessagingConstants.TO_WHITEBOARD_CHANNEL)) { + System.out.println("AntonChannel=(whiteboard)" + channel); + + JsonParser parser = new JsonParser(); + JsonObject obj = (JsonObject) parser.parse(message); + JsonObject headerObject = (JsonObject) obj.get("header"); + JsonObject payloadObject = (JsonObject) obj.get("payload"); + + String eventName = headerObject.get("name").toString().replace("\"", ""); + + if(eventName.equalsIgnoreCase("get_whiteboard_shapes_request")){ + //more cases to follow + + String roomName = payloadObject.get("meeting_id").toString().replace("\"", ""); + + if(eventName.equalsIgnoreCase("get_whiteboard_shapes_request")){ + String requesterID = payloadObject.get("requester_id").toString().replace("\"", ""); + if(payloadObject.get("whiteboard_id") != null){ + String whiteboardID = payloadObject.get("whiteboard_id").toString().replace("\"", ""); + System.out.println("\n FOUND A whiteboardID:" + whiteboardID + "\n"); + bbbInGW.requestWhiteboardAnnotationHistory(roomName, requesterID, whiteboardID, requesterID); + } + else { + System.out.println("\n DID NOT FIND A whiteboardID \n"); + } + System.out.println("\n\n\n user<" + requesterID + "> requested the shapes.\n\n"); + } + } + } + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java deleted file mode 100755 index d220271b2e..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java +++ /dev/null @@ -1,192 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation; - -public class WhiteboardRoom { - private ArrayList presentations; - private final String id; - private Presentation activePresentation; - private boolean whiteboardEnabled = false; - - private final UIDGenerator uidGen; - private final Map listeners; - - public WhiteboardRoom(String id){ - this.id = id; - this.presentations = new ArrayList(); - listeners = new ConcurrentHashMap(); - uidGen = new UIDGenerator(); - } - - public String getId() { - return id; - } - - /** - * Add a new presentation. Will also set the activePresentation - * @param name - * @param numPages - */ - public void addPresentation(String name, int numPages) { - activePresentation = new Presentation(name, numPages); - presentations.add(activePresentation); - } - - private Presentation getPresentation(String name) { - for (int i = 0; i < presentations.size(); i++){ - Presentation pres = presentations.get(i); - if (pres.getName().equals(name)) return pres; - } - return null; - } - - public Presentation getActivePresentation() { - return activePresentation; - } - - public void setActivePresentation(String name) { - Presentation p = getPresentation(name); - if (p != null) { - this.activePresentation = p; - } - } - - public boolean presentationExists(String name) { - boolean exists = false; - for (int i = 0; i < presentations.size(); i++) { - if (presentations.get(i).getName().equals(name)) exists = true; - } - return exists; - } - - public void addAnnotation(Annotation annotation) { - activePresentation.getActivePage().addAnnotation(annotation); - notifyAddShape(activePresentation, annotation); - } - - public List getAnnotations(String presentationID, Integer pageNumber) { - Presentation p = getPresentation(presentationID); - if (p != null) { - Page pg = p.getPage(pageNumber.intValue()); - if (pg != null) { - return pg.getAnnotations(); - } - } - - return new ArrayList(); - } - - public void modifyText(Annotation annotation) { - activePresentation.getActivePage().modifyText(annotation.getID(), annotation); - notifyModifyText(activePresentation, annotation); - } - - public void clear() { - activePresentation.getActivePage().clear(); - notifyClearPage(activePresentation); - } - - public void undo() { - activePresentation.getActivePage().undo(); - notifyUndoWBGraphic(activePresentation); - } - - public void toggleGrid() { - activePresentation.getActivePage().toggleGrid(); - notifyToggleGrid(activePresentation.getActivePage().isGrid(), activePresentation); - } - - public void setWhiteboardEnabled(boolean whiteboardEnabled) { - this.whiteboardEnabled = whiteboardEnabled; - } - - public boolean isWhiteboardEnabled() { - return whiteboardEnabled; - } - - public void addRoomListener(IWhiteboardRoomListener listener) { - if (! listeners.containsKey(listener.getName())) { - listeners.put(listener.getName(), listener); - } - } - - public void removeRoomListener(IWhiteboardRoomListener listener) { - listeners.remove(listener); - } - - public void notifyAddShape(Presentation presentation, Annotation annotation){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - IWhiteboardRoomListener listener = (IWhiteboardRoomListener) iter.next(); - listener.addAnnotation(annotation, presentation); - } - } - - public void notifyUndoShape(Presentation presentation){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - } -} - - public void notifyAddText(Presentation presentation, Annotation text){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - IWhiteboardRoomListener listener = (IWhiteboardRoomListener) iter.next(); - listener.addText(text, presentation); - } - } - - public void notifyModifyText(Presentation presentation, Annotation text){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - IWhiteboardRoomListener listener = (IWhiteboardRoomListener) iter.next(); - listener.modifyText(text, presentation); - } - } - - public void notifyUndoWBGraphic(Presentation presentation){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - IWhiteboardRoomListener listener = (IWhiteboardRoomListener) iter.next(); - listener.undoWBGraphic(presentation); - } - } - - public void notifyToggleGrid(boolean enabled, Presentation presentation){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - IWhiteboardRoomListener listener = (IWhiteboardRoomListener) iter.next(); - listener.toggleGrid(enabled, presentation); - } - } - - public void notifyClearPage(Presentation presentation){ - for (Iterator iter = listeners.values().iterator(); iter.hasNext();) { - IWhiteboardRoomListener listener = (IWhiteboardRoomListener) iter.next(); - listener.clearPage(presentation); - } - } - - public int getUniqueWBGraphicIdentifier() { - return uidGen.generateUID(); - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java index e7928fd3e7..162eeef31f 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java @@ -20,25 +20,32 @@ package org.bigbluebutton.conference.service.whiteboard; import java.util.ArrayList; import java.util.Map; - import org.bigbluebutton.conference.BigBlueButtonSession; import org.bigbluebutton.conference.Constants; -import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.Red5; import org.slf4j.Logger; public class WhiteboardService { - private static Logger log = Red5LoggerFactory.getLogger(WhiteboardService.class, "bigbluebutton"); - private WhiteboardApplication application; + private final static String TYPE = "type"; + private final static String STATUS = "status"; + private final static String COR_ID = "id"; + private final static String WB_ID = "whiteboardId"; + public void setWhiteboardApplication(WhiteboardApplication a){ log.debug("Setting whiteboard application instance"); this.application = a; } - + + private boolean validMessage(Map shp) { + if (shp.containsKey(COR_ID) && shp.containsKey(TYPE) && + shp.containsKey(STATUS) && shp.containsKey(WB_ID)) return true; + + return false; + } public void sendAnnotation(Map annotation) { // for (Map.Entry entry : annotation.entrySet()) { // String key = entry.getKey(); @@ -52,10 +59,13 @@ public class WhiteboardService { // log.debug(key + "=[" + value + "]"); // } // } + + String meetingID = getMeetingId(); + String requesterID = getBbbSession().getInternalUserID(); - Annotation a = new Annotation(annotation); - - application.sendAnnotation(a); + if (validMessage(annotation)) { + application.sendWhiteboardAnnotation(meetingID, requesterID, annotation); + } } private String pointsToString(ArrayList points){ @@ -66,53 +76,71 @@ public class WhiteboardService { // Trim the trailing comma // log.debug("Data Point = " + datapoints); return datapoints.substring(0, datapoints.length() - 1); - + // application.sendShape(shape, type, color, thickness, fill, fillColor, transparency, id, status); - - } - - public void setActivePage(Map message){ - log.info("WhiteboardApplication - Getting number of shapes for page: " + (Integer) message.get("pageNum")); - application.changePage((Integer) message.get("pageNum")); + } public void requestAnnotationHistory(Map message) { log.info("WhiteboardApplication - requestAnnotationHistory"); - application.sendAnnotationHistory(getBbbSession().getInternalUserID(), - (String) message.get("presentationID"), (Integer) message.get("pageNumber")); + + String meetingID = getMeetingId(); + String requesterID = getBbbSession().getInternalUserID(); + String wbId = (String) message.get(WB_ID); + if (wbId != null) { + application.requestAnnotationHistory(meetingID, requesterID, wbId); + } } - public void clear() { + public void clear(Map message) { log.info("WhiteboardApplication - Clearing board"); - application.clear(); + + String meetingID = getMeetingId(); + String requesterID = getBbbSession().getInternalUserID(); + String wbId = (String) message.get(WB_ID); + if (wbId != null) { + application.clearWhiteboard(meetingID, requesterID, wbId); + } } - public void undo() { + public void undo(Map message) { log.info("WhiteboardApplication - Deleting last graphic"); - application.undo(); + + String meetingID = getMeetingId(); + String requesterID = getBbbSession().getInternalUserID(); + String wbId = (String) message.get(WB_ID); + if (wbId != null) { + application.undoWhiteboard(meetingID, requesterID, wbId); + } } public void toggleGrid() { log.info("WhiteboardApplication - Toggling grid mode"); - application.toggleGrid(); + //application.toggleGrid(); } - - public void setActivePresentation(Map message) { - log.info("WhiteboardApplication - Setting active presentation: " + (String)message.get("presentationID")); - application.setActivePresentation((String)message.get("presentationID"), (Integer) message.get("numberOfSlides")); - } - + public void enableWhiteboard(Map message) { log.info("WhiteboardApplication - Setting whiteboard enabled: " + (Boolean)message.get("enabled")); - application.enableWhiteboard((Boolean)message.get("enabled")); + + String meetingID = getMeetingId(); + String requesterID = getBbbSession().getInternalUserID(); + Boolean enable = (Boolean)message.get("enabled"); + + application.setWhiteboardEnable(meetingID, requesterID, enable); } public void isWhiteboardEnabled() { - application.isWhiteboardEnabled(getBbbSession().getInternalUserID()); + String meetingID = getMeetingId(); + String requesterID = getBbbSession().getInternalUserID(); + application.setIsWhiteboardEnabled(meetingID, requesterID); } private BigBlueButtonSession getBbbSession() { return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION); } + private String getMeetingId(){ + return Red5.getConnectionLocal().getScope().getName(); + } + } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AbstractWhiteboardRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AbstractWhiteboardRecordEvent.java similarity index 81% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AbstractWhiteboardRecordEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AbstractWhiteboardRecordEvent.java index 4a30c7c145..9dafb6efb0 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AbstractWhiteboardRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AbstractWhiteboardRecordEvent.java @@ -16,7 +16,7 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference.service.recorder.whiteboard; +package org.bigbluebutton.conference.service.whiteboard.redis; import org.bigbluebutton.conference.service.recorder.RecordEvent; @@ -29,8 +29,12 @@ public abstract class AbstractWhiteboardRecordEvent extends RecordEvent { public void setPresentation(String name) { eventMap.put("presentation", name); } + + public void setPageNumber(String page) { + eventMap.put("pageNumber", page); + } - public void setPageNumber(int page) { - eventMap.put("pageNumber", Integer.toString(page)); + public void setWhiteboardId(String id) { + eventMap.put("whiteboardId", id); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AddShapeWhiteboardRecordEvent.java similarity index 94% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AddShapeWhiteboardRecordEvent.java index cc2ed9080d..fa667798c6 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AddShapeWhiteboardRecordEvent.java @@ -16,7 +16,7 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference.service.recorder.whiteboard; +package org.bigbluebutton.conference.service.whiteboard.redis; import java.util.ArrayList; import java.util.Map; diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddTextWhiteboardRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AddTextWhiteboardRecordEvent.java similarity index 93% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddTextWhiteboardRecordEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AddTextWhiteboardRecordEvent.java index 9b82ba445b..fc3c0b4fcf 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddTextWhiteboardRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/AddTextWhiteboardRecordEvent.java @@ -16,7 +16,7 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference.service.recorder.whiteboard; +package org.bigbluebutton.conference.service.whiteboard.redis; import java.util.ArrayList; import java.util.Map; diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ClearPageWhiteboardRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ClearPageWhiteboardRecordEvent.java similarity index 91% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ClearPageWhiteboardRecordEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ClearPageWhiteboardRecordEvent.java index f20d3dace1..583d374470 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ClearPageWhiteboardRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ClearPageWhiteboardRecordEvent.java @@ -16,7 +16,7 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference.service.recorder.whiteboard; +package org.bigbluebutton.conference.service.whiteboard.redis; public class ClearPageWhiteboardRecordEvent extends AbstractWhiteboardRecordEvent { diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ModifyTextWhiteboardRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ModifyTextWhiteboardRecordEvent.java similarity index 89% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ModifyTextWhiteboardRecordEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ModifyTextWhiteboardRecordEvent.java index be70d03f0f..ca6f398f3b 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ModifyTextWhiteboardRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ModifyTextWhiteboardRecordEvent.java @@ -16,13 +16,12 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference.service.recorder.whiteboard; +package org.bigbluebutton.conference.service.whiteboard.redis; import java.util.ArrayList; import java.util.Map; -public class ModifyTextWhiteboardRecordEvent extends - AbstractWhiteboardRecordEvent { +public class ModifyTextWhiteboardRecordEvent extends AbstractWhiteboardRecordEvent { public ModifyTextWhiteboardRecordEvent() { super(); diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ToggleGridWhiteboardRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ToggleGridWhiteboardRecordEvent.java similarity index 91% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ToggleGridWhiteboardRecordEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ToggleGridWhiteboardRecordEvent.java index b4af04bd13..1b68d43f7a 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ToggleGridWhiteboardRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/ToggleGridWhiteboardRecordEvent.java @@ -16,7 +16,7 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference.service.recorder.whiteboard; +package org.bigbluebutton.conference.service.whiteboard.redis; public class ToggleGridWhiteboardRecordEvent extends AbstractWhiteboardRecordEvent { diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/UndoShapeWhiteboardRecordEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/UndoShapeWhiteboardRecordEvent.java similarity index 85% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/UndoShapeWhiteboardRecordEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/UndoShapeWhiteboardRecordEvent.java index 26ca2ccc6e..0d9cbd4ef6 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/UndoShapeWhiteboardRecordEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/redis/UndoShapeWhiteboardRecordEvent.java @@ -16,7 +16,7 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.conference.service.recorder.whiteboard; +package org.bigbluebutton.conference.service.whiteboard.redis; public class UndoShapeWhiteboardRecordEvent extends AbstractWhiteboardRecordEvent { @@ -26,4 +26,7 @@ public class UndoShapeWhiteboardRecordEvent extends setEvent("UndoShapeEvent"); } + public void setShapeId(String id) { + eventMap.put("shapeId", id); + } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/AnnotationType.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/AnnotationType.java deleted file mode 100755 index 0e4972e145..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/AnnotationType.java +++ /dev/null @@ -1,26 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard.shapes; - -public class AnnotationType { - public static final String PENCIL = "pencil"; - public static final String RECTANGLE = "rectangle"; - public static final String ELLIPSE = "ellipse"; - public static final String TEXT = "text"; -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/StraightLine.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/StraightLine.java deleted file mode 100755 index 2b51305dc8..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/StraightLine.java +++ /dev/null @@ -1,23 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard.shapes; - -public class StraightLine { - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Text.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Text.java deleted file mode 100755 index f228bf945b..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Text.java +++ /dev/null @@ -1,23 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard.shapes; - -public class Text { - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Triangle.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Triangle.java deleted file mode 100755 index d4c24de72a..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/shapes/Triangle.java +++ /dev/null @@ -1,23 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.conference.service.whiteboard.shapes; - -public class Triangle { - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java new file mode 100644 index 0000000000..b31f33b11f --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java @@ -0,0 +1,114 @@ +package org.bigbluebutton.core.api; + +import java.util.ArrayList; +import java.util.Map; + +public interface IBigBlueButtonInGW { + + void isAliveAudit(String aliveID); + void statusMeetingAudit(String meetingID); + void endMeeting(String meetingID); + void endAllMeetings(); + void createMeeting2(String meetingID, String meetingName, boolean recorded, String voiceBridge, long duration); + void destroyMeeting(String meetingID); + void lockSettings(String meetingID, Boolean locked, Map lockSettigs); + + + // Lock + void initLockSettings(String meetingID, boolean locked, Map settings); + void sendLockSettings(String meetingID, String userId, Map settings); + void getLockSettings(String meetingId, String userId); + void isMeetingLocked(String meetingId, String userId); + void lockAllUsers(String meetingId, boolean lock, ArrayList dontLockTheseUsers); + void lockUser(String meetingId, boolean lock, String internalUserID); + + + // Users + void validateAuthToken(String meetingId, String userId, String token, String correlationId); + void registerUser(String roomName, String userid, String username, String role, String externUserID, String authToken); + void userRaiseHand(String meetingId, String userId); + void lowerHand(String meetingId, String userId, String loweredBy); + void shareWebcam(String meetingId, String userId, String stream); + void unshareWebcam(String meetingId, String userId); + void setUserStatus(String meetingID, String userID, String status, Object value); + void getUsers(String meetingID, String requesterID); + void userLeft(String meetingID, String userID); + void userJoin(String meetingID, String userID); + void getCurrentPresenter(String meetingID, String requesterID); + void assignPresenter(String meetingID, String newPresenterID, String newPresenterName, String assignedBy); + void setRecordingStatus(String meetingId, String userId, Boolean recording); + void getRecordingStatus(String meetingId, String userId); + void userConnectedToGlobalAudio(String voiceConf, String userid, String name); + void userDisconnectedFromGlobalAudio(String voiceConf, String userid, String name); + + // Voice + void muteAllUsers(String meetingID, String requesterID, Boolean mute); + void isMeetingMuted(String meetingID, String requesterID); + void muteUser(String meetingID, String requesterID, String userID, Boolean mute); + void lockUser(String meetingID, String requesterID, String userID, Boolean lock); + void ejectUser(String meetingID, String requesterID, String userID); + void voiceUserJoined(String meetingId, String userId, String webUserId, String conference, + String callerIdNum, String callerIdName, + Boolean muted, Boolean speaking); + void voiceUserLeft(String meetingId, String userId); + void voiceUserLocked(String meetingId, String userId, Boolean locked); + void voiceUserMuted(String meetingId, String userId, Boolean muted); + void voiceUserTalking(String meetingId, String userId, Boolean talking); + void voiceRecording(String meetingId, String recordingFile, + String timestamp, Boolean recording); + + // Presentation + void clear(String meetingID); + void removePresentation(String meetingID, String presentationID); + void getPresentationInfo(String meetingID, String requesterID, String replyTo); + void sendCursorUpdate(String meetingID, double xPercent, double yPercent); + void resizeAndMoveSlide(String meetingID, double xOffset, double yOffset, double widthRatio, double heightRatio); + void gotoSlide(String meetingID, String page); + void sharePresentation(String meetingID, String presentationID, boolean share); + void getSlideInfo(String meetingID, String requesterID, String replyTo); + + void sendConversionUpdate(String messageKey, String meetingId, + String code, String presId, String presName); + + void sendPageCountError(String messageKey, String meetingId, + String code, String presId, int numberOfPages, + int maxNumberPages, String presName); + + void sendSlideGenerated(String messageKey, String meetingId, + String code, String presId, int numberOfPages, + int pagesCompleted, String presName); + + void sendConversionCompleted(String messageKey, String meetingId, + String code, String presId, int numPages, String presName, String presBaseUrl); + + // Polling + void getPolls(String meetingID, String requesterID); + void createPoll(String meetingID, String requesterID, String msg); + void updatePoll(String meetingID, String requesterID, String msg); + void startPoll(String meetingID, String requesterID, String msg); + void stopPoll(String meetingID, String requesterID, String msg); + void removePoll(String meetingID, String requesterID, String msg); + void respondPoll(String meetingID, String requesterID, String msg); + void preCreatedPoll(String meetingID, String msg); + + // Layout + void getCurrentLayout(String meetingID, String requesterID); + void setLayout(String meetingID, String requesterID, String layoutID); + void syncLayout(String meetingID, String requesterID, String layoutID); + void lockLayout(String meetingID, String requesterID, String layoutID); + void unlockLayout(String meetingID, String requesterID); + + // Chat + void getChatHistory(String meetingID, String requesterID, String replyTo); + void sendPublicMessage(String meetingID, String requesterID, Map message); + void sendPrivateMessage(String meetingID, String requesterID, Map message); + + // Whiteboard + void sendWhiteboardAnnotation(String meetingID, String requesterID, java.util.Map annotation); + void requestWhiteboardAnnotationHistory(String meetingID, String requesterID, String whiteboardId, String replyTo); + void clearWhiteboard(String meetingID, String requesterID, String whiteboardId); + void undoWhiteboard(String meetingID, String requesterID, String whiteboardId); + void enableWhiteboard(String meetingID, String requesterID, Boolean enable); + void isWhiteboardEnabled(String meetingID, String requesterID, String replyTo); + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IDispatcher.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IDispatcher.java new file mode 100755 index 0000000000..fa1b97c3c6 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IDispatcher.java @@ -0,0 +1,6 @@ +package org.bigbluebutton.core.api; + +public interface IDispatcher { + + void dispatch(String jsonMessage); +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IOutMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IOutMessage.java new file mode 100755 index 0000000000..94939235e2 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IOutMessage.java @@ -0,0 +1,5 @@ +package org.bigbluebutton.core.api; + +public interface IOutMessage { + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/MessageOutGateway.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/MessageOutGateway.java new file mode 100755 index 0000000000..4f3766c71d --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/MessageOutGateway.java @@ -0,0 +1,23 @@ +package org.bigbluebutton.core.api; + +import java.util.Set; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +public class MessageOutGateway { + private static Logger log = Red5LoggerFactory.getLogger(MessageOutGateway.class, "bigbluebutton"); + + private Set listeners; + + public void send(IOutMessage msg) { +// log.debug("before listeners send. check message:" + msg); + for (OutMessageListener2 l : listeners) { +// log.debug("listener " + l); + l.handleMessage(msg); + } + } + + public void setListeners(Set listeners) { + this.listeners = listeners; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/OutMessageListener2.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/OutMessageListener2.java new file mode 100755 index 0000000000..ec6d099a45 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/OutMessageListener2.java @@ -0,0 +1,6 @@ +package org.bigbluebutton.core.api; + +public interface OutMessageListener2 { + + void handleMessage(IOutMessage msg); +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/RedisLpushDispatcher.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/RedisLpushDispatcher.java new file mode 100755 index 0000000000..68ed47975d --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/RedisLpushDispatcher.java @@ -0,0 +1,66 @@ +package org.bigbluebutton.core.api; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; + +public class RedisLpushDispatcher implements IDispatcher { + private static final int NTHREADS = 1; + private static final Executor exec = Executors.newFixedThreadPool(NTHREADS); + + private static final String BBBMESSAGES = "bbb:meeting:messages"; + + private BlockingQueue messages; + private volatile boolean dispatchEvents = false; + + private JedisPool redisPool; + + public RedisLpushDispatcher() { + messages = new LinkedBlockingQueue(); + } + + @Override + public void dispatch(String jsonMessage) { + messages.offer(jsonMessage); + } + + private void saveMessage(String msg) { + Jedis jedis = redisPool.getResource(); + try { + jedis.lpush(BBBMESSAGES, msg); + } finally { + redisPool.returnResource(jedis); + } + } + + public void start() { + dispatchEvents = true; + Runnable sender = new Runnable() { + public void run() { + while (dispatchEvents) { + String message; + try { + message = messages.take(); + saveMessage(message); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + } + }; + exec.execute(sender); + } + + public void stop() { + dispatchEvents = false; + } + + public void setRedisPool(JedisPool redisPool) { + this.redisPool = redisPool; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/service/recording/RecordMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/service/recording/RecordMessage.java new file mode 100755 index 0000000000..e8bf93bee4 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/service/recording/RecordMessage.java @@ -0,0 +1,5 @@ +package org.bigbluebutton.service.recording; + +public class RecordMessage { + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/service/recording/RedisListRecorder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/service/recording/RedisListRecorder.java new file mode 100755 index 0000000000..33d9b10b62 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/service/recording/RedisListRecorder.java @@ -0,0 +1,73 @@ +package org.bigbluebutton.service.recording; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; + +import org.bigbluebutton.conference.service.recorder.RecordEvent; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +import com.google.gson.Gson; + +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; + +public class RedisListRecorder { + private static Logger log = Red5LoggerFactory.getLogger(RedisListRecorder.class, "bigbluebutton"); + private static final int NTHREADS = 1; + private static final Executor exec = Executors.newFixedThreadPool(NTHREADS); + + private BlockingQueue messages = new LinkedBlockingQueue(); + private volatile boolean recordEvents = false; + + JedisPool redisPool; + + public void start() { + recordEvents = true; + Runnable sender = new Runnable() { + public void run() { + while (recordEvents) { + RecordEvent message; + try { + message = messages.take(); + recordEvent(message); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + } + }; + exec.execute(sender); + } + + public void stop() { + recordEvents = false; + } + + private void recordEvent(RecordEvent message) { + Jedis jedis = redisPool.getResource(); + try { + String key = "bbb:recording:" + message.getMeetingID(); + Gson gson= new Gson(); + jedis.rpush(key, gson.toJson(message.toMap())); + } finally { + redisPool.returnResource(jedis); + } + } + + public void record(RecordEvent message) { + messages.offer(message); + } + + public JedisPool getRedisPool() { + return redisPool; + } + + public void setRedisPool(JedisPool redisPool) { + this.redisPool = redisPool; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/BigBlueButton.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/BigBlueButton.java deleted file mode 100755 index a187ddc294..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/BigBlueButton.java +++ /dev/null @@ -1,68 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference; - -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.LinkedBlockingQueue; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class BigBlueButton { - private static Logger log = Red5LoggerFactory.getLogger(BigBlueButton.class, "bigbluebutton"); - - private BlockingQueue messages = new LinkedBlockingQueue(); - private static final ExecutorService executor = Executors.newSingleThreadExecutor(); - - private volatile boolean processMessages = false; - - public void start() { - processMessages = true; - - executor.execute(new Runnable() { - public void run() { - Message msg; - - while (processMessages) { - try { - msg = messages.take(); - processMessage(msg); - } catch (InterruptedException e) { - log.error("InterruptedException while waiting for messages"); - stop(); - } - } - } - }); - } - - private void processMessage(Message message) { - - } - - public void send(Message message) { - messages.offer(message); - } - - public void stop() { - processMessages = false; - executor.shutdown(); - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/Message.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/Message.java deleted file mode 100755 index b26d858911..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/Message.java +++ /dev/null @@ -1,23 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference; - -public class Message { - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/User.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/User.java deleted file mode 100755 index f39d440081..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/User.java +++ /dev/null @@ -1,23 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference; - -public class User { - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java deleted file mode 100755 index c78479e9bd..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java +++ /dev/null @@ -1,120 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.red5.voice; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import org.bigbluebutton.webconference.voice.events.ConferenceEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantJoinedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantLeftEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantMutedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantTalkingEvent; -import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.so.ISharedObject; -import org.slf4j.Logger; - -public class ClientManager implements ClientNotifier { - private static Logger log = Red5LoggerFactory.getLogger(ClientManager.class, "bigbluebutton"); - - private final ConcurrentMap voiceRooms; - private final ConcurrentMap webRooms; - - public ClientManager() { - voiceRooms = new ConcurrentHashMap(); - webRooms = new ConcurrentHashMap(); - } - - public void addSharedObject(String webRoom, String voiceRoom, ISharedObject so) { - log.debug("Adding SO for [" + webRoom + "," + voiceRoom + "]"); - RoomInfo soi = new RoomInfo(webRoom, voiceRoom, so); - voiceRooms.putIfAbsent(voiceRoom, soi); - webRooms.putIfAbsent(webRoom, soi); - } - - public void removeSharedObject(String webRoom) { - RoomInfo soi = webRooms.remove(webRoom); - if (soi != null) voiceRooms.remove(soi.getVoiceRoom()); - } - - private void joined(String room, Integer participant, String name, Boolean muted, Boolean talking){ - log.debug("Participant " + name + "joining room " + room); - RoomInfo soi = voiceRooms.get(room); - if (soi != null) { - List list = new ArrayList(); - list.add(participant); - list.add(name); - list.add(name); - list.add(muted); - list.add(talking); - - log.debug("Sending join to client " + name); - soi.getSharedObject().sendMessage("userJoin", list); - } - } - - private void left(String room, Integer participant){ - log.debug("Participant [" + participant + "," + room + "] leaving"); - RoomInfo soi = voiceRooms.get(room); - if (soi != null) { - List list = new ArrayList(); - list.add(participant); - soi.getSharedObject().sendMessage("userLeft", list); - } - } - - private void muted(String room, Integer participant, Boolean muted){ - log.debug("Participant " + participant + " is muted = " + muted); - RoomInfo soi = voiceRooms.get(room); - if (soi != null) { - List list = new ArrayList(); - list.add(participant); - list.add(muted); - soi.getSharedObject().sendMessage("userMute", list); - } - } - - private void talking(String room, Integer participant, Boolean talking){ - log.debug("Participant " + participant + " is talking = " + talking); - RoomInfo soi = voiceRooms.get(room); - if (soi != null) { - List list = new ArrayList(); - list.add(participant); - list.add(talking); - soi.getSharedObject().sendMessage("userTalk", list); - } - } - - public void handleConferenceEvent(ConferenceEvent event) { - if (event instanceof ParticipantJoinedEvent) { - ParticipantJoinedEvent pje = (ParticipantJoinedEvent) event; - joined(pje.getRoom(), pje.getParticipantId(), pje.getCallerIdName(), pje.getMuted(), pje.getSpeaking()); - } else if (event instanceof ParticipantLeftEvent) { - left(event.getRoom(), event.getParticipantId()); - } else if (event instanceof ParticipantMutedEvent) { - ParticipantMutedEvent pme = (ParticipantMutedEvent) event; - muted(pme.getRoom(), pme.getParticipantId(), pme.isMuted()); - } else if (event instanceof ParticipantTalkingEvent) { - ParticipantTalkingEvent pte = (ParticipantTalkingEvent) event; - talking(pte.getRoom(), pte.getParticipantId(), pte.isTalking()); - } - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java deleted file mode 100755 index 129d11cc56..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java +++ /dev/null @@ -1,149 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.voice; - -import java.util.ArrayList; -import java.util.List; - -import org.bigbluebutton.webconference.red5.voice.ClientManager; -import org.bigbluebutton.webconference.voice.events.ConferenceEvent; -import org.bigbluebutton.webconference.voice.events.ConferenceEventListener; -import org.bigbluebutton.webconference.voice.internal.RoomManager; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class ConferenceService implements ConferenceEventListener { - private static Logger log = Red5LoggerFactory.getLogger(ConferenceService.class, "bigbluebutton"); - - private RoomManager roomMgr; - private ConferenceServiceProvider confProvider; - private ClientManager clientManager; - - public boolean startup() { - return confProvider.startup(); - } - - public void shutdown() { - confProvider.shutdown(); - roomMgr = null; - } - - public void hangupUser(String userID, String voiceBridge) { - int voiceUserID = roomMgr.getVoiceUserIDFromRoom(voiceBridge, userID); - if (voiceUserID > -1) { - log.info("Hanging up user [" + voiceUserID + "] from [" + voiceBridge + "]"); - confProvider.eject(voiceBridge, voiceUserID); - } else { - log.info("Cannot hangup user. Could not find user=[" + userID + "] in [" + voiceBridge + "]"); - } - } - - public void createConference(String room, String meetingid, boolean record, boolean muted) { - if (roomMgr.hasRoom(room)) return; - roomMgr.createRoom(room, record, meetingid, muted); - confProvider.populateRoom(room); - - } - - public void destroyConference(String room) { - confProvider.ejectAll(room); - roomMgr.destroyRoom(room); - } - - public void recordSession(String room, String meetingid){ - confProvider.record(room, meetingid); - } - - public void broadcastSession(String room, String meetingid) { - confProvider.broadcast(room, meetingid); - } - - public void mute(Integer participant, String room, Boolean mute) { - if (roomMgr.hasParticipant(room, participant)) - muteParticipant(participant, room, mute); - } - - public void muteAllBut(String room, Boolean mute, List dontMuteThese) { - if (roomMgr.hasRoom(room)) { - roomMgr.mute(room, mute); - ArrayList p = getParticipants(room); - - for (Participant o : p) { - if(dontMuteThese == null || !dontMuteThese.contains(o.getId())) - muteParticipant(o.getId(), room, mute); - } - } - } - - public void mute(String room, Boolean mute) { - this.muteAllBut(room, mute, null); - } - - public boolean isRoomMuted(String room){ - if (roomMgr.hasRoom(room)) { - return roomMgr.isRoomMuted(room); - } - return false; - } - - private void muteParticipant(Integer participant, String room, Boolean mute) { - confProvider.mute(room, participant, mute); - } - - - public void eject(Integer participant, String room) { - if (roomMgr.hasParticipant(room, participant)) - ejectParticipant(room, participant); - } - - public void eject(String room) { - if (roomMgr.hasRoom(room)) { - ArrayList p = getParticipants(room); - for (Participant o : p) { - ejectParticipant(room, o.getId()); - } - } - } - - private void ejectParticipant(String room, Integer participant) { - confProvider.eject(room, participant); - } - - public ArrayList getParticipants(String room) { - return roomMgr.getParticipants(room); - } - - public void handleConferenceEvent(ConferenceEvent event) { - roomMgr.processConferenceEvent(event); - clientManager.handleConferenceEvent(event); - } - - public void setClientManager(ClientManager c) { - clientManager = c; - } - - public void setConferenceServiceProvider(ConferenceServiceProvider c) { - confProvider = c; - } - - public void setRoomManager(RoomManager roomManager) { - this.roomMgr = roomManager; - roomManager.setConferenceService(this); - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceServiceProvider.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceServiceProvider.java index 4f33353d94..ffebb366ee 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceServiceProvider.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceServiceProvider.java @@ -19,11 +19,9 @@ package org.bigbluebutton.webconference.voice; public interface ConferenceServiceProvider { - public boolean startup(); - public void shutdown(); public void populateRoom(String room); - public void mute(String room, Integer participant, Boolean mute); - public void eject(String room, Integer participant); + public void mute(String room, String participant, Boolean mute); + public void eject(String room, String participant); public void ejectAll(String room); public void record(String room, String meetingid); public void broadcast(String room, String meetingid); diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/FreeswitchConferenceEventListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/FreeswitchConferenceEventListener.java new file mode 100755 index 0000000000..a92943b0cd --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/FreeswitchConferenceEventListener.java @@ -0,0 +1,109 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.webconference.voice; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; +import org.bigbluebutton.webconference.voice.events.VoiceConferenceEvent; +import org.bigbluebutton.webconference.voice.events.ConferenceEventListener; +import org.bigbluebutton.webconference.voice.events.VoiceUserJoinedEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserLeftEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserMutedEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserTalkingEvent; +import org.bigbluebutton.webconference.voice.events.VoiceStartRecordingEvent; + +public class FreeswitchConferenceEventListener implements ConferenceEventListener { + private static final int SENDERTHREADS = 1; + private static final Executor msgSenderExec = Executors.newFixedThreadPool(SENDERTHREADS); + + private BlockingQueue messages = new LinkedBlockingQueue(); + + private volatile boolean sendMessages = false; + private IVoiceConferenceService vcs; + + public void setVoiceConferenceService(IVoiceConferenceService vcs) { + this.vcs = vcs; + } + + private void queueMessage(VoiceConferenceEvent event) { + try { + messages.offer(event, 5, TimeUnit.SECONDS); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + private void sendMessageToBigBlueButton(VoiceConferenceEvent event) { + if (event instanceof VoiceUserJoinedEvent) { + System.out.println("************** FreeswitchConferenceEventListener received voiceUserJoined "); + VoiceUserJoinedEvent evt = (VoiceUserJoinedEvent) event; + vcs.voiceUserJoined(evt.getVoiceUserId(), evt.getUserId(), evt.getRoom(), + evt.getCallerIdNum(), evt.getCallerIdName(), + evt.getMuted(), evt.getSpeaking()); + } else if (event instanceof VoiceUserLeftEvent) { + System.out.println("************** FreeswitchConferenceEventListener received VoiceUserLeftEvent "); + VoiceUserLeftEvent evt = (VoiceUserLeftEvent) event; + vcs.voiceUserLeft(evt.getUserId(), evt.getRoom()); + } else if (event instanceof VoiceUserMutedEvent) { + System.out.println("************** FreeswitchConferenceEventListener VoiceUserMutedEvent "); + VoiceUserMutedEvent evt = (VoiceUserMutedEvent) event; + vcs.voiceUserMuted(evt.getUserId(), evt.getRoom(), evt.isMuted()); + } else if (event instanceof VoiceUserTalkingEvent) { + System.out.println("************** FreeswitchConferenceEventListener VoiceUserTalkingEvent "); + VoiceUserTalkingEvent evt = (VoiceUserTalkingEvent) event; + vcs.voiceUserTalking(evt.getUserId(), evt.getRoom(), evt.isTalking()); + } else if (event instanceof VoiceStartRecordingEvent) { + VoiceStartRecordingEvent evt = (VoiceStartRecordingEvent) event; + System.out.println("************** FreeswitchConferenceEventListener VoiceStartRecordingEvent recording=[" + evt.startRecord() + "]"); + vcs.voiceStartedRecording(evt.getRoom(), evt.getRecordingFilename(), evt.getTimestamp(), evt.startRecord()); + } + } + + public void start() { + sendMessages = true; + Runnable sender = new Runnable() { + public void run() { + while (sendMessages) { + VoiceConferenceEvent message; + try { + message = messages.take(); + sendMessageToBigBlueButton(message); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } + }; + msgSenderExec.execute(sender); + } + + public void stop() { + sendMessages = false; + } + + public void handleConferenceEvent(VoiceConferenceEvent event) { + queueMessage(event); + } + +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/IVoiceConferenceService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/IVoiceConferenceService.java new file mode 100755 index 0000000000..f26f38b458 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/IVoiceConferenceService.java @@ -0,0 +1,13 @@ +package org.bigbluebutton.webconference.voice; + +public interface IVoiceConferenceService { + void voiceUserJoined(String userId, String webUserId, String conference, + String callerIdNum, String callerIdName, + Boolean muted, Boolean speaking); + void voiceUserLeft(String meetingId, String userId); + void voiceUserLocked(String meetingId, String userId, Boolean locked); + void voiceUserMuted(String meetingId, String userId, Boolean muted); + void voiceUserTalking(String meetingId, String userId, Boolean talking); + void voiceStartedRecording(String conference, String recordingFile, + String timestamp, Boolean recording); +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Participant.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Participant.java deleted file mode 100755 index bbccff0d34..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Participant.java +++ /dev/null @@ -1,27 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.voice; - -public interface Participant { - public boolean isMuted(); - public boolean isTalking(); - public int getId(); - public String getName(); - public String getUserID(); -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Room.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Room.java deleted file mode 100755 index 053d8edfff..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Room.java +++ /dev/null @@ -1,36 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.voice; - -import java.util.ArrayList; -import org.bigbluebutton.webconference.voice.Participant; - -public interface Room { - public String getName(); - public int numParticipants(); - public Participant getParticipant(Integer id); - public boolean hasParticipant(Integer id); - public ArrayList getParticipants(); - public boolean isMuted(); - public void record(boolean rec); - public boolean record(); - public void recording(boolean rec); - public boolean isRecording(); - public int getUserWithID(String userID); -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/VoiceEventRecorder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/VoiceEventRecorder.java index aa096a57b4..68f1d141bd 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/VoiceEventRecorder.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/VoiceEventRecorder.java @@ -19,13 +19,13 @@ package org.bigbluebutton.webconference.voice; import org.bigbluebutton.conference.service.recorder.RecorderApplication; -import org.bigbluebutton.webconference.voice.events.ConferenceEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantJoinedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantLeftEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantLockedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantMutedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantTalkingEvent; -import org.bigbluebutton.webconference.voice.events.StartRecordingEvent; +import org.bigbluebutton.webconference.voice.events.VoiceConferenceEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserJoinedEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserLeftEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserLockedEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserMutedEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserTalkingEvent; +import org.bigbluebutton.webconference.voice.events.VoiceStartRecordingEvent; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -34,26 +34,26 @@ public class VoiceEventRecorder { private RecorderApplication recorder; - public void recordConferenceEvent(ConferenceEvent event, String room) { - if (event instanceof ParticipantJoinedEvent) { + public void recordConferenceEvent(VoiceConferenceEvent event, String room) { + if (event instanceof VoiceUserJoinedEvent) { recordParticipantJoinedEvent(event, room); - } else if (event instanceof ParticipantLeftEvent) { + } else if (event instanceof VoiceUserLeftEvent) { recordParticipantLeftEvent(event, room); - } else if (event instanceof ParticipantMutedEvent) { + } else if (event instanceof VoiceUserMutedEvent) { recordParticipantMutedEvent(event, room); - } else if (event instanceof ParticipantTalkingEvent) { + } else if (event instanceof VoiceUserTalkingEvent) { recordParticipantTalkingEvent(event, room); - } else if (event instanceof ParticipantLockedEvent) { + } else if (event instanceof VoiceUserLockedEvent) { recordParticipantLockedEvent(event, room); - } else if (event instanceof StartRecordingEvent) { + } else if (event instanceof VoiceStartRecordingEvent) { recordStartRecordingEvent(event, room); } else { log.debug("Processing UnknownEvent " + event.getClass().getName() + " for room: " + event.getRoom() ); } } - private void recordStartRecordingEvent(ConferenceEvent event, String room) { - StartRecordingEvent sre = (StartRecordingEvent) event; + private void recordStartRecordingEvent(VoiceConferenceEvent event, String room) { + VoiceStartRecordingEvent sre = (VoiceStartRecordingEvent) event; StartRecordingVoiceRecordEvent evt = new StartRecordingVoiceRecordEvent(sre.startRecord()); evt.setMeetingId(room); evt.setTimestamp(System.currentTimeMillis()); @@ -64,14 +64,14 @@ public class VoiceEventRecorder { recorder.record(room, evt); } - private void recordParticipantJoinedEvent(ConferenceEvent event, String room) { - ParticipantJoinedEvent pje = (ParticipantJoinedEvent) event; + private void recordParticipantJoinedEvent(VoiceConferenceEvent event, String room) { + VoiceUserJoinedEvent pje = (VoiceUserJoinedEvent) event; ParticipantJoinedVoiceRecordEvent evt = new ParticipantJoinedVoiceRecordEvent(); evt.setMeetingId(room); evt.setTimestamp(System.currentTimeMillis()); evt.setBridge(event.getRoom()); - evt.setParticipant(pje.getParticipantId().toString()); + evt.setParticipant(pje.getUserId().toString()); evt.setCallerName(pje.getCallerIdName()); evt.setCallerNumber(pje.getCallerIdName()); evt.setMuted(pje.getMuted()); @@ -80,50 +80,53 @@ public class VoiceEventRecorder { recorder.record(room, evt); } - private void recordParticipantLeftEvent(ConferenceEvent event, String room) { + private void recordParticipantLeftEvent(VoiceConferenceEvent event, String room) { + ParticipantLeftVoiceRecordEvent evt = new ParticipantLeftVoiceRecordEvent(); evt.setMeetingId(room); evt.setTimestamp(System.currentTimeMillis()); evt.setBridge(event.getRoom()); - evt.setParticipant(event.getParticipantId().toString()); + + + evt.setParticipant(((VoiceUserLeftEvent)event).getUserId().toString()); recorder.record(room, evt); } - private void recordParticipantMutedEvent(ConferenceEvent event, String room) { - ParticipantMutedEvent pme = (ParticipantMutedEvent) event; + private void recordParticipantMutedEvent(VoiceConferenceEvent event, String room) { + VoiceUserMutedEvent pme = (VoiceUserMutedEvent) event; ParticipantMutedVoiceRecordEvent evt = new ParticipantMutedVoiceRecordEvent(); evt.setMeetingId(room); evt.setTimestamp(System.currentTimeMillis()); evt.setBridge(event.getRoom()); - evt.setParticipant(event.getParticipantId().toString()); + evt.setParticipant(((VoiceUserMutedEvent)event).getUserId().toString()); evt.setMuted(pme.isMuted()); recorder.record(room, evt); } - private void recordParticipantTalkingEvent(ConferenceEvent event, String room) { - ParticipantTalkingEvent pte = (ParticipantTalkingEvent) event; + private void recordParticipantTalkingEvent(VoiceConferenceEvent event, String room) { + VoiceUserTalkingEvent pte = (VoiceUserTalkingEvent) event; ParticipantTalkingVoiceRecordEvent evt = new ParticipantTalkingVoiceRecordEvent(); evt.setMeetingId(room); evt.setTimestamp(System.currentTimeMillis()); evt.setBridge(event.getRoom()); - evt.setParticipant(event.getParticipantId().toString()); + evt.setParticipant(((VoiceUserTalkingEvent)event).getUserId().toString()); evt.setTalking(pte.isTalking()); recorder.record(room, evt); } - private void recordParticipantLockedEvent(ConferenceEvent event, String room) { - ParticipantLockedEvent ple = (ParticipantLockedEvent) event; + private void recordParticipantLockedEvent(VoiceConferenceEvent event, String room) { + VoiceUserLockedEvent ple = (VoiceUserLockedEvent) event; ParticipantLockedVoiceRecordEvent evt = new ParticipantLockedVoiceRecordEvent(); evt.setMeetingId(room); evt.setTimestamp(System.currentTimeMillis()); evt.setBridge(event.getRoom()); - evt.setParticipant(event.getParticipantId().toString()); + evt.setParticipant(((VoiceUserLockedEvent)event).getUserId().toString()); evt.setLocked(ple.isLocked()); recorder.record(room, evt); diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ConferenceEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ConferenceEvent.java deleted file mode 100755 index 305590dce8..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ConferenceEvent.java +++ /dev/null @@ -1,38 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.voice.events; - -public abstract class ConferenceEvent { - private final Integer participantId; - private final String room; - - public ConferenceEvent(Integer participantId, String room) { - this.participantId = participantId; - this.room = room; - } - - public Integer getParticipantId() { - return participantId; - } - - public String getRoom() { - return room; - } - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ConferenceEventListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ConferenceEventListener.java index 3a69350b70..15800e757d 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ConferenceEventListener.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ConferenceEventListener.java @@ -18,7 +18,8 @@ */ package org.bigbluebutton.webconference.voice.events; -public interface ConferenceEventListener { - public void handleConferenceEvent(ConferenceEvent event); +public interface ConferenceEventListener { + public void handleConferenceEvent(VoiceConferenceEvent event); + } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/UnknownConferenceEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/UnknownConferenceEvent.java index 1bf7b96532..735180a415 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/UnknownConferenceEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/UnknownConferenceEvent.java @@ -18,10 +18,10 @@ */ package org.bigbluebutton.webconference.voice.events; -public class UnknownConferenceEvent extends ConferenceEvent { +public class UnknownConferenceEvent extends VoiceConferenceEvent { - public UnknownConferenceEvent(Integer participantId, String room) { - super(participantId, room); + public UnknownConferenceEvent(String participantId, String room) { + super(room); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantLeftEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceConferenceEvent.java similarity index 80% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantLeftEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceConferenceEvent.java index 0f98276b0e..d1ee12a966 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantLeftEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceConferenceEvent.java @@ -18,9 +18,15 @@ */ package org.bigbluebutton.webconference.voice.events; -public class ParticipantLeftEvent extends ConferenceEvent { - - public ParticipantLeftEvent(Integer participantId, String room) { - super(participantId, room); +public abstract class VoiceConferenceEvent { + private final String room; + + public VoiceConferenceEvent(String room) { + this.room = room; } + + public String getRoom() { + return room; + } + } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/StartRecordingEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceStartRecordingEvent.java similarity index 85% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/StartRecordingEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceStartRecordingEvent.java index 8458e2272b..0e2b8bcc90 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/StartRecordingEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceStartRecordingEvent.java @@ -18,14 +18,14 @@ */ package org.bigbluebutton.webconference.voice.events; -public class StartRecordingEvent extends ConferenceEvent { +public class VoiceStartRecordingEvent extends VoiceConferenceEvent { private String timestamp; private String filename; private boolean record; - public StartRecordingEvent(Integer participantId, String room, boolean record) { - super(participantId, room); + public VoiceStartRecordingEvent(String room, boolean record) { + super(room); this.record = record; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantJoinedEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java similarity index 72% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantJoinedEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java index 9c59d1c527..1a721c5015 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantJoinedEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java @@ -18,23 +18,36 @@ */ package org.bigbluebutton.webconference.voice.events; -public class ParticipantJoinedEvent extends ConferenceEvent { +public class VoiceUserJoinedEvent extends VoiceConferenceEvent { + private final String voiceUserId; private final String callerIdNum; private final String callerIdName; private final Boolean muted; private final Boolean speaking; + private final Boolean locked = false; + private final String userId; - public ParticipantJoinedEvent(Integer participantId, String room, + public VoiceUserJoinedEvent(String userId, String voiceUserId, String room, String callerIdNum, String callerIdName, Boolean muted, Boolean speaking) { - super(participantId, room); + super(room); + this.userId = userId; + this.voiceUserId = voiceUserId; this.callerIdName = callerIdName; this.callerIdNum = callerIdNum; this.muted = muted; this.speaking = speaking; } + public String getUserId() { + return userId; + } + + public String getVoiceUserId() { + return voiceUserId; + } + public String getCallerIdNum() { return callerIdNum; } @@ -50,4 +63,8 @@ public class ParticipantJoinedEvent extends ConferenceEvent { public Boolean getSpeaking() { return speaking; } + + public Boolean isLocked() { + return locked; + } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserLeftEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserLeftEvent.java new file mode 100755 index 0000000000..f5371e5620 --- /dev/null +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserLeftEvent.java @@ -0,0 +1,33 @@ +/** +* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +* +* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +* +* This program is free software; you can redistribute it and/or modify it under the +* terms of the GNU Lesser General Public License as published by the Free Software +* Foundation; either version 3.0 of the License, or (at your option) any later +* version. +* +* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along +* with BigBlueButton; if not, see . +* +*/ +package org.bigbluebutton.webconference.voice.events; + +public class VoiceUserLeftEvent extends VoiceConferenceEvent { + + private final String userId; + + public VoiceUserLeftEvent(String userId, String room) { + super(room); + this.userId = userId; + } + + public String getUserId() { + return userId; + } +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantLockedEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserLockedEvent.java similarity index 76% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantLockedEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserLockedEvent.java index 912beb2f46..414be991c6 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantLockedEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserLockedEvent.java @@ -18,15 +18,21 @@ */ package org.bigbluebutton.webconference.voice.events; -public class ParticipantLockedEvent extends ConferenceEvent { +public class VoiceUserLockedEvent extends VoiceConferenceEvent { private final boolean locked; + private final String userId; - public ParticipantLockedEvent(Integer participantId, String room, boolean locked) { - super(participantId, room); + public VoiceUserLockedEvent(String userId, String room, boolean locked) { + super(room); this.locked = locked; + this.userId = userId; } + public String getUserId() { + return userId; + } + public boolean isLocked() { return locked; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantMutedEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserMutedEvent.java similarity index 76% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantMutedEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserMutedEvent.java index ba5e59c80b..203e93743c 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantMutedEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserMutedEvent.java @@ -18,15 +18,21 @@ */ package org.bigbluebutton.webconference.voice.events; -public class ParticipantMutedEvent extends ConferenceEvent { +public class VoiceUserMutedEvent extends VoiceConferenceEvent { private final boolean muted; + private final String userId; - public ParticipantMutedEvent(Integer participantId, String room, boolean muted) { - super(participantId, room); + public VoiceUserMutedEvent(String userId, String room, boolean muted) { + super(room); this.muted = muted; + this.userId = userId; } + public String getUserId() { + return userId; + } + public boolean isMuted() { return muted; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantTalkingEvent.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserTalkingEvent.java similarity index 76% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantTalkingEvent.java rename to bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserTalkingEvent.java index e97f21ad66..3ecd6759e4 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/ParticipantTalkingEvent.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserTalkingEvent.java @@ -18,15 +18,21 @@ */ package org.bigbluebutton.webconference.voice.events; -public class ParticipantTalkingEvent extends ConferenceEvent { +public class VoiceUserTalkingEvent extends VoiceConferenceEvent { private final boolean talking; + private final String userId; - public ParticipantTalkingEvent(Integer participantId, String room, boolean talking) { - super(participantId, room); + public VoiceUserTalkingEvent(String userId, String room, boolean talking) { + super(room); this.talking = talking; + this.userId = userId; } + public String getUserId() { + return userId; + } + public boolean isTalking() { return talking; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/ConnectionManager.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/ConnectionManager.java index e374882a18..63f859c3e5 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/ConnectionManager.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/ConnectionManager.java @@ -112,8 +112,10 @@ public class ConnectionManager { } public void mute(MuteParticipantCommand mpc) { + System.out.println("Got mute request from FSApplication."); Client c = manager.getESLClient(); if (c.canSend()) { + System.out.println("Issuing command to FS ESL."); c.sendAsyncApiCommand( mpc.getCommand(), mpc.getCommandArgs()); } } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/ESLEventListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/ESLEventListener.java index f237f178a7..51904c152e 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/ESLEventListener.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/ESLEventListener.java @@ -2,12 +2,15 @@ package org.bigbluebutton.webconference.voice.freeswitch; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.bigbluebutton.webconference.voice.events.ConferenceEventListener; -import org.bigbluebutton.webconference.voice.events.ParticipantJoinedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantLeftEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantMutedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantTalkingEvent; -import org.bigbluebutton.webconference.voice.events.StartRecordingEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserJoinedEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserLeftEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserMutedEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserTalkingEvent; +import org.bigbluebutton.webconference.voice.events.VoiceStartRecordingEvent; import org.freeswitch.esl.client.IEslEventListener; import org.freeswitch.esl.client.transport.event.EslEvent; import org.jboss.netty.channel.ExceptionEvent; @@ -40,57 +43,83 @@ public class ESLEventListener implements IEslEventListener { // notifyObservers(e); } + private static final Pattern GLOBAL_AUDION_PATTERN = Pattern.compile("(GLOBAL_AUDIO)_(.*)$"); + private static final Pattern CALLERNAME_PATTERN = Pattern.compile("(.*)-bbbID-(.*)$"); + @Override public void conferenceEventJoin(String uniqueId, String confName, int confSize, EslEvent event) { + Integer memberId = this.getMemberIdFromEvent(event); Map headers = event.getEventHeaders(); String callerId = this.getCallerIdFromEvent(event); String callerIdName = this.getCallerIdNameFromEvent(event); boolean muted = headers.get("Speak").equals("true") ? false : true; //Was inverted which was causing a State issue - boolean speeking = headers.get("Talking").equals("true") ? true : false; + boolean speaking = headers.get("Talking").equals("true") ? true : false; - ParticipantJoinedEvent pj = new ParticipantJoinedEvent(memberId, confName, callerId, callerIdName, muted, speeking); + String voiceUserId = callerIdName; + + System.out.println("Received Conference Join Event from FreeSWITCH user[" + callerIdName + "]"); + + Matcher gapMatcher = GLOBAL_AUDION_PATTERN.matcher(callerIdName); + if (gapMatcher.matches()) { + log.debug("Ignoring GLOBAL AUDIO USER [{}]", callerIdName); + return; + } + + Matcher matcher = CALLERNAME_PATTERN.matcher(callerIdName); + if (matcher.matches()) { + voiceUserId = matcher.group(1).trim(); + callerIdName = matcher.group(2).trim(); + } + + VoiceUserJoinedEvent pj = new VoiceUserJoinedEvent(voiceUserId, memberId.toString(), confName, callerId, callerIdName, muted, speaking); conferenceEventListener.handleConferenceEvent(pj); } @Override - public void conferenceEventLeave(String uniqueId, String confName, int confSize, EslEvent event) { + public void conferenceEventLeave(String uniqueId, String confName, int confSize, EslEvent event) { Integer memberId = this.getMemberIdFromEvent(event); - ParticipantLeftEvent pl = new ParticipantLeftEvent(memberId, confName); + System.out.println("Received Conference Leave Event from FreeSWITCH user[" + memberId.toString() + "]"); + VoiceUserLeftEvent pl = new VoiceUserLeftEvent(memberId.toString(), confName); conferenceEventListener.handleConferenceEvent(pl); } @Override public void conferenceEventMute(String uniqueId, String confName, int confSize, EslEvent event) { Integer memberId = this.getMemberIdFromEvent(event); - ParticipantMutedEvent pm = new ParticipantMutedEvent(memberId, confName, true); + System.out.println("Received Conference Muted Event from FreeSWITCH user[" + memberId.toString() + "]"); + VoiceUserMutedEvent pm = new VoiceUserMutedEvent(memberId.toString(), confName, true); conferenceEventListener.handleConferenceEvent(pm); } @Override public void conferenceEventUnMute(String uniqueId, String confName, int confSize, EslEvent event) { Integer memberId = this.getMemberIdFromEvent(event); - ParticipantMutedEvent pm = new ParticipantMutedEvent(memberId, confName, false); + System.out.println("Received ConferenceUnmuted Event from FreeSWITCH user[" + memberId.toString() + "]"); + VoiceUserMutedEvent pm = new VoiceUserMutedEvent(memberId.toString(), confName, false); conferenceEventListener.handleConferenceEvent(pm); } @Override public void conferenceEventAction(String uniqueId, String confName, int confSize, String action, EslEvent event) { Integer memberId = this.getMemberIdFromEvent(event); - ParticipantTalkingEvent pt; - + VoiceUserTalkingEvent pt; + + System.out.println("Receive conference Action [" + action + "]"); + if (action == null) { return; } if (action.equals(START_TALKING_EVENT)) { - pt = new ParticipantTalkingEvent(memberId, confName, true); + pt = new VoiceUserTalkingEvent(memberId.toString(), confName, true); conferenceEventListener.handleConferenceEvent(pt); } else if (action.equals(STOP_TALKING_EVENT)) { - pt = new ParticipantTalkingEvent(memberId, confName, false); + pt = new VoiceUserTalkingEvent(memberId.toString(), confName, false); conferenceEventListener.handleConferenceEvent(pt); } else { log.debug("Unknown conference Action [{}]", action); + System.out.println("Unknown conference Action [" + action + "]"); } } @@ -108,8 +137,7 @@ public class ESLEventListener implements IEslEventListener { public void conferenceEventRecord(String uniqueId, String confName, int confSize, EslEvent event) { String action = event.getEventHeaders().get("Action"); - if(action == null) { - + if(action == null) { return; } @@ -117,7 +145,7 @@ public class ESLEventListener implements IEslEventListener { log.debug("Handling conferenceEventRecord " + action); if (action.equals(START_RECORDING_EVENT)) { - StartRecordingEvent sre = new StartRecordingEvent(123, confName, true); + VoiceStartRecordingEvent sre = new VoiceStartRecordingEvent(confName, true); sre.setRecordingFilename(getRecordFilenameFromEvent(event)); sre.setTimestamp(getRecordTimestampFromEvent(event)); @@ -126,7 +154,7 @@ public class ESLEventListener implements IEslEventListener { conferenceEventListener.handleConferenceEvent(sre); } else if (action.equals(STOP_RECORDING_EVENT)) { - StartRecordingEvent srev = new StartRecordingEvent(123, confName, false); + VoiceStartRecordingEvent srev = new VoiceStartRecordingEvent(confName, false); srev.setRecordingFilename(getRecordFilenameFromEvent(event)); srev.setTimestamp(getRecordTimestampFromEvent(event)); @@ -143,11 +171,12 @@ public class ESLEventListener implements IEslEventListener { @Override public void eventReceived(EslEvent event) { - if (event.getEventName().equals(FreeswitchHeartbeatMonitor.EVENT_HEARTBEAT)) { -// setChanged(); - // notifyObservers(event); - return; - } + System.out.println("ESL Event Listener received event=[" + event.getEventName() + "]"); +// if (event.getEventName().equals(FreeswitchHeartbeatMonitor.EVENT_HEARTBEAT)) { +//// setChanged(); +// notifyObservers(event); +// return; +// } } private Integer getMemberIdFromEvent(EslEvent e) { diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java index 03e163e364..a0421a5a74 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java @@ -19,30 +19,29 @@ package org.bigbluebutton.webconference.voice.freeswitch; import java.io.File; -import java.util.Iterator; -import java.util.Map; -import java.util.Observable; -import java.util.logging.Level; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; import org.bigbluebutton.webconference.voice.ConferenceServiceProvider; -import org.bigbluebutton.webconference.voice.events.ConferenceEventListener; -import org.bigbluebutton.webconference.voice.events.ParticipantJoinedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantLeftEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantMutedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantTalkingEvent; -import org.bigbluebutton.webconference.voice.events.StartRecordingEvent; import org.bigbluebutton.webconference.voice.freeswitch.actions.BroadcastConferenceCommand; import org.bigbluebutton.webconference.voice.freeswitch.actions.EjectAllUsersCommand; import org.bigbluebutton.webconference.voice.freeswitch.actions.EjectParticipantCommand; +import org.bigbluebutton.webconference.voice.freeswitch.actions.FreeswitchCommand; import org.bigbluebutton.webconference.voice.freeswitch.actions.PopulateRoomCommand; import org.bigbluebutton.webconference.voice.freeswitch.actions.MuteParticipantCommand; import org.bigbluebutton.webconference.voice.freeswitch.actions.RecordConferenceCommand; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; - public class FreeswitchApplication implements ConferenceServiceProvider { - private static Logger log = Red5LoggerFactory.getLogger(FreeswitchApplication.class, "bigbluebutton"); - + private static Logger log = Red5LoggerFactory.getLogger( FreeswitchApplication.class, "bigbluebutton" ); + + private static final int SENDERTHREADS = 1; + private static final Executor msgSenderExec = Executors.newFixedThreadPool(SENDERTHREADS); + + private BlockingQueue messages = new LinkedBlockingQueue(); private ConnectionManager manager; private String icecastProtocol = "shout"; @@ -53,30 +52,39 @@ public class FreeswitchApplication implements ConferenceServiceProvider { private String icecastStreamExtension = ".mp3"; private Boolean icecastBroadcast = false; - private final Integer USER = 0; /* not used for now */ + private final String USER = "0"; /* not used for now */ + private volatile boolean sendMessages = false; + + private void queueMessage(FreeswitchCommand command) { + try { + messages.offer(command, 5, TimeUnit.SECONDS); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + @Override public void populateRoom(String room) { PopulateRoomCommand prc = new PopulateRoomCommand(room, USER); - manager.getUsers(prc); + queueMessage(prc); } - @Override - public void mute(String room, Integer participant, Boolean mute) { + public void mute(String room, String participant, Boolean mute) { MuteParticipantCommand mpc = new MuteParticipantCommand(room, participant, mute, USER); - manager.mute(mpc); + queueMessage(mpc); } - @Override - public void eject(String room, Integer participant) { - EjectParticipantCommand mpc = new EjectParticipantCommand(room, participant, USER); - manager.eject(mpc); + public void eject(String room, String participant) { + EjectParticipantCommand mpc = new EjectParticipantCommand(room, participant, USER); + queueMessage(mpc); } @Override public void ejectAll(String room) { EjectAllUsersCommand mpc = new EjectAllUsersCommand(room, USER); - manager.ejectAll(mpc); + queueMessage(mpc); } @Override @@ -85,8 +93,7 @@ public class FreeswitchApplication implements ConferenceServiceProvider { String voicePath = RECORD_DIR + File.separatorChar + meetingid + "-" + System.currentTimeMillis() + ".wav"; RecordConferenceCommand rcc = new RecordConferenceCommand(room, USER, true, voicePath); - - manager.record(rcc); + queueMessage(rcc); } @Override @@ -101,7 +108,7 @@ public class FreeswitchApplication implements ConferenceServiceProvider { + File.separatorChar + meetingid + "." + icecastStreamExtension; BroadcastConferenceCommand rcc = new BroadcastConferenceCommand(room, USER, true, shoutPath); - manager.broadcast(rcc); + queueMessage(rcc); } public void setConnectionManager(ConnectionManager manager) { @@ -136,17 +143,53 @@ public class FreeswitchApplication implements ConferenceServiceProvider { icecastStreamExtension = ext; } - @Override - public boolean startup() { - // NO OP - return false; + private void sendMessageToFreeswitch(FreeswitchCommand command) { + if (command instanceof PopulateRoomCommand) { + PopulateRoomCommand cmd = (PopulateRoomCommand) command; + log.debug("Sending PopulateRoomCommand for conference = [" + cmd.getRoom() + "]"); + manager.getUsers(cmd); + } else if (command instanceof MuteParticipantCommand) { + MuteParticipantCommand cmd = (MuteParticipantCommand) command; + log.debug("Sending MuteParticipantCommand for conference = [" + cmd.getRoom() + "]"); + System.out.println("Sending MuteParticipantCommand for conference = [" + cmd.getRoom() + "]"); + manager.mute(cmd); + } else if (command instanceof EjectParticipantCommand) { + EjectParticipantCommand cmd = (EjectParticipantCommand) command; + log.debug("Sending EjectParticipantCommand for conference = [" + cmd.getRoom() + "]"); + manager.eject(cmd); + } else if (command instanceof EjectAllUsersCommand) { + EjectAllUsersCommand cmd = (EjectAllUsersCommand) command; + log.debug("Sending EjectAllUsersCommand for conference = [" + cmd.getRoom() + "]"); + manager.ejectAll(cmd); + } else if (command instanceof RecordConferenceCommand) { + manager.record((RecordConferenceCommand) command); + } else if (command instanceof BroadcastConferenceCommand) { + manager.broadcast((BroadcastConferenceCommand) command); + } } - - @Override - public void shutdown() { - // NO OP - + + public void start() { + sendMessages = true; + Runnable sender = new Runnable() { + public void run() { + while (sendMessages) { + FreeswitchCommand message; + try { + message = messages.take(); + sendMessageToFreeswitch(message); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + } + }; + msgSenderExec.execute(sender); + } + + public void stop() { + sendMessages = false; } - } \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchHeartbeatMonitor.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchHeartbeatMonitor.java deleted file mode 100755 index 933171b784..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchHeartbeatMonitor.java +++ /dev/null @@ -1,179 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.voice.freeswitch; - -import java.util.Calendar; -import java.util.Observable; -import java.util.Observer; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import org.freeswitch.esl.client.manager.ManagerConnection; -import org.freeswitch.esl.client.transport.event.EslEvent; -import org.jboss.netty.channel.ExceptionEvent; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -import net.jcip.annotations.ThreadSafe; -import org.freeswitch.esl.client.inbound.Client; -import org.freeswitch.esl.client.inbound.InboundConnectionFailure; - -/** - * - * @author leif - */ -@ThreadSafe -public class FreeswitchHeartbeatMonitor implements Observer { - private static Logger log = Red5LoggerFactory.getLogger(FreeswitchHeartbeatMonitor.class, "bigbluebutton"); - - public static final String EVENT_HEARTBEAT = "HEARTBEAT"; - - private final Executor exec = Executors.newSingleThreadExecutor(); - private Runnable monitorProcess; - private volatile boolean running = false; - - private static final long DEFAULT_INTERVAL = 20 * 1000L; - private long interval = DEFAULT_INTERVAL; - private long lastHeartbeat = System.currentTimeMillis(); - private long maxHeartbeatInterval = 25 * 1000L; - private int intervalLoopCount = 0; - - private final ManagerConnection connection; - private final FreeswitchApplication eventListner; - - public FreeswitchHeartbeatMonitor(ManagerConnection connection, FreeswitchApplication eventListner) { - this.connection = connection; - this.eventListner = eventListner; - log.info("Freeswitch HeartbeatMonitor Created"); - } - - public void start() { - log.info("HeartbeatMonitor Starting"); - if (!running) { - running = true; - monitorProcess = new Runnable() { - public void run() { - monitorFreeswitchServer(); - } - }; - exec.execute(monitorProcess); - } - } - - public void stop() { - running = false; - } - - private void monitorFreeswitchServer() { - long timeDiff; - - while(running) { - try { - Thread.sleep(interval); - } catch (InterruptedException e) { } - - if(!running) { - break; - } - - //Check to see if update happened recently - timeDiff = System.currentTimeMillis() - lastHeartbeat; - if(timeDiff > maxHeartbeatInterval) { - //if not reconnect - try { - Client c = connection.getESLClient(); - log.info("HeartbeatMonitor did not get a heartbeat event in time... reconnecting"); - if(c.canSend()) { //Otherwise disconnect will throw ISE - log.info("Logging off fom [" + connection.toString() + "]"); - connection.disconnect(); - } - log.info("Logging in as [" + connection.getPassword() + "] to [" + connection.getHostname() + ":" + connection.getPort() + "]"); - try { - connection.connect(); - eventListner.startup(); //Re-call startup to setup eventListner and filters... - lastHeartbeat = System.currentTimeMillis(); //Reset - } catch ( InboundConnectionFailure ce ) { - log.error( "HeartbeatMonitor Connect to FreeSwitch ESL socket failed, will retry...", ce ); - } - } catch (IllegalStateException ise) { - log.error( "HeartbeatMonitor Ex", ise); - } catch (Exception e) { - log.error( "HeartbeatMonitor Ex", e); - } - } - - if(intervalLoopCount == 5) { - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(lastHeartbeat); - - log.debug("HeartbeatMonitor running... last HB [{}] diff [{}]", cal.getTime(), timeDiff); - intervalLoopCount = 0; - } - intervalLoopCount++; - } - } - - public void update(Observable o, Object arg) { - if (arg instanceof EslEvent) { - //Heartbeat - EslEvent event = (EslEvent)arg; - /* - Map eventHeaders = event.getEventHeaders(); - StringBuilder sb = new StringBuilder("\n"); - for (Iterator it=eventHeaders.entrySet().iterator(); it.hasNext(); ) { - Map.Entry entry = (Map.Entry)it.next(); - sb.append(entry.getKey()); - sb.append(" => '"); - sb.append(entry.getValue()); - sb.append("'\n"); - } - log.debug ("HeartbeaMonitor EslEvent Headers:\n{}\nEND", sb.toString()); - - * - Event-Name => 'HEARTBEAT' - Event-Calling-Function => 'send_heartbeat' - Event-Date-GMT => 'Thu, 01 Jul 2010 04:35:21 GMT' - Core-UUID => '0ec65230-2b40-4cde-9d6f-e49830c653f1' - FreeSWITCH-IPv4 => '192.168.1.10' - Session-Since-Startup => '3' - Up-Time => '0 years, 1 day, 23 hours, 0 minutes, 59 seconds, 738 milliseconds, 899 microseconds' - Event-Date-Local => '2010-07-01 00:35:21' - Session-Per-Sec => '30' - FreeSWITCH-IPv6 => '::1' - Event-Calling-File => 'switch_core.c' - Event-Date-Timestamp => '1277958921191815' - Session-Count => '0' - Idle-CPU => '97.000000' - FreeSWITCH-Hostname => 'ljackson.jjcons.com' - Event-Calling-Line-Number => '65' - Event-Info => 'System Ready' - - */ - //this.lastHeartbeat = Long.parseLong(event.getEventHeaders().get("Event-Date-Timestamp")); - - lastHeartbeat = System.currentTimeMillis(); - return; - - } else if (arg instanceof ExceptionEvent) { - //Exception.... - log.info("HeartbeaMonitor notifed of caught Exception Event [{}]", arg); - return; - } - throw new UnsupportedOperationException("Not supported yet."); - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchMeeting.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchMeeting.java deleted file mode 100755 index 924514ab6c..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchMeeting.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.bigbluebutton.webconference.voice.freeswitch; - -public class FreeswitchMeeting { - - private final String meetingID; - private final Integer voiceMeetingID; - - public FreeswitchMeeting(String meetingID, Integer voiceMeetingID) { - this.meetingID = meetingID; - this.voiceMeetingID = voiceMeetingID; - } - - public String getMeetingID() { - return meetingID; - } - - public Integer getVoiceMeetingID() { - return voiceMeetingID; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchMeetings.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchMeetings.java deleted file mode 100755 index a2c2d6c693..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchMeetings.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.bigbluebutton.webconference.voice.freeswitch; - -public class FreeswitchMeetings { - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchServiceProvider.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchServiceProvider.java deleted file mode 100755 index 66c5202bae..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchServiceProvider.java +++ /dev/null @@ -1,90 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.voice.freeswitch; - -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import org.bigbluebutton.webconference.voice.ConferenceServiceProvider; -import org.bigbluebutton.webconference.voice.events.ConferenceEventListener; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class FreeswitchServiceProvider implements ConferenceServiceProvider { - private static Logger log = Red5LoggerFactory.getLogger(FreeswitchServiceProvider.class, "bigbluebutton"); - - private static final int SENDERTHREADS = 1; - private static final Executor msgSenderExec = Executors.newFixedThreadPool(SENDERTHREADS); - - private BlockingQueue messageToSend; - - private static final int NOTIFIERTHREADS = 1; - private static final Executor notifierExec = Executors.newFixedThreadPool(NOTIFIERTHREADS); - private BlockingQueue eslMessages; - - private ConferenceServiceProvider appDelegate; - private ConferenceEventListener conferenceEventListener; - - @Override - public void record(String room, String meetingid){ - appDelegate.record(room,meetingid); - } - - @Override - public void broadcast(String room, String meetingid){ - appDelegate.broadcast(room,meetingid); - } - - @Override - public void eject(String room, Integer participant) { - appDelegate.eject(room, participant); - } - - @Override - public void ejectAll(String room) { - appDelegate.ejectAll(room); - } - - @Override - public void mute(String room, Integer participant, Boolean mute) { - appDelegate.mute(room, participant, mute); - } - - @Override - public void populateRoom(String room) { - appDelegate.populateRoom(room); - } - - @Override - public void shutdown() { - appDelegate.shutdown(); - } - - @Override - public boolean startup() { - return true; - } - - public void setFreeswitchApplication(FreeswitchApplication f) { - appDelegate = f; - } - - - -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/actions/BroadcastConferenceCommand.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/actions/BroadcastConferenceCommand.java index 23c118a609..02588c9871 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/actions/BroadcastConferenceCommand.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/actions/BroadcastConferenceCommand.java @@ -26,7 +26,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.bigbluebutton.webconference.voice.events.ConferenceEventListener; -import org.bigbluebutton.webconference.voice.events.ParticipantJoinedEvent; +import org.bigbluebutton.webconference.voice.events.VoiceUserJoinedEvent; import org.bigbluebutton.webconference.voice.freeswitch.response.ConferenceMember; import org.bigbluebutton.webconference.voice.freeswitch.response.XMLResponseConferenceListParser; import org.freeswitch.esl.client.transport.message.EslMessage; @@ -40,7 +40,7 @@ public class BroadcastConferenceCommand extends FreeswitchCommand { private boolean record; private String icecastPath; - public BroadcastConferenceCommand(String room, Integer requesterId, boolean record, String icecastPath){ + public BroadcastConferenceCommand(String room, String requesterId, boolean record, String icecastPath){ super(room, requesterId); this.record = record; this.icecastPath = icecastPath; @@ -60,55 +60,6 @@ public class BroadcastConferenceCommand extends FreeswitchCommand { //Test for Known Conference - String firstLine = response.getBodyLines().get(0); - //E.g. Conference 85115 not found - - if(!firstLine.startsWith(". -* -*/ -package org.bigbluebutton.webconference.voice.internal; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.bigbluebutton.webconference.voice.Participant; - -import net.jcip.annotations.ThreadSafe; - -@ThreadSafe -class ParticipantImp implements Participant { - private static final Pattern CALLERNAME_PATTERN = Pattern.compile("([A-Za-z0-9]+)-(.*)$"); - - private final int id; - private final String name; - private boolean muted = false; - private boolean talking = false; - - private final String userID; - - ParticipantImp(int id, String name) { - this.id = id; - this.name = name; - Matcher matcher; - matcher = CALLERNAME_PATTERN.matcher(name); - if (matcher.matches()) { - - this.userID = matcher.group(1).trim(); - } else { - this.userID = name; - } - - System.out.println("**** fsID=[" + id + "] userID=[" + userID + "] name=[" + name + "] **************************** "); - } - - public String getUserID() { - return userID; - } - - synchronized void setTalking(boolean talking) { - this.talking = talking; - } - - synchronized void setMuted(boolean muted) { - this.muted = muted; - } - - synchronized public boolean isMuted() { - return muted; - } - - synchronized public boolean isTalking() { - return talking; - } - - public int getId() { - return id; - } - - public String getName() { - return name; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java deleted file mode 100755 index 653e3a656a..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java +++ /dev/null @@ -1,126 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.voice.internal; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import net.jcip.annotations.ThreadSafe; - -import org.bigbluebutton.webconference.voice.Participant; -import org.bigbluebutton.webconference.voice.Room; - -@ThreadSafe -public class RoomImp implements Room { - private final String name; - - private final ConcurrentMap participants; - - private boolean muted; - private boolean record = false; - private String meetingid; - private boolean recording = false; - - public RoomImp(String name, boolean record, String meetingid, Boolean muted) { - this.name = name; - this.record = record; - this.meetingid = meetingid; - this.muted = muted; - participants = new ConcurrentHashMap(); - } - - public String getName() { - return name; - } - - public int numParticipants() { - return participants.size(); - } - - public Participant getParticipant(Integer id) { - return participants.get(id); - } - - public Participant add(Participant p) { - return participants.putIfAbsent(p.getId(), p); - } - - public boolean hasParticipant(Integer id) { - return participants.containsKey(id); - } - - public int getUserWithID(String userID) { - for (Map.Entry entry : participants.entrySet()) { - Participant u = entry.getValue(); - if (userID.equals(u.getUserID())) { - return u.getId(); - } - } - - return -1; - } - - public void remove(Integer id) { - Participant p = participants.remove(id); - if (p != null) p = null; - } - - public void mute(boolean mute) { - muted = mute; - } - - public boolean isMuted() { - return muted; - } - - public void record(boolean record){ - this.record = record; - } - - public boolean record() { - return record; - } - - public void recording(boolean rec) { - recording = rec; - } - - public boolean isRecording(){ - return recording; - } - - public String getMeeting() { - return meetingid; - } - - public void setMeeting(String meetingid) { - this.meetingid = meetingid; - } - - - public ArrayList getParticipants() { - Map p = Collections.unmodifiableMap(participants); - ArrayList pa = new ArrayList(); - pa.addAll(p.values()); - return pa; - } -} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java deleted file mode 100755 index 6c0a58671f..0000000000 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java +++ /dev/null @@ -1,201 +0,0 @@ -/** -* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* -* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -* -* This program is free software; you can redistribute it and/or modify it under the -* terms of the GNU Lesser General Public License as published by the Free Software -* Foundation; either version 3.0 of the License, or (at your option) any later -* version. -* -* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License along -* with BigBlueButton; if not, see . -* -*/ -package org.bigbluebutton.webconference.voice.internal; - -import java.util.ArrayList; -import java.util.concurrent.ConcurrentHashMap; - -import net.jcip.annotations.ThreadSafe; - -import org.bigbluebutton.webconference.voice.ConferenceService; -import org.bigbluebutton.webconference.voice.Participant; -import org.bigbluebutton.webconference.voice.VoiceEventRecorder; -import org.bigbluebutton.webconference.voice.events.ConferenceEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantJoinedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantLeftEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantMutedEvent; -import org.bigbluebutton.webconference.voice.events.ParticipantTalkingEvent; -import org.bigbluebutton.webconference.voice.events.StartRecordingEvent; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -@ThreadSafe -public class RoomManager { - private static final Logger log = Red5LoggerFactory.getLogger(RoomManager.class, "bigbluebutton"); - - private final ConcurrentHashMap rooms; - private ConferenceService confService; - private VoiceEventRecorder recorder; - - public RoomManager() { - rooms = new ConcurrentHashMap(); - } - - public int getVoiceUserIDFromRoom(String room, String userID) { - RoomImp rm = rooms.get(room); - if (rm != null) { - return rm.getUserWithID(userID); - } - - return -1; - } - - public void createRoom(String name, boolean record, String meetingid, Boolean muted) { - log.debug("Creating room: " + name); - RoomImp r = new RoomImp(name, record, meetingid, muted); - rooms.putIfAbsent(name, r); - } - - public boolean hasRoom(String name) { - return rooms.containsKey(name); - } - - public boolean hasParticipant(String room, Integer participant) { - RoomImp rm = rooms.get(room); - if (rm == null) return false; - return rm.hasParticipant(participant); - } - - public void destroyRoom(String name) { - log.debug("Destroying room: " + name); - RoomImp r = rooms.remove(name); - if (r != null) r = null; - } - - public void mute(String room, boolean mute) { - RoomImp rm = rooms.get(room); - if (rm != null) rm.mute(mute); - } - - public boolean isRoomMuted(String room){ - RoomImp rm = rooms.get(room); - if (rm != null) return rm.isMuted(); - else return false; - } - - public ArrayList getParticipants(String room) { - log.debug("Getting participants for room: " + room); - RoomImp rm = rooms.get(room); - if (rm == null) { - log.info("Getting participants for non-existing room: " + room); - } - return rm.getParticipants(); - } - - /** - * Process the event from the voice conferencing server. - * @param event - */ - public void processConferenceEvent(ConferenceEvent event) { - log.debug("Processing event for room: " + event.getRoom()); - RoomImp rm = rooms.get(event.getRoom()); - if (rm == null) { - log.warn("Processing event for non-existing room: " + event.getRoom()); - return; - } - - if (event instanceof ParticipantJoinedEvent) { - handleParticipantJoinedEvent(event, rm); - } else if (event instanceof ParticipantLeftEvent) { - handleParticipantLeftEvent(event, rm); - } else if (event instanceof ParticipantMutedEvent) { - handleParticipantMutedEvent(event, rm); - } else if (event instanceof ParticipantTalkingEvent) { - handleParticipantTalkingEvent(event, rm); - } else if (event instanceof StartRecordingEvent) { - // do nothing but let it through. - // later on we need to dispatch an event to the client that the voice recording has started. - } else { - log.debug("Processing UnknownEvent " + event.getClass().getName() + " for room: " + event.getRoom() ); - return; - } - - /** - * Record the event if the meeting is being recorded. - */ - recorder.recordConferenceEvent(event, rm.getMeeting()); - } - - private void handleParticipantJoinedEvent(ConferenceEvent event, RoomImp rm) { - log.debug("Processing ParticipantJoinedEvent for room: " + event.getRoom()); - ParticipantJoinedEvent pje = (ParticipantJoinedEvent) event; - ParticipantImp p = new ParticipantImp(pje.getParticipantId(), pje.getCallerIdName()); - p.setMuted(pje.getMuted()); - p.setTalking(pje.getSpeaking()); - log.debug("Joined [" + p.getId() + "," + p.getName() + "," + p.isMuted() + "," + p.isTalking() + "] to room " + rm.getName()); - - rm.add(p); - - if (rm.numParticipants() == 1) { - if (rm.record() && !rm.isRecording()) { - /** - * Start recording when the first user joins the voice conference. - * WARNING: Works only with FreeSWITCH for now. We need to come up with a generic way to - * trigger recording for both Asterisk and FreeSWITCH. - */ - rm.recording(true); - log.debug("Starting recording of voice conference"); - log.warn(" ** WARNING: Prototyping only. Works only with FreeSWITCH for now. We need to come up with a generic way to trigger recording for both Asterisk and FreeSWITCH."); - confService.recordSession(event.getRoom(), rm.getMeeting()); - } - - // Broadcast the audio - confService.broadcastSession(event.getRoom(), rm.getMeeting()); - } - - - - if (rm.isMuted() && !p.isMuted()) { - confService.mute(p.getId(), event.getRoom(), true); - } - } - - private void handleParticipantLeftEvent(ConferenceEvent event, RoomImp rm) { - log.debug("Processing ParticipantLeftEvent for room: " + event.getRoom()); - rm.remove(event.getParticipantId()); - - if ((rm.numParticipants() == 0) && (rm.record())) { - log.debug("Stopping recording of voice conference"); - log.warn(" ** WARNING: Prototyping only. Works only with FreeSWITCH for now. We need to come up with a generic way to trigger recording for both Asterisk and FreeSWITCH."); - rm.recording(false); - } - } - - private void handleParticipantMutedEvent(ConferenceEvent event, RoomImp rm) { - log.debug("Processing ParticipantMutedEvent for room: " + event.getRoom()); - ParticipantMutedEvent pme = (ParticipantMutedEvent) event; - ParticipantImp p = (ParticipantImp) rm.getParticipant(event.getParticipantId()); - if (p != null) p.setMuted(pme.isMuted()); - } - - private void handleParticipantTalkingEvent(ConferenceEvent event, RoomImp rm) { - log.debug("Processing ParticipantTalkingEvent for room: " + event.getRoom()); - ParticipantTalkingEvent pte = (ParticipantTalkingEvent) event; - ParticipantImp p = (ParticipantImp) rm.getParticipant(event.getParticipantId()); - if (p != null) p.setTalking(pte.isTalking()); - } - - public void setVoiceEventRecorder(VoiceEventRecorder recorder) { - this.recorder = recorder; - } - - public void setConferenceService(ConferenceService service) { - this.confService = service; - } -} diff --git a/bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml b/bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml index 9d2cf1f35f..2bf26a1c56 100755 --- a/bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml +++ b/bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml @@ -37,4 +37,7 @@ with BigBlueButton; if not, see . + + + diff --git a/bigbluebutton-apps/src/main/resources/redis.properties b/bigbluebutton-apps/src/main/resources/redis.properties new file mode 100755 index 0000000000..e9d8a8c33a --- /dev/null +++ b/bigbluebutton-apps/src/main/resources/redis.properties @@ -0,0 +1,5 @@ +# Redis settings + +redis.host=localhost +redis.port=6379 +redis.pass= \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/conference/voice/freeswitch/HeartbeatMonitor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/conference/voice/freeswitch/HeartbeatMonitor.scala new file mode 100755 index 0000000000..a4e615328d --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/conference/voice/freeswitch/HeartbeatMonitor.scala @@ -0,0 +1,5 @@ +package org.bigbluebutton.conference.voice.freeswitch + +class HeartbeatMonitor() { + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala new file mode 100644 index 0000000000..4be7c844dc --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala @@ -0,0 +1,100 @@ +package org.bigbluebutton.core + +import scala.actors.Actor +import scala.actors.Actor._ +import scala.collection.mutable.HashMap +import org.bigbluebutton.core.api._ + +class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor { + + private var meetings = new HashMap[String, MeetingActor] + + + def act() = { + loop { + react { + case msg: CreateMeeting => handleCreateMeeting(msg) + case msg: DestroyMeeting => handleDestroyMeeting(msg) + case msg: KeepAliveMessage => handleKeepAliveMessage(msg) + case msg: InMessage => handleMeetingMessage(msg) + case _ => // do nothing + } + } + } + + + private def handleMeetingMessage(msg: InMessage):Unit = { + msg match { + case ucm: UserConnectedToGlobalAudio => { + val m = meetings.values.find( m => m.voiceBridge == ucm.voiceConf) + m foreach {mActor => mActor ! ucm} + } + case udm: UserDisconnectedFromGlobalAudio => { + val m = meetings.values.find( m => m.voiceBridge == udm.voiceConf) + m foreach {mActor => mActor ! udm} + } + case allOthers => { + meetings.get(allOthers.meetingID) match { + case None => handleMeetingNotFound(allOthers) + case Some(m) => { + // log.debug("Forwarding message [{}] to meeting [{}]", msg.meetingID) + m ! allOthers + } + } + } + } + } + + private def handleMeetingNotFound(msg: InMessage) { + msg match { + case vat:ValidateAuthToken => { + println("No meeting [" + vat.meetingID + "] for auth token [" + vat.token + "]") + outGW.send(new ValidateAuthTokenReply(vat.meetingID, vat.userId, vat.token, false, vat.correlationId)) + } + case _ => { + println("No meeting [" + msg.meetingID + "] for message type [" + msg.getClass() + "]") + // do nothing + } + } + } + + private def handleKeepAliveMessage(msg: KeepAliveMessage):Unit = { + outGW.send(new KeepAliveMessageReply(msg.aliveID)) + } + + private def handleDestroyMeeting(msg: DestroyMeeting) { + println("****************** BBBActor received DestroyMeeting message for meeting id [" + msg.meetingID + "] **************") + meetings.get(msg.meetingID) match { + case None => println("Could not find meeting id[" + msg.meetingID + "] to destroy.") + case Some(m) => { + m ! StopMeetingActor + meetings -= msg.meetingID + println("Kinc everyone out on meeting id[" + msg.meetingID + "].") + outGW.send(new EndAndKickAll(msg.meetingID, m.recorded)) + + println("Destroyed meeting id[" + msg.meetingID + "].") + outGW.send(new MeetingDestroyed(msg.meetingID)) + } + } + } + + private def handleCreateMeeting(msg: CreateMeeting):Unit = { + meetings.get(msg.meetingID) match { + case None => { + println("New meeting create request [" + msg.meetingName + "]") + var m = new MeetingActor(msg.meetingID, msg.meetingName, msg.recorded, msg.voiceBridge, msg.duration, outGW) + m.start + meetings += m.meetingID -> m + outGW.send(new MeetingCreated(m.meetingID, m.recorded, m.voiceBridge)) + + m ! new InitializeMeeting(m.meetingID, m.recorded) + m ! "StartTimer" + } + case Some(m) => { + println("Meeting already created [" + msg.meetingName + "]") + // do nothing + } + } + } + +} diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala new file mode 100755 index 0000000000..c9e0a5429c --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala @@ -0,0 +1,24 @@ +package org.bigbluebutton.core + +import org.bigbluebutton.core.api._ +import java.util.concurrent.CountDownLatch +import scala.actors.Actor +import scala.actors.Actor._ + +class BigBlueButtonGateway(outGW: MessageOutGateway, collGW: CollectorGateway) { + + private val bbbActor = new BigBlueButtonActor(outGW) + bbbActor.start + + def accept(msg: InMessage):Unit = { + collGW.collectInMessage(msg) + + bbbActor ! msg + + } + + def acceptKeepAlive(msg: KeepAliveMessage):Unit = { + bbbActor ! msg + } + +} diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala new file mode 100644 index 0000000000..ccbd4a4b93 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala @@ -0,0 +1,464 @@ +package org.bigbluebutton.core + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.presentation.PreuploadedPresentationsUtil +import scala.collection.JavaConversions._ +import org.bigbluebutton.core.apps.poll.PollInGateway +import org.bigbluebutton.core.apps.layout.LayoutInGateway +import org.bigbluebutton.core.apps.chat.ChatInGateway +import scala.collection.JavaConversions._ +import org.bigbluebutton.core.apps.whiteboard.WhiteboardInGateway +import org.bigbluebutton.core.apps.voice.VoiceInGateway +import java.util.ArrayList +import scala.collection.mutable.ArrayBuffer +import org.bigbluebutton.core.apps.presentation.Page +import org.bigbluebutton.core.apps.presentation.Presentation + +class BigBlueButtonInGW(bbbGW: BigBlueButtonGateway) extends IBigBlueButtonInGW { + + val presUtil = new PreuploadedPresentationsUtil() + + // Meeting + def createMeeting2(meetingID: String, meetingName: String, record: Boolean, voiceBridge: String, duration: Long) { + println("******************** CREATING MEETING [" + meetingID + "] ***************************** ") + bbbGW.accept(new CreateMeeting(meetingID, meetingName, record, voiceBridge, duration)) + + /* + val pres = presUtil.getPreuploadedPresentations(meetingID); + if (!pres.isEmpty()) { + var presentations = new scala.collection.immutable.HashMap[String, Presentation] + + pres foreach {p => + val pages = generatePresentationPages(p.numPages) + val presentation = new Presentation(id=p.id, name=p.id, pages=pages) + presentations += presentation.id -> presentation + } + + + bbbGW.accept(new PreuploadedPresentations(meetingID, presentations.values.toSeq)) + } + + */ + } + + def destroyMeeting(meetingID: String) { + println("******************** DESTROY MEETING [" + meetingID + "] ***************************** ") + bbbGW.accept(new DestroyMeeting(meetingID)) + } + + def isAliveAudit(aliveId:String) { + bbbGW.acceptKeepAlive(new KeepAliveMessage(aliveId)); + } + + def lockSettings(meetingID: String, locked: java.lang.Boolean, + lockSettings: java.util.Map[String, java.lang.Boolean]) { + + } + + def statusMeetingAudit(meetingID: String) { + + } + + def endMeeting(meetingID: String) { + println("******************** END MEETING [" + meetingID + "] ***************************** ") + bbbGW.accept(new EndMeeting(meetingID)) + } + + def endAllMeetings() { + + } + + /************************************************************* + * Message Interface for Users + *************************************************************/ + def validateAuthToken(meetingId: String, userId: String, token: String, correlationId: String) { + println("******************** VALIDATE TOKEN [" + token + "] ***************************** ") + bbbGW.accept(new ValidateAuthToken(meetingId, userId, token, correlationId)) + } + + def registerUser(meetingID: String, userID: String, name: String, role: String, extUserID: String, authToken: String):Unit = { + val userRole = if (role == "MODERATOR") Role.MODERATOR else Role.VIEWER + bbbGW.accept(new RegisterUser(meetingID, userID, name, userRole, extUserID, authToken)) + } + + def sendLockSettings(meetingID: String, userId: String, settings: java.util.Map[String, java.lang.Boolean]) { + // Convert java.util.Map to scala.collection.immutable.Map + // settings.mapValues -> convaert java Map to scala mutable Map + // v => v.booleanValue() -> convert java Boolean to Scala Boolean + // toMap -> converts from scala mutable map to scala immutable map + val s = settings.mapValues (v => v.booleanValue() /* convert java Boolean to Scala Boolean */).toMap + val disableCam = s.getOrElse("disableCam", false) + val disableMic = s.getOrElse("disableMic", false) + val disablePrivChat = s.getOrElse("disablePrivateChat", false) + val disablePubChat = s.getOrElse("disablePublicChat", false) + val lockedLayout = s.getOrElse("lockedLayout", false) + val permissions = new Permissions(disableCam = disableCam, + disableMic = disableMic, + disablePrivChat = disablePrivChat, + disablePubChat = disablePubChat, + lockedLayout = lockedLayout) + + val ls = new PermissionsSetting(permissions) + bbbGW.accept(new SetLockSettings(meetingID, userId, ls)) + } + + def initLockSettings(meetingID: String, locked: Boolean, settings: java.util.Map[String, java.lang.Boolean]) { + // Convert java.util.Map to scala.collection.immutable.Map + // settings.mapValues -> convaert java Map to scala mutable Map + // v => v.booleanValue() -> convert java Boolean to Scala Boolean + // toMap -> converts from scala mutable map to scala immutable map + val s = settings.mapValues (v => v.booleanValue() /* convert java Boolean to Scala Boolean */).toMap + val disableCam = s.getOrElse("disableCam", false) + val disableMic = s.getOrElse("disableMic", false) + val disablePrivChat = s.getOrElse("disablePrivateChat", false) + val disablePubChat = s.getOrElse("disablePublicChat", false) + val lockedLayout = s.getOrElse("lockedLayout", false) + val permissions = new Permissions(disableCam = disableCam, + disableMic = disableMic, + disablePrivChat = disablePrivChat, + disablePubChat = disablePubChat, + lockedLayout = lockedLayout) + + val ls = new PermissionsSetting(permissions) + bbbGW.accept(new InitLockSettings(meetingID, locked, ls)) + } + + def getLockSettings(meetingId: String, userId: String) { + bbbGW.accept(new GetLockSettings(meetingId, userId)) + } + + def isMeetingLocked(meetingId: String, userId: String) { + bbbGW.accept(new IsMeetingLocked(meetingId, userId)) + } + + def lockAllUsers(meetingId: String, lock: Boolean, dontLockTheseUsers: ArrayList[String]) { + bbbGW.accept(new LockAllUsers(meetingId, lock, dontLockTheseUsers.toSeq)) + } + + def lockUser(meetingId: String, lock: Boolean, userId: String) { + bbbGW.accept(new LockUser(meetingId, userId, lock)) + } + + def setRecordingStatus(meetingId: String, userId: String, recording: java.lang.Boolean) { + bbbGW.accept(new SetRecordingStatus(meetingId, userId, recording.booleanValue())) + } + + def getRecordingStatus(meetingId: String, userId: String) { + bbbGW.accept(new GetRecordingStatus(meetingId, userId)) + } + + + // Users + def userRaiseHand(meetingId: String, userId: String) { + bbbGW.accept(new UserRaiseHand(meetingId, userId)) + } + + def lowerHand(meetingId: String, userId: String, loweredBy: String) { + bbbGW.accept(new UserLowerHand(meetingId, userId, loweredBy)) + } + + def shareWebcam(meetingId: String, userId: String, stream: String) { + bbbGW.accept(new UserShareWebcam(meetingId, userId, stream)) + } + + def unshareWebcam(meetingId: String, userId: String) { + bbbGW.accept(new UserUnshareWebcam(meetingId, userId)) + } + + def setUserStatus(meetingID: String, userID: String, status: String, value: Object):Unit = { + bbbGW.accept(new ChangeUserStatus(meetingID, userID, status, value)); + } + + def getUsers(meetingID: String, requesterID: String):Unit = { + bbbGW.accept(new GetUsers(meetingID, requesterID)) + } + + def userLeft(meetingID: String, userID: String):Unit = { + bbbGW.accept(new UserLeaving(meetingID, userID)) + } + + def userJoin(meetingID: String, userID: String):Unit = { + bbbGW.accept(new UserJoining(meetingID, userID)) + } + + def assignPresenter(meetingID: String, newPresenterID: String, newPresenterName: String, assignedBy: String):Unit = { + bbbGW.accept(new AssignPresenter(meetingID, newPresenterID, newPresenterName, assignedBy)) + } + + def getCurrentPresenter(meetingID: String, requesterID: String):Unit = { + // do nothing + } + + def userConnectedToGlobalAudio(voiceConf: String, userid: String, name: String) { + bbbGW.accept(new UserConnectedToGlobalAudio(voiceConf, voiceConf, userid, name)) + } + + def userDisconnectedFromGlobalAudio(voiceConf: String, userid: String, name: String) { + bbbGW.accept(new UserDisconnectedFromGlobalAudio(voiceConf, voiceConf, userid, name)) + } + + /************************************************************************************** + * Message Interface for Presentation + **************************************************************************************/ + + def clear(meetingID: String) { + bbbGW.accept(new ClearPresentation(meetingID)) + } + + def sendConversionUpdate(messageKey: String, meetingId: String, + code: String, presentationId: String, presName: String) { + bbbGW.accept(new PresentationConversionUpdate(meetingId, messageKey, + code, presentationId, presName)) + } + + def sendPageCountError(messageKey: String, meetingId: String, + code: String, presentationId: String, numberOfPages: Int, + maxNumberPages: Int, presName: String) { + bbbGW.accept(new PresentationPageCountError(meetingId, messageKey, + code, presentationId, numberOfPages, maxNumberPages, presName)) + } + + def sendSlideGenerated(messageKey: String, meetingId: String, + code: String, presentationId: String, numberOfPages: Int, + pagesCompleted: Int, presName: String) { + bbbGW.accept(new PresentationSlideGenerated(meetingId, messageKey, + code, presentationId, numberOfPages, pagesCompleted, presName)) + } + + def generatePresentationPages(presId: String, numPages: Int, presBaseUrl: String):scala.collection.immutable.HashMap[String, Page] = { + var pages = new scala.collection.immutable.HashMap[String, Page] + val baseUrl = + for (i <- 1 to numPages) { + val id = presId + "/" + i + val num = i; + val current = if (i == 1) true else false + val thumbnail = presBaseUrl + "/thumbnail/" + i + val swfUri = presBaseUrl + "/slide/" + i + val txtUri = presBaseUrl + "/textfiles/slide-" + i + ".txt" + + val p = new Page(id=id, num=num, thumbUri=thumbnail, swfUri=swfUri, + txtUri=txtUri, pngUri=thumbnail, + current=current) + pages += (p.id -> p) + } + + pages + } + + def sendConversionCompleted(messageKey: String, meetingId: String, + code: String, presentationId: String, numPages: Int, + presName: String, presBaseUrl: String) { + println("******************** PRESENTATION CONVERSION COMPLETED MESSAGE ***************************** ") + val pages = generatePresentationPages(presentationId, numPages, presBaseUrl) + + val presentation = new Presentation(id=presentationId, name=presName, pages=pages) + bbbGW.accept(new PresentationConversionCompleted(meetingId, messageKey, + code, presentation)) + + } + + def removePresentation(meetingID: String, presentationID: String) { + bbbGW.accept(new RemovePresentation(meetingID, presentationID)) + } + + def getPresentationInfo(meetingID: String, requesterID: String, replyTo: String) { + println("**** Forwarding GetPresentationInfo for meeting[" + meetingID + "] ****") + bbbGW.accept(new GetPresentationInfo(meetingID, requesterID, replyTo)) + } + + def sendCursorUpdate(meetingID: String, xPercent: Double, yPercent: Double) { + bbbGW.accept(new SendCursorUpdate(meetingID, xPercent, yPercent)) + } + + def resizeAndMoveSlide(meetingID: String, xOffset: Double, yOffset: Double, widthRatio: Double, heightRatio: Double) { + bbbGW.accept(new ResizeAndMoveSlide(meetingID, xOffset, yOffset, widthRatio, heightRatio)) + } + + def gotoSlide(meetingID: String, pageId: String) { + println("**** Forwarding GotoSlide for meeting[" + meetingID + "] ****") + bbbGW.accept(new GotoSlide(meetingID, pageId)) + } + + def sharePresentation(meetingID: String, presentationID: String, share: Boolean) { + bbbGW.accept(new SharePresentation(meetingID, presentationID, share)) + } + + def getSlideInfo(meetingID: String, requesterID: String, replyTo: String) { + bbbGW.accept(new GetSlideInfo(meetingID, requesterID, replyTo)) + } + + /************************************************************** + * Message Interface Polling + **************************************************************/ + val pollGW = new PollInGateway(bbbGW) + + def getPolls(meetingID: String, requesterID: String) { + pollGW.getPolls(meetingID, requesterID) + } + + def preCreatedPoll(meetingID: String, msg: String) { + pollGW.preCreatedPoll(meetingID, msg) + } + + def createPoll(meetingID: String, requesterID: String, msg: String) { + pollGW.createPoll(meetingID, requesterID, msg) + } + + def updatePoll(meetingID: String, requesterID: String, msg: String) { + pollGW.updatePoll(meetingID, requesterID, msg) + } + + def startPoll(meetingID: String, requesterID: String, msg: String) { + pollGW.startPoll(meetingID, requesterID, msg) + } + + def stopPoll(meetingID: String, requesterID: String, msg: String) { + pollGW.stopPoll(meetingID, requesterID, msg) + } + + def removePoll(meetingID: String, requesterID: String, msg: String) { + pollGW.removePoll(meetingID, requesterID, msg) + } + + def respondPoll(meetingID: String, requesterID: String, msg: String) { + pollGW.respondPoll(meetingID, requesterID, msg) + } + + def showPollResult(meetingID: String, requesterID: String, msg: String) { + pollGW.showPollResult(meetingID, requesterID, msg) + } + + def hidePollResult(meetingID: String, requesterID: String, msg: String) { + pollGW.hidePollResult(meetingID, requesterID, msg) + } + + /************************************************************************* + * Message Interface for Layout + *********************************************************************/ + val layoutGW = new LayoutInGateway(bbbGW) + + def getCurrentLayout(meetingID: String, requesterID: String) { + layoutGW.getCurrentLayout(meetingID, requesterID) + } + + def setLayout(meetingID: String, requesterID: String, layoutID: String) { + layoutGW.setLayout(meetingID, requesterID, layoutID) + } + + def syncLayout(meetingID: String, requesterID: String, layoutID: String) { + layoutGW.setLayout(meetingID, requesterID, layoutID) + } + + def lockLayout(meetingID: String, requesterID: String, layoutID: String) { + layoutGW.lockLayout(meetingID, requesterID, layoutID) + } + + def unlockLayout(meetingID: String, requesterID: String) { + layoutGW.unlockLayout(meetingID, requesterID) + } + + /********************************************************************* + * Message Interface for Chat + *******************************************************************/ + val chatGW = new ChatInGateway(bbbGW) + + def getChatHistory(meetingID: String, requesterID: String, replyTo: String) { + chatGW.getChatHistory(meetingID, requesterID, replyTo) + } + + def sendPublicMessage(meetingID: String, requesterID: String, message: java.util.Map[String, String]) { + // Convert java Map to Scala Map, then convert Mutable map to immutable map + chatGW.sendPublicMessage(meetingID, requesterID, mapAsScalaMap(message).toMap) + } + + def sendPrivateMessage(meetingID: String, requesterID: String, message: java.util.Map[String, String]) { + chatGW.sendPrivateMessage(meetingID, requesterID, mapAsScalaMap(message).toMap) + } + + /********************************************************************* + * Message Interface for Whiteboard + *******************************************************************/ + val wbGW = new WhiteboardInGateway(bbbGW) + + def sendWhiteboardAnnotation(meetingID: String, requesterID: String, annotation: java.util.Map[String, Object]) { + wbGW.sendWhiteboardAnnotation(meetingID, requesterID, mapAsScalaMap(annotation).toMap) + } + + def requestWhiteboardAnnotationHistory(meetingID: String, requestedID: String, whiteboardId: String, replyTo: String) { + wbGW.requestWhiteboardAnnotationHistory(meetingID, requestedID, whiteboardId, replyTo) + } + + def clearWhiteboard(meetingID: String, requestedID: String, whiteboardId: String) { + wbGW.clearWhiteboard(meetingID, requestedID, whiteboardId); + } + + def undoWhiteboard(meetingID: String, requestedID: String, whiteboardId: String) { + wbGW.undoWhiteboard(meetingID, requestedID, whiteboardId) + } + + def enableWhiteboard(meetingID: String, requestedID: String, enable: java.lang.Boolean) { + wbGW.enableWhiteboard(meetingID, requestedID, enable) + } + + def isWhiteboardEnabled(meetingID: String, requestedID: String, replyTo: String) { + wbGW.isWhiteboardEnabled(meetingID, requestedID, replyTo) + } + + /********************************************************************* + * Message Interface for Voice + *******************************************************************/ + val voiceGW = new VoiceInGateway(bbbGW) + + def muteAllUsers(meetingID: String, requesterID: String, mute: java.lang.Boolean) { + voiceGW.muteAllUsers(meetingID, requesterID, mute) + } + + def isMeetingMuted(meetingID: String, requesterID: String) { + voiceGW.isMeetingMuted(meetingID, requesterID) + } + + def muteUser(meetingID: String, requesterID: String, userID: String, mute: java.lang.Boolean) { + voiceGW.muteUser(meetingID, requesterID, userID, mute) + } + + def lockUser(meetingID: String, requesterID: String, userID: String, lock: java.lang.Boolean) { + voiceGW.lockUser(meetingID, requesterID, userID, lock) + } + + def ejectUser(meetingID: String, requesterID: String, userID: String) { + voiceGW.ejectUser(meetingID, requesterID, userID) + } + + def voiceUserJoined(meetingId: String, userId: String, webUserId: String, + conference: String, callerIdNum: String, + callerIdName: String, + muted: java.lang.Boolean, speaking: java.lang.Boolean) { + + voiceGW.voiceUserJoined(meetingId, userId, webUserId, + conference, callerIdNum, + callerIdName, + muted, speaking) + } + + def voiceUserLeft(meetingId: String, userId: String) { + voiceGW.voiceUserLeft(meetingId, userId) + } + + def voiceUserLocked(meetingId: String, userId: String, locked: java.lang.Boolean) { + voiceGW.voiceUserLocked(meetingId, userId, locked) + } + + def voiceUserMuted(meetingId: String, userId: String, muted: java.lang.Boolean) { + voiceGW.voiceUserMuted(meetingId, userId, muted) + } + + def voiceUserTalking(meetingId: String, userId: String, talking: java.lang.Boolean) { + voiceGW.voiceUserTalking(meetingId, userId, talking) + } + + def voiceRecording(meetingId: String, recordingFile: String, + timestamp: String, recording: java.lang.Boolean) { + voiceGW.voiceRecording(meetingId, recordingFile, + timestamp, recording) + } +} diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala new file mode 100644 index 0000000000..81c8bd326e --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala @@ -0,0 +1,2135 @@ +package org.bigbluebutton.core + +import scala.actors.Actor +import scala.actors.Actor._ +import org.bigbluebutton.core.api._ +import com.google.gson.Gson +import scala.collection.mutable.HashMap +import collection.JavaConverters._ +import scala.collection.JavaConversions._ +import java.util.ArrayList +import org.bigbluebutton.core.apps.poll.PollVO +import org.bigbluebutton.core.apps.presentation.Page +import org.bigbluebutton.core.apps.presentation.Presentation +import org.bigbluebutton.core.apps.chat.redis.ChatMessageToJsonConverter +import org.bigbluebutton.core.apps.presentation.redis.PesentationMessageToJsonConverter +import org.bigbluebutton.core.apps.whiteboard.redis.WhiteboardMessageToJsonConverter +import org.bigbluebutton.core.meeting.MeetingMessageToJsonConverter +import org.bigbluebutton.core.apps.users.redis.UsersMessageToJsonConverter + +class CollectorActor(dispatcher: IDispatcher) extends Actor { + + def act() = { + loop { + react { + //IN MESSAGES + case msg: CreateMeeting => handleCreateMeeting(msg) + case msg: InitializeMeeting => handleInitializeMeeting(msg) + case msg: DestroyMeeting => handleDestroyMeeting(msg) + case msg: StartMeeting => handleStartMeeting(msg) + case msg: EndMeeting => handleEndMeeting(msg) + case msg: LockSetting => handleLockSetting(msg) + case msg: LockUser => handleLockUser(msg) + case msg: LockAllUsers => handleLockAllUsers(msg) + case msg: InitLockSettings => handleInitLockSettings(msg) + case msg: SetLockSettings => handleSetLockSettings(msg) + case msg: GetLockSettings => handleGetLockSettings(msg) + case msg: IsMeetingLocked => handleIsMeetingLocked(msg) + case msg: ValidateAuthToken => handleValidateAuthToken(msg) + case msg: RegisterUser => handleRegisterUser(msg) + case msg: UserJoining => handleUserJoining(msg) + case msg: UserLeaving => handleUserLeaving(msg) + case msg: GetUsers => handleGetUsers(msg) + case msg: UserRaiseHand => handleUserRaiseHand(msg) + case msg: UserLowerHand => handleUserLowerHand(msg) + case msg: UserShareWebcam => handleUserShareWebcam(msg) + case msg: UserUnshareWebcam => handleUserUnshareWebcam(msg) + case msg: ChangeUserStatus => handleChangeUserStatus(msg) + case msg: AssignPresenter => handleAssignPresenter(msg) + case msg: SetRecordingStatus => handleSetRecordingStatus(msg) + case msg: GetChatHistoryRequest => handleGetChatHistoryRequest(msg) + case msg: SendPublicMessageRequest => handleSendPublicMessageRequest(msg) + case msg: SendPrivateMessageRequest => handleSendPrivateMessageRequest(msg) + case msg: GetCurrentLayoutRequest => handleGetCurrentLayoutRequest(msg) + case msg: SetLayoutRequest => handleSetLayoutRequest(msg) + case msg: LockLayoutRequest => handleLockLayoutRequest(msg) + case msg: UnlockLayoutRequest => handleUnlockLayoutRequest(msg) + case msg: PreCreatedPoll => handlePreCreatedPoll(msg) + case msg: CreatePoll => handleCreatePoll(msg) + case msg: UpdatePoll => handleUpdatePoll(msg) + case msg: GetPolls => handleGetPolls(msg) + case msg: DestroyPoll => handleDestroyPoll(msg) + case msg: RemovePoll => handleRemovePoll(msg) + case msg: SharePoll => handleSharePoll(msg) + case msg: ShowPollResult => handleShowPollResult(msg) + case msg: HidePollResult => handleHidePollResult(msg) + case msg: StopPoll => handleStopPoll(msg) + case msg: StartPoll => handleStartPoll(msg) + case msg: ClearPoll => handleClearPoll(msg) + case msg: GetPollResult => handleGetPollResult(msg) + case msg: RespondToPoll => handleRespondToPoll(msg) + case msg: ClearPresentation => handleClearPresentation(msg) + case msg: RemovePresentation => handleRemovePresentation(msg) + case msg: GetPresentationInfo => handleGetPresentationInfo(msg) + //case msg: SendCursorUpdate => handleSendCursorUpdate(msg) + case msg: ResizeAndMoveSlide => handleResizeAndMoveSlide(msg) + case msg: GotoSlide => handleGotoSlide(msg) + case msg: SharePresentation => handleSharePresentation(msg) + case msg: GetSlideInfo => handleGetSlideInfo(msg) + case msg: PreuploadedPresentations => handlePreuploadedPresentations(msg) + case msg: PresentationConversionUpdate => handlePresentationConversionUpdate(msg) + case msg: PresentationPageCountError => handlePresentationPageCountError(msg) + case msg: PresentationSlideGenerated => handlePresentationSlideGenerated(msg) + case msg: PresentationConversionCompleted => handlePresentationConversionCompleted(msg) + case msg: SendVoiceUsersRequest => handleSendVoiceUsersRequest(msg) + case msg: MuteMeetingRequest => handleMuteMeetingRequest(msg) + case msg: IsMeetingMutedRequest => handleIsMeetingMutedRequest(msg) + case msg: MuteUserRequest => handleMuteUserRequest(msg) + case msg: LockUserRequest => handleLockUserRequest(msg) + case msg: EjectUserRequest => handleEjectUserRequest(msg) + case msg: VoiceUserJoinedMessage => handleVoiceUserJoinedMessage(msg) + case msg: VoiceUserJoined => handleVoiceUserJoined(msg) + case msg: VoiceUserLeft => handleVoiceUserLeft(msg) + case msg: VoiceUserLocked => handleVoiceUserLocked(msg) + case msg: VoiceUserMuted => handleVoiceUserMuted(msg) + case msg: VoiceUserTalking => handleVoiceUserTalking(msg) + case msg: VoiceRecording => handleVoiceRecording(msg) + case msg: SendWhiteboardAnnotationRequest => handleSendWhiteboardAnnotationRequest(msg) + case msg: GetWhiteboardShapesRequest => handleGetWhiteboardShapesRequest(msg) + case msg: ClearWhiteboardRequest => handleClearWhiteboardRequest(msg) + case msg: UndoWhiteboardRequest => handleUndoWhiteboardRequest(msg) + case msg: EnableWhiteboardRequest => handleEnableWhiteboardRequest(msg) + case msg: IsWhiteboardEnabledRequest => handleIsWhiteboardEnabledRequest(msg) + + //OUT MESSAGES + case msg: MeetingCreated => handleMeetingCreated(msg) + case msg: VoiceRecordingStarted => handleVoiceRecordingStarted(msg) + case msg: VoiceRecordingStopped => handleVoiceRecordingStopped(msg) + case msg: RecordingStatusChanged => handleRecordingStatusChanged(msg) + case msg: GetRecordingStatusReply => handleGetRecordingStatusReply(msg) + case msg: MeetingEnded => handleMeetingEnded(msg) + case msg: MeetingHasEnded => handleMeetingHasEnded(msg) + case msg: MeetingDestroyed => handleMeetingDestroyed(msg) + case msg: DisconnectAllUsers => handleDisconnectAllUsers(msg) + case msg: DisconnectUser => handleDisconnectUser(msg) + case msg: PermissionsSettingInitialized => handlePermissionsSettingInitialized(msg) + case msg: NewPermissionsSetting => handleNewPermissionsSetting(msg) + case msg: UserLocked => handleUserLocked(msg) + case msg: UsersLocked => handleUsersLocked(msg) + case msg: GetPermissionsSettingReply => handleGetPermissionsSettingReply(msg) + case msg: IsMeetingLockedReply => handleIsMeetingLockedReply(msg) + case msg: UserRegistered => handleUserRegistered(msg) + case msg: UserLeft => handleUserLeft(msg) + case msg: PresenterAssigned => handlePresenterAssigned(msg) + case msg: EndAndKickAll => handleEndAndKickAll(msg) + case msg: GetUsersReply => handleGetUsersReply(msg) + case msg: ValidateAuthTokenReply => handleValidateAuthTokenReply(msg) + case msg: UserJoined => handleUserJoined(msg) + case msg: UserRaisedHand => handleUserRaisedHand(msg) + case msg: UserLoweredHand => handleUserLoweredHand(msg) + case msg: UserSharedWebcam => handleUserSharedWebcam(msg) + case msg: UserUnsharedWebcam => handleUserUnsharedWebcam(msg) + case msg: UserStatusChange => handleUserStatusChange(msg) + case msg: MuteVoiceUser => handleMuteVoiceUser(msg) + case msg: UserVoiceMuted => handleUserVoiceMuted(msg) + case msg: UserVoiceTalking => handleUserVoiceTalking(msg) + case msg: EjectVoiceUser => handleEjectVoiceUser(msg) + case msg: UserJoinedVoice => handleUserJoinedVoice(msg) + case msg: UserLeftVoice => handleUserLeftVoice(msg) + case msg: IsMeetingMutedReply => handleIsMeetingMutedReply(msg) + case msg: StartRecording => handleStartRecording(msg) + case msg: StopRecording => handleStopRecording(msg) + case msg: GetChatHistoryReply => handleGetChatHistoryReply(msg) + case msg: SendPublicMessageEvent => handleSendPublicMessageEvent(msg) + case msg: SendPrivateMessageEvent => handleSendPrivateMessageEvent(msg) + case msg: GetCurrentLayoutReply => handleGetCurrentLayoutReply(msg) + case msg: SetLayoutEvent => handleSetLayoutEvent(msg) + case msg: LockLayoutEvent => handleLockLayoutEvent(msg) + case msg: UnlockLayoutEvent => handleUnlockLayoutEvent(msg) + case msg: GetPollResultReply => handleGetPollResultReply(msg) + case msg: GetPollsReplyOutMsg => handleGetPollsReplyOutMsg(msg) + case msg: ClearPollFailed => handleClearPollFailed(msg) + case msg: PollClearedOutMsg => handlePollClearedOutMsg(msg) + case msg: PollStartedOutMsg => handlePollStartedOutMsg(msg) + case msg: PollStoppedOutMsg => handlePollStoppedOutMsg(msg) + case msg: PollRemovedOutMsg => handlePollRemovedOutMsg(msg) + case msg: PollUpdatedOutMsg => handlePollUpdatedOutMsg(msg) + case msg: PollCreatedOutMsg => handlePollCreatedOutMsg(msg) + case msg: PollResponseOutMsg => handlePollResponseOutMsg(msg) + case msg: PollHideResultOutMsg => handlePollHideResultOutMsg(msg) + case msg: PollShowResultOutMsg => handlePollShowResultOutMsg(msg) + case msg: ClearPresentationOutMsg => handleClearPresentationOutMsg(msg) + case msg: RemovePresentationOutMsg => handleRemovePresentationOutMsg(msg) + case msg: GetPresentationInfoOutMsg => handleGetPresentationInfoOutMsg(msg) + //case msg: SendCursorUpdateOutMsg => handleSendCursorUpdateOutMsg(msg) + case msg: ResizeAndMoveSlideOutMsg => handleResizeAndMoveSlideOutMsg(msg) + case msg: GotoSlideOutMsg => handleGotoSlideOutMsg(msg) + case msg: SharePresentationOutMsg => handleSharePresentationOutMsg(msg) + case msg: GetSlideInfoOutMsg => handleGetSlideInfoOutMsg(msg) + case msg: GetPreuploadedPresentationsOutMsg => handleGetPreuploadedPresentationsOutMsg(msg) + case msg: PresentationConversionProgress => handlePresentationConversionProgress(msg) + case msg: PresentationConversionError => handlePresentationConversionError(msg) + case msg: PresentationPageGenerated => handlePresentationPageGenerated(msg) + case msg: PresentationConversionDone => handlePresentationConversionDone(msg) + case msg: PresentationChanged => handlePresentationChanged(msg) + case msg: GetPresentationStatusReply => handleGetPresentationStatusReply(msg) + case msg: PresentationRemoved => handlePresentationRemoved(msg) + case msg: PageChanged => handlePageChanged(msg) + case msg: GetWhiteboardShapesReply => handleGetWhiteboardShapesReply(msg) + case msg: SendWhiteboardAnnotationEvent => handleSendWhiteboardAnnotationEvent(msg) + case msg: ClearWhiteboardEvent => handleClearWhiteboardEvent(msg) + case msg: UndoWhiteboardEvent => handleUndoWhiteboardEvent(msg) + case msg: WhiteboardEnabledEvent => handleWhiteboardEnabledEvent(msg) + case msg: IsWhiteboardEnabledReply => handleIsWhiteboardEnabledReply(msg) + + case _ => // do nothing + } + } + } + + private def buildUserHashMap(user: UserVO):java.util.HashMap[String, Object] = { + val vu = user.voiceUser + val vuser = new java.util.HashMap[String, Object]() + vuser.put(Constants.USER_ID, vu.userId) + vuser.put(Constants.WEB_USER_ID, vu.webUserId) + vuser.put(Constants.CALLER_ID_NAME, vu.callerName) + vuser.put(Constants.CALLER_ID_NUM, vu.callerNum) + vuser.put(Constants.JOINED, vu.joined:java.lang.Boolean) + vuser.put(Constants.LOCKED, vu.locked:java.lang.Boolean) + vuser.put(Constants.MUTED, vu.muted:java.lang.Boolean) + vuser.put(Constants.TALKING, vu.talking:java.lang.Boolean) + + val wuser = new java.util.HashMap[String, Object]() + wuser.put(Constants.USER_ID, user.userID) + wuser.put(Constants.EXT_USER_ID, user.externUserID) + wuser.put(Constants.NAME, user.name) + wuser.put(Constants.ROLE, user.role.toString()) + wuser.put(Constants.RAISE_HAND, user.raiseHand:java.lang.Boolean) + wuser.put(Constants.PRESENTER, user.presenter:java.lang.Boolean) + wuser.put(Constants.HAS_STREAM, user.hasStream:java.lang.Boolean) + wuser.put(Constants.LOCKED, user.locked:java.lang.Boolean) + wuser.put(Constants.WEBCAM_STREAM, user.webcamStream) + wuser.put(Constants.PHONE_USER, user.phoneUser:java.lang.Boolean) + wuser.put(Constants.VOICE_USER, vuser) + + wuser + } + + private def buildJson(header: java.util.HashMap[String, Any], + payload: java.util.HashMap[String, Any]): String = { + + val message = new java.util.HashMap[String, java.util.HashMap[String, Any]]() + message.put(Constants.HEADER, header) + message.put(Constants.PAYLOAD, payload) + + val gson = new Gson() + gson.toJson(message) + } + + // IN MESSAGES + private def handleCreateMeeting(msg: CreateMeeting) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MEETING_NAME, msg.meetingName) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.VOICE_CONF, msg.voiceBridge) + payload.put(Constants.DURATION, msg.duration) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.CREATE_MEETING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING CREATE MEETING *****************") + + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleInitializeMeeting(msg: InitializeMeeting) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.INITIALIZE_MEETING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING INITIALIZE MEETING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleDestroyMeeting(msg: DestroyMeeting) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.DESTROY_MEETING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING DESTROY MEETING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleStartMeeting(msg: StartMeeting) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.START_MEETING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING START MEETING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleEndMeeting(msg: EndMeeting) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.END_MEETING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING END MEETING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleLockSetting(msg: LockSetting) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.LOCKED, msg.locked) + + val settingsMap = new java.util.HashMap[String, Boolean]() + for ((key, value) <- msg.settings) { + settingsMap.put(key, value) + } + + payload.put("settings", settingsMap) //#todo not tested + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.END_MEETING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING LOCK SETTING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleLockUser(msg: LockUser) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.LOCK, msg.lock) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.END_MEETING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING LOCK USER *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleLockAllUsers(msg: LockAllUsers) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.EXCEPT_USERS, msg.exceptUsers.toString()) + payload.put(Constants.LOCK, msg.lock) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.END_MEETING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING LOCK ALL USERS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleInitLockSettings(msg: InitLockSettings) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.SETTINGS, msg.settings.toString()) + payload.put(Constants.LOCKED, msg.locked) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.INIT_LOCK_SETTINGS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING INIT LOCK SETTINGS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSetLockSettings(msg: SetLockSettings) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.SETTINGS, msg.settings.toString()) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SET_LOCK_SETTINGS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SET LOCK SETTINGS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetLockSettings(msg: GetLockSettings) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_LOCK_SETTINGS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET LOCK SETTINGS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleIsMeetingLocked(msg: IsMeetingLocked) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.IS_MEETING_LOCKED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING IS MEETING LOCKED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleValidateAuthToken(msg: ValidateAuthToken) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.AUTH_TOKEN, msg.token) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VALIDATE_AUTH_TOKEN) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VALIDATE AUTH TOKEN *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleRegisterUser(msg: RegisterUser) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.NAME, msg.name) + payload.put(Constants.ROLE, msg.role.toString()) + payload.put(Constants.EXT_USER_ID, msg.extUserID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.REGISTER_USER) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING REGISTER USER *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserJoining(msg: UserJoining) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_JOINING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING HANDLE USER JOINING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserLeaving(msg: UserLeaving) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_LEAVING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING HANDLE USER LEAVING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetUsers(msg: GetUsers) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_USERS) + + /** + * Let's temporarily have this convention as correlationId + */ + val replyTo = msg.meetingID + "/" + msg.requesterID + header.put(Constants.REPLY_TO, replyTo) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING HANDLE GET USERS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserRaiseHand(msg: UserRaiseHand) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.RAISE_HAND) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER RAISE HAND *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserLowerHand(msg: UserLowerHand) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.LOWERED_BY, msg.loweredBy) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.LOWER_HAND) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER LOWER HAND *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserShareWebcam(msg: UserShareWebcam) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.STREAM, msg.stream) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_SHARE_WEBCAM) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER SHARE WEBCAM *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserUnshareWebcam(msg: UserUnshareWebcam) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_UNSHARE_WEBCAM) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER UNSHARE WEBCAM *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleChangeUserStatus(msg: ChangeUserStatus) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.STATUS, msg.status) + payload.put(Constants.VALUE, msg.value) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.CHANGE_USER_STATUS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING CHANGE USER STATUS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleAssignPresenter(msg: AssignPresenter) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.NEW_PRESENTER_ID, msg.newPresenterID) + payload.put(Constants.NEW_PRESENTER_NAME, msg.newPresenterName) + payload.put(Constants.ASSIGNED_BY, msg.assignedBy) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.ASSIGN_PRESENTER) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING ASSIGN PRESENTER *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSetRecordingStatus(msg: SetRecordingStatus) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.RECORDING, msg.recording) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SET_RECORDING_STATUS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SET RECORDING STATUS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetChatHistoryRequest(msg: GetChatHistoryRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_CHAT_HISTORY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET CHAT HISTORY REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSendPublicMessageRequest(msg: SendPublicMessageRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val messageMap = new java.util.HashMap[String, String]() + for ((key, value) <- msg.message) { + messageMap.put(key, value) + } + payload.put("message", messageMap) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SEND_PUBLIC_MESSAGE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SEND PUBLIC MESSAGE REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSendPrivateMessageRequest(msg: SendPrivateMessageRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val messageMap = new java.util.HashMap[String, String]() + for ((key, value) <- msg.message) { + messageMap.put(key, value) + } + payload.put("message", messageMap) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SEND_PRIVATE_CHAT_MESSAGE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SEND PRIVATE MESSAGE REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetCurrentLayoutRequest(msg: GetCurrentLayoutRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_CURRENT_LAYOUT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET CURRENT LAYOUT REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSetLayoutRequest(msg: SetLayoutRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SET_LAYOUT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SET LAYOUT REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleLockLayoutRequest(msg: LockLayoutRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.LAYOUT_ID, msg.layoutID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.LOCK_LAYOUT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING LOCK LAYOUT REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUnlockLayoutRequest(msg: UnlockLayoutRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.UNLOCK_LAYOUT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING UNLOCK LAYOUT REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePreCreatedPoll(msg: PreCreatedPoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL, msg.poll) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.PRECREATED_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING PRE CREATED POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleCreatePoll(msg: CreatePoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL, msg.poll) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.CREATE_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING CREATE POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUpdatePoll(msg: UpdatePoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL, msg.poll) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.UPDATE_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING UPDATE POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetPolls(msg: GetPolls) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_POLLS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET POLLS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleDestroyPoll(msg: DestroyPoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.DESTROY_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING DESTROY POLLS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleRemovePoll(msg: RemovePoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.REMOVE_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING REMOVE POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSharePoll(msg: SharePoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SHARE_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SHARE POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleShowPollResult(msg: ShowPollResult) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SHOW_POLL_RESULT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SHOW POLL RESULTS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleHidePollResult(msg: HidePollResult) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.HIDE_POLL_RESULT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING HIDE POLL RESULTS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleStopPoll(msg: StopPoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.STOP_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING STOP POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleStartPoll(msg: StartPoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.START_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING START POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleClearPoll(msg: ClearPoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + payload.put(Constants.FORCE, msg.force) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.CLEAR_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING CLEAR POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetPollResult(msg: GetPollResult) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_POLL_RESULT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET POLL RESULT *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleRespondToPoll(msg: RespondToPoll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.RESPONSE, msg.response) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.RESPONT_TO_POLL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING RESPOND TO POLL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleClearPresentation(msg: ClearPresentation) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.CLEAR_PRESENTATION) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING CLEAR PRESENTATION *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleRemovePresentation(msg: RemovePresentation) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PRESENTATION_ID, msg.presentationID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.REMOVE_PRESENTATION) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING REMOVE PRESENTATION *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetPresentationInfo(msg: GetPresentationInfo) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_PRESENTATION_INFO) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET PRESENTATION INFO *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + /*private def handleSendCursorUpdate(msg: SendCursorUpdate) { + var map = new java.util.HashMap[String, Any]() + map.put("meetingID", msg.meetingID) + map.put("xPercent", msg.xPercent) + map.put("yPercent", msg.yPercent) + map.put("timestamp", TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SEND CURSOR UPDATE *****************") + dispatcher.dispatch(buildJson(header, payload)) + }*/ + + private def handleResizeAndMoveSlide(msg: ResizeAndMoveSlide) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.X_OFFSET, msg.xOffset) + payload.put(Constants.Y_OFFSET, msg.yOffset) + payload.put(Constants.WIDTH_RATIO, msg.widthRatio) + payload.put(Constants.HEIGHT_RATIO, msg.heightRatio) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.RESIZE_AND_MOVE_SLIDE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING RESIZE AND MOVE SLIDE *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGotoSlide(msg: GotoSlide) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PAGE, msg.page) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GO_TO_SLIDE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GO TO SLIDE *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSharePresentation(msg: SharePresentation) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PRESENTATION_ID, msg.presentationID) + payload.put(Constants.SHARE, msg.share) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SHARE_PRESENTATION) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SHARE PRESENTATION *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetSlideInfo(msg: GetSlideInfo) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_SLIDE_INFO) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET SLIDE INFO *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePreuploadedPresentations(msg: PreuploadedPresentations) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PRESENTATIONS, msg.presentations.toString()) //#todo not tested + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.PREUPLOADED_PRESENTATIONS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING PREUPLOADED PRESENTATIONS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePresentationConversionUpdate(msg: PresentationConversionUpdate) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE_KEY, msg.messageKey) + payload.put(Constants.CODE, msg.code) + payload.put(Constants.PRESENTATION_ID, msg.presentationId) + payload.put(Constants.PRESENTATION_NAME, msg.presName) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.PRESENTATION_CONVERSION_UPDATE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING PRESENTATION CONVERSION UPDATE *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePresentationPageCountError(msg: PresentationPageCountError) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE_KEY, msg.messageKey) + payload.put(Constants.CODE, msg.code) + payload.put(Constants.PRESENTATION_ID, msg.presentationId) + payload.put(Constants.PRESENTATION_NAME, msg.presName) + payload.put(Constants.NUM_PAGES, msg.numberOfPages) + payload.put(Constants.MAX_NUM_PAGES, msg.maxNumberPages) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.PRESENTATION_PAGE_COUNT_ERROR) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING PRESENTATION PAGE COUNT ERROR *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePresentationSlideGenerated(msg: PresentationSlideGenerated) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE_KEY, msg.messageKey) + payload.put(Constants.CODE, msg.code) + payload.put(Constants.PRESENTATION_ID, msg.presentationId) + payload.put(Constants.PRESENTATION_NAME, msg.presName) + payload.put(Constants.NUM_PAGES, msg.numberOfPages) + payload.put(Constants.PAGES_COMPLETED, msg.pagesCompleted) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.PRESENTATION_PAGE_GENERATED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING PRESENTATION SLIDE GENERATED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePresentationConversionCompleted(msg: PresentationConversionCompleted) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE_KEY, msg.messageKey) + payload.put(Constants.CODE, msg.code) + payload.put(Constants.PRESENTATION_ID, msg.presentation) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.PRESENTATION_CONVERSION_COMPLETED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING PRESENTATION CONVERSION COMPLETED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSendVoiceUsersRequest(msg: SendVoiceUsersRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SEND_VOICE_USERS_REQUEST) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SEND VOICE USERS REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleMuteMeetingRequest(msg: MuteMeetingRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.MUTE, msg.mute) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.MUTE_MEETING_REQUEST) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING MUTE MEETING REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleIsMeetingMutedRequest(msg: IsMeetingMutedRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.IS_MEETING_MUTED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING IS MEETING MUTED REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleMuteUserRequest(msg: MuteUserRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.MUTE, msg.mute) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.MUTE_USER) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING MUTE USER REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleLockUserRequest(msg: LockUserRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.LOCK, msg.lock) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.LOCK_USER) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING LOCK USER REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleEjectUserRequest(msg: EjectUserRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.USER_ID, msg.userID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.EJECT_USER) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING EJECT USER REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleVoiceUserJoinedMessage(msg: VoiceUserJoinedMessage) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER, msg.user.toString()) + payload.put(Constants.VOICE_CONF, msg.voiceConfId) + payload.put(Constants.CALLER_ID_NUM, msg.callerIdNum) + payload.put(Constants.CALLER_ID_NAME, msg.callerIdName) + payload.put(Constants.MUTED, msg.muted) + payload.put(Constants.TALKING, msg.talking) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VOICE_USER_JOINED_MESSAGE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VOICE USER JOINED MESSAGE *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleVoiceUserJoined(msg: VoiceUserJoined) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.VOICE_USER, msg.voiceUser) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VOICE_USER_JOINED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VOICE USER JOINED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleVoiceUserLeft(msg: VoiceUserLeft) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VOICE_USER_LEFT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VOICE USER LEFT *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleVoiceUserLocked(msg: VoiceUserLocked) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.LOCKED, msg.locked) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VOICE_USER_LOCKED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VOICE USER LOCKED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleVoiceUserMuted(msg: VoiceUserMuted) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.MUTED, msg.muted) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VOICE_USER_MUTED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VOICE USER MUTED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleVoiceUserTalking(msg: VoiceUserTalking) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.TALKING, msg.talking) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VOICE_USER_TALKING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VOICE USER TALKING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleVoiceRecording(msg: VoiceRecording) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDING_FILE, msg.recordingFile) + payload.put(Constants.TIMESTAMP, msg.timestamp) + payload.put(Constants.RECORDING, msg.recording) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VOICE_RECORDING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VOICE RECORDING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSendWhiteboardAnnotationRequest(msg: SendWhiteboardAnnotationRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.ANNOTATION, msg.annotation) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SEND_WHITEBOARD_ANNOTATION) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SEND WHITEBOARD ANNOTATION REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetWhiteboardShapesRequest(msg: GetWhiteboardShapesRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.WHITEBOARD_ID, msg.whiteboardId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_WHITEBOARD_SHAPES) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SEND WHITEBOARD SHAPES REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleClearWhiteboardRequest(msg: ClearWhiteboardRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.WHITEBOARD_ID, msg.whiteboardId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.CLEAR_WHITEBOARD) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING CLEAR WHITEBOARD REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUndoWhiteboardRequest(msg: UndoWhiteboardRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.WHITEBOARD_ID, msg.whiteboardId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.UNDO_WHITEBOARD) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING UNDO WHITEBOARD REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleEnableWhiteboardRequest(msg: EnableWhiteboardRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.ENABLE, msg.enable) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.ENABLE_WHITEBOARD) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING ENABLE WHITEBOARD REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleIsWhiteboardEnabledRequest(msg: IsWhiteboardEnabledRequest) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.IS_WHITEBOARD_ENABLED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING IS WHITEBOARD ENABLED REQUEST *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + // OUT MESSAGES + private def handleMeetingCreated(msg: MeetingCreated) { + val json = MeetingMessageToJsonConverter.meetingCreatedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleVoiceRecordingStarted(msg: VoiceRecordingStarted) { + val json = MeetingMessageToJsonConverter.voiceRecordingStartedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleVoiceRecordingStopped(msg: VoiceRecordingStopped) { + val json = MeetingMessageToJsonConverter.voiceRecordingStoppedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleRecordingStatusChanged(msg: RecordingStatusChanged) { + val json = MeetingMessageToJsonConverter.recordingStatusChangedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleGetRecordingStatusReply(msg: GetRecordingStatusReply) { + val json = MeetingMessageToJsonConverter.getRecordingStatusReplyToJson(msg) + dispatcher.dispatch(json) + } + + private def handleMeetingEnded(msg: MeetingEnded) { + val json = MeetingMessageToJsonConverter.meetingEndedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleMeetingHasEnded(msg: MeetingHasEnded) { + val json = MeetingMessageToJsonConverter.meetingHasEndedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleMeetingDestroyed(msg: MeetingDestroyed) { + val json = MeetingMessageToJsonConverter.meetingDestroyedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleDisconnectAllUsers(msg: DisconnectAllUsers) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.DISCONNECT_ALL_USERS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING DISCONNECT ALL USERS *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleDisconnectUser(msg: DisconnectUser) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.DISCONNECT_USER) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING DISCONNECT USER *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePermissionsSettingInitialized(msg: PermissionsSettingInitialized) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.LOCKED, msg.locked) + payload.put(Constants.SETTINGS, msg.settings.toString()) //#todo not tested + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.PERMISSION_SETTING_INITIALIZED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING PERMISSIONS SETTING INIIALIZED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleNewPermissionsSetting(msg: NewPermissionsSetting) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.SETTINGS, msg.settings.toString()) //#todo not tested + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.NEW_PERMISSION_SETTINGS) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING NEW PERMISSIONS SETTING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserLocked(msg: UserLocked) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.LOCKED, msg.lock) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_LOCKED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER LOCKED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUsersLocked(msg: UsersLocked) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.EXCEPT_USERS, msg.exceptUsers.toString()) + payload.put(Constants.LOCKED, msg.lock) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USERS_LOCKED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USERS LOCKED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetPermissionsSettingReply(msg: GetPermissionsSettingReply) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_PERMISSION_SETTINGS_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleIsMeetingLockedReply(msg: IsMeetingLockedReply) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.IS_MEETING_LOCKED_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING IS MEETING LOCKED REPLY *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserRegistered(msg: UserRegistered) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER, msg.user.toString()) + payload.put(Constants.RECORDED, msg.recorded) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_REGISTERED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER REGISTERED *****************") + dispatcher.dispatch(buildJson(header, payload)) + println("end of USER REGISTERED") + } + + private def handleUserLeft(msg: UserLeft) { + val json = UsersMessageToJsonConverter.userLeftToJson(msg) + dispatcher.dispatch(json) + } + + private def handlePresenterAssigned(msg: PresenterAssigned) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.NEW_PRESENTER_ID, msg.presenter.presenterID); + payload.put(Constants.NEW_PRESENTER_NAME, msg.presenter.presenterName); + payload.put(Constants.ASSIGNED_BY, msg.presenter.assignedBy); + payload.put(Constants.RECORDED, msg.recorded) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.PRESENTER_ASSIGNED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING PRESENTER ASSIGNED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleEndAndKickAll(msg: EndAndKickAll) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.END_AND_KICK_ALL) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING END AND KICK ALL *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetUsersReply(msg: GetUsersReply) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val users = new ArrayList[java.util.HashMap[String, Object]]; + msg.users.foreach(uvo => { + users.add(buildUserHashMap(uvo)) + }) + + payload.put(Constants.USERS, users) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_USERS_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET USERS REPLY *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleValidateAuthTokenReply(msg: ValidateAuthTokenReply) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterId) + payload.put(Constants.AUTH_TOKEN, msg.token) + payload.put(Constants.VALID, msg.valid) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.VALIDATE_AUTH_TOKEN_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING VALIDATE AUTH TOKEN REPLY *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserJoined(msg: UserJoined) { + val json = UsersMessageToJsonConverter.userJoinedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleUserRaisedHand(msg: UserRaisedHand) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RAISE_HAND, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_RAISED_HAND) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER RAISED HAND *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserLoweredHand(msg: UserLoweredHand) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RAISE_HAND, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.LOWERED_BY, msg.loweredBy) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_LOWERED_HAND) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER LOWERED HAND *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserSharedWebcam(msg: UserSharedWebcam) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.STREAM, msg.stream) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_SHARED_WEBCAM) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER SHARED WEBCAM *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserUnsharedWebcam(msg: UserUnsharedWebcam) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.STREAM, msg.stream) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_UNSHARED_WEBCAM) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER UNSHARED WEBCAM *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserStatusChange(msg: UserStatusChange) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.STATUS, msg.status) + payload.put(Constants.VALUE, msg.value) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_STATUS_CHANGED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER STATUS CHANGE *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleMuteVoiceUser(msg: MuteVoiceUser) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.MUTE, msg.mute) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.MUTE_VOICE_USER) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING MUTE VOICE USER *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserVoiceMuted(msg: UserVoiceMuted) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER, msg.user.toString()) + payload.put(Constants.VOICE_CONF, msg.confNum) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_VOICE_MUTED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER VOICE MUTED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserVoiceTalking(msg: UserVoiceTalking) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER, msg.user.toString()) + payload.put(Constants.VOICE_CONF, msg.confNum) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_VOICE_TALKING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER VOICE TALKING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleEjectVoiceUser(msg: EjectVoiceUser) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.EJECT_VOICE_USER) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING EJECT VOICE USER *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserJoinedVoice(msg: UserJoinedVoice) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER, msg.user.toString()) + payload.put(Constants.VOICE_CONF, msg.confNum) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_JOINED_VOICE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER JOINED VOICE *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUserLeftVoice(msg: UserLeftVoice) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER, msg.user.toString()) + payload.put(Constants.VOICE_CONF, msg.confNum) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.USER_LEFT_VOICE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING USER LEFT VOICE *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleIsMeetingMutedReply(msg: IsMeetingMutedReply) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.MUTED, msg.meetingMuted) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.IS_MEETING_MUTED_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING IS MEETING MUTED REPLY *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleStartRecording(msg: StartRecording) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.START_RECORDING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING START RECORDING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleStopRecording(msg: StopRecording) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.STOP_RECORDING) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING STOP RECORDING *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetChatHistoryReply(msg: GetChatHistoryReply) { + val json = ChatMessageToJsonConverter.getChatHistoryReplyToJson(msg) + dispatcher.dispatch(json) + } + + private def handleSendPublicMessageEvent(msg: SendPublicMessageEvent) { + val json = ChatMessageToJsonConverter.sendPublicMessageEventToJson(msg) + dispatcher.dispatch(json) + } + + private def handleSendPrivateMessageEvent(msg: SendPrivateMessageEvent) { + val json = ChatMessageToJsonConverter.sendPrivateMessageEventToJson(msg) + dispatcher.dispatch(json) + } + + private def handleGetCurrentLayoutReply(msg: GetCurrentLayoutReply) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.LAYOUT_ID, msg.layoutID) + payload.put(Constants.LOCKED, msg.locked) + payload.put(Constants.SET_BY_USER_ID, msg.setByUserID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_CURRENT_LAYOUT_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET CURRENT LAYOUT REPLY *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleSetLayoutEvent(msg: SetLayoutEvent) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.LAYOUT_ID, msg.layoutID) + payload.put(Constants.LOCKED, msg.locked) + payload.put(Constants.SET_BY_USER_ID, msg.setByUserID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.SET_LAYOUT_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING SET LAYOUT EVENT *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleLockLayoutEvent(msg: LockLayoutEvent) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.LAYOUT_ID, msg.layoutID) + payload.put(Constants.LOCKED, msg.locked) + payload.put(Constants.SET_BY_USER_ID, msg.setByUserID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.LOCK_LAYOUT_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING LOCK LAYOUT EVENT *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleUnlockLayoutEvent(msg: UnlockLayoutEvent) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.LAYOUT_ID, msg.layoutID) + payload.put(Constants.LOCKED, msg.locked) + payload.put(Constants.SET_BY_USER_ID, msg.setByUserID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.UNLOCK_LAYOUT_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING UNLOCK LAYOUT EVENT *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetPollResultReply(msg: GetPollResultReply) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.POLL, msg.pollVO) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_POLL_RESULT_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET POLL RESULT REPLY *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleGetPollsReplyOutMsg(msg: GetPollsReplyOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val collection = new ArrayList[PollVO](); + msg.polls.foreach(p => { + collection.add(p) + }) + + payload.put(Constants.POLLS, collection) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.GET_POLLS_REPLY) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING GET POLLS REPLY OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleClearPollFailed(msg: ClearPollFailed) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.REASON, msg.reason) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.CLEAR_POLL_FAILED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING CLEAR POLL FAILED *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollClearedOutMsg(msg: PollClearedOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_CLEARED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL CLEARED OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollStartedOutMsg(msg: PollStartedOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_STARTED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL STARTED OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollStoppedOutMsg(msg: PollStoppedOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_STOPPED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL STOPPED OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollRemovedOutMsg(msg: PollRemovedOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_REMOVED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL REMOVED OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollUpdatedOutMsg(msg: PollUpdatedOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + payload.put(Constants.POLL, msg.pollVO) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_UPDATED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL UPDATED OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollCreatedOutMsg(msg: PollCreatedOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + payload.put(Constants.POLL, msg.pollVO) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_CREATED) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL CREATED OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollResponseOutMsg(msg: PollResponseOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RESPONDER, msg.responder) + payload.put(Constants.RESPONSE, msg.response) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_RESPONSE) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL RESPONSE OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollHideResultOutMsg(msg: PollHideResultOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_HIDE_RESULT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL HIDE RESULT OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handlePollShowResultOutMsg(msg: PollShowResultOutMsg) { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.POLL_ID, msg.pollID) + + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, MessageNames.POLL_SHOW_RESULT) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + + println("***** DISPATCHING POLL SHOW RESULT OUTMSG *****************") + dispatcher.dispatch(buildJson(header, payload)) + } + + private def handleClearPresentationOutMsg(msg: ClearPresentationOutMsg) { + val json = PesentationMessageToJsonConverter.clearPresentationOutMsgToJson(msg) + dispatcher.dispatch(json) + } + + private def handleRemovePresentationOutMsg(msg: RemovePresentationOutMsg) { + val json = PesentationMessageToJsonConverter.removePresentationOutMsgToJson(msg) + dispatcher.dispatch(json) + } + + private def handleGetPresentationInfoOutMsg(msg: GetPresentationInfoOutMsg) { + val json = PesentationMessageToJsonConverter.getPresentationInfoOutMsgToJson(msg) + dispatcher.dispatch(json) + } + + private def handleSendCursorUpdateOutMsg(msg: SendCursorUpdateOutMsg) { + val json = PesentationMessageToJsonConverter.sendCursorUpdateOutMsgToJson(msg) + // Comment out as we don't want to store cursor updates (ralam may 7, 2014) + //dispatcher.dispatch(json) + } + + private def handleResizeAndMoveSlideOutMsg(msg: ResizeAndMoveSlideOutMsg) { + val json = PesentationMessageToJsonConverter.resizeAndMoveSlideOutMsgToJson(msg) + dispatcher.dispatch(json) + } + + private def handleGotoSlideOutMsg(msg: GotoSlideOutMsg) { + val json = PesentationMessageToJsonConverter.gotoSlideOutMsgToJson(msg) + dispatcher.dispatch(json) + } + + private def handleSharePresentationOutMsg(msg: SharePresentationOutMsg) { + val json = PesentationMessageToJsonConverter.sharePresentationOutMsgToJson(msg) + dispatcher.dispatch(json) + } + + private def handleGetSlideInfoOutMsg(msg: GetSlideInfoOutMsg) { + val json = PesentationMessageToJsonConverter.getSlideInfoOutMsgToJson(msg) + dispatcher.dispatch(json) + } + + private def handleGetPreuploadedPresentationsOutMsg(msg: GetPreuploadedPresentationsOutMsg) { + val json = PesentationMessageToJsonConverter.getPreuploadedPresentationsOutMsgToJson(msg) + dispatcher.dispatch(json) + } + + private def handlePresentationConversionProgress(msg: PresentationConversionProgress) { + val json = PesentationMessageToJsonConverter.presentationConversionProgressToJson(msg) + dispatcher.dispatch(json) + } + + private def handlePresentationConversionError(msg: PresentationConversionError) { + val json = PesentationMessageToJsonConverter.presentationConversionErrorToJson(msg) + dispatcher.dispatch(json) + } + + private def handlePresentationPageGenerated(msg: PresentationPageGenerated) { + val json = PesentationMessageToJsonConverter.presentationPageGenerated(msg) + dispatcher.dispatch(json) + } + + private def handlePresentationConversionDone(msg: PresentationConversionDone) { + val json = PesentationMessageToJsonConverter.presentationConversionDoneToJson(msg) + dispatcher.dispatch(json) + } + + private def handlePresentationChanged(msg: PresentationChanged) { + val json = PesentationMessageToJsonConverter.presentationChangedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleGetPresentationStatusReply(msg: GetPresentationStatusReply) { + val json = PesentationMessageToJsonConverter.getPresentationStatusReplyToJson(msg) + dispatcher.dispatch(json) + } + + private def handlePresentationRemoved(msg: PresentationRemoved) { + val json = PesentationMessageToJsonConverter.presentationRemovedToJson(msg) + dispatcher.dispatch(json) + } + + private def handlePageChanged(msg: PageChanged) { + val json = PesentationMessageToJsonConverter.pageChangedToJson(msg) + dispatcher.dispatch(json) + } + + private def handleGetWhiteboardShapesReply(msg: GetWhiteboardShapesReply) { + val json = WhiteboardMessageToJsonConverter.getWhiteboardShapesReplyToJson(msg) + dispatcher.dispatch(json) + } + + private def handleSendWhiteboardAnnotationEvent(msg: SendWhiteboardAnnotationEvent) { + val json = WhiteboardMessageToJsonConverter.sendWhiteboardAnnotationEventToJson(msg) + dispatcher.dispatch(json) + } + + private def handleClearWhiteboardEvent(msg: ClearWhiteboardEvent) { + val json = WhiteboardMessageToJsonConverter.clearWhiteboardEventToJson(msg) + dispatcher.dispatch(json) + } + + private def handleUndoWhiteboardEvent(msg: UndoWhiteboardEvent) { + val json = WhiteboardMessageToJsonConverter.undoWhiteboardEventToJson(msg) + dispatcher.dispatch(json) + } + + private def handleWhiteboardEnabledEvent(msg: WhiteboardEnabledEvent) { + val json = WhiteboardMessageToJsonConverter.whiteboardEnabledEventToJson(msg) + dispatcher.dispatch(json) + } + + private def handleIsWhiteboardEnabledReply(msg: IsWhiteboardEnabledReply) { + val json = WhiteboardMessageToJsonConverter.isWhiteboardEnabledReplyToJson(msg) + dispatcher.dispatch(json) + } +} diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorGateway.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorGateway.scala new file mode 100755 index 0000000000..dd32081aec --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorGateway.scala @@ -0,0 +1,21 @@ +package org.bigbluebutton.core + +import org.bigbluebutton.core.api.IDispatcher +import org.bigbluebutton.core.api.InMessage +import org.bigbluebutton.core.api.IOutMessage +import org.bigbluebutton.core.api.OutMessageListener2 + +class CollectorGateway(dispatcher: IDispatcher) extends OutMessageListener2 { + + private val collActor = new CollectorActor(dispatcher) + + collActor.start + + def collectInMessage(msg: InMessage) { + collActor ! msg + } + + def handleMessage(msg: IOutMessage) { + collActor ! msg + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala new file mode 100644 index 0000000000..151d490524 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala @@ -0,0 +1,169 @@ +package org.bigbluebutton.core + +import scala.actors.Actor +import scala.actors.Actor._ +import org.bigbluebutton.core.apps.poll.PollApp +import org.bigbluebutton.core.apps.poll.Poll +import org.bigbluebutton.core.apps.poll.PollApp +import org.bigbluebutton.core.apps.users.UsersApp +import org.bigbluebutton.core.api._ +import org.bigbluebutton.core.apps.presentation.PresentationApp +import org.bigbluebutton.core.apps.layout.LayoutApp +import org.bigbluebutton.core.apps.chat.ChatApp +import org.bigbluebutton.core.apps.whiteboard.WhiteboardApp +import scala.actors.TIMEOUT + +case object StopMeetingActor + +class MeetingActor(val meetingID: String, meetingName: String, val recorded: Boolean, + val voiceBridge: String, duration: Long, val outGW: MessageOutGateway) + extends Actor with UsersApp with PresentationApp + with PollApp with LayoutApp with ChatApp + with WhiteboardApp { + + var permissionsInited = false + var permissions = new PermissionsSetting(new Permissions()) + var recording = false; + var muted = false; + var meetingEnded = false + + class TimerActor(val timeout: Long, val who: Actor, val reply: String) extends Actor { + def act { + reactWithin(timeout) { + case TIMEOUT => who ! reply + } + } + } + + def act() = { + loop { + react { + case "StartTimer" => handleStartTimer + case "Hello" => handleHello + case msg: ValidateAuthToken => handleValidateAuthToken(msg) + case msg: RegisterUser => handleRegisterUser(msg) + case msg: VoiceUserJoined => handleVoiceUserJoined(msg) + case msg: VoiceUserLeft => handleVoiceUserLeft(msg) + case msg: VoiceUserMuted => handleVoiceUserMuted(msg) + case msg: VoiceUserTalking => handleVoiceUserTalking(msg) + case msg: UserJoining => handleUserJoin(msg) + case msg: UserLeaving => handleUserLeft(msg) + case msg: AssignPresenter => handleAssignPresenter(msg) + case msg: GetUsers => handleGetUsers(msg) + case msg: ChangeUserStatus => handleChangeUserStatus(msg) + case msg: UserRaiseHand => handleUserRaiseHand(msg) + case msg: UserLowerHand => handleUserLowerHand(msg) + case msg: UserShareWebcam => handleUserShareWebcam(msg) + case msg: UserUnshareWebcam => handleUserunshareWebcam(msg) + case msg: MuteMeetingRequest => handleMuteMeetingRequest(msg) + case msg: IsMeetingMutedRequest => handleIsMeetingMutedRequest(msg) + case msg: MuteUserRequest => handleMuteUserRequest(msg) + case msg: LockUserRequest => handleLockUserRequest(msg) + case msg: EjectUserRequest => handleEjectUserRequest(msg) + case msg: SetLockSettings => handleSetLockSettings(msg) + case msg: InitLockSettings => handleInitLockSettings(msg) + case msg: LockUser => handleLockUser(msg) + case msg: LockAllUsers => handleLockAllUsers(msg) + case msg: GetLockSettings => handleGetLockSettings(msg) + case msg: IsMeetingLocked => handleIsMeetingLocked(msg) + case msg: GetChatHistoryRequest => handleGetChatHistoryRequest(msg) + case msg: SendPublicMessageRequest => handleSendPublicMessageRequest(msg) + case msg: SendPrivateMessageRequest => handleSendPrivateMessageRequest(msg) + case msg: UserConnectedToGlobalAudio => handleUserConnectedToGlobalAudio(msg) + case msg: UserDisconnectedFromGlobalAudio => handleUserDisconnectedFromGlobalAudio(msg) + case msg: GetCurrentLayoutRequest => handleGetCurrentLayoutRequest(msg) + case msg: SetLayoutRequest => handleSetLayoutRequest(msg) + case msg: LockLayoutRequest => handleLockLayoutRequest(msg) + case msg: UnlockLayoutRequest => handleUnlockLayoutRequest(msg) + case msg: InitializeMeeting => handleInitializeMeeting(msg) + case msg: ClearPresentation => handleClearPresentation(msg) + case msg: PresentationConversionUpdate => handlePresentationConversionUpdate(msg) + case msg: PresentationPageCountError => handlePresentationPageCountError(msg) + case msg: PresentationSlideGenerated => handlePresentationSlideGenerated(msg) + case msg: PresentationConversionCompleted => handlePresentationConversionCompleted(msg) + case msg: RemovePresentation => handleRemovePresentation(msg) + case msg: GetPresentationInfo => handleGetPresentationInfo(msg) + case msg: SendCursorUpdate => handleSendCursorUpdate(msg) + case msg: ResizeAndMoveSlide => handleResizeAndMoveSlide(msg) + case msg: GotoSlide => handleGotoSlide(msg) + case msg: SharePresentation => handleSharePresentation(msg) + case msg: GetSlideInfo => handleGetSlideInfo(msg) + case msg: PreuploadedPresentations => handlePreuploadedPresentations(msg) + case msg: PreCreatedPoll => handlePreCreatedPoll(msg) + case msg: CreatePoll => handleCreatePoll(msg) + case msg: UpdatePoll => handleUpdatePoll(msg) + case msg: DestroyPoll => handleDestroyPoll(msg) + case msg: RemovePoll => handleRemovePoll(msg) + case msg: SharePoll => handleSharePoll(msg) + case msg: StopPoll => handleStopPoll(msg) + case msg: StartPoll => handleStartPoll(msg) + case msg: ClearPoll => handleClearPoll(msg) + case msg: GetPolls => handleGetPolls(msg) + case msg: RespondToPoll => handleRespondToPoll(msg) + case msg: HidePollResult => handleHidePollResult(msg) + case msg: ShowPollResult => handleShowPollResult(msg) + case msg: SendWhiteboardAnnotationRequest => handleSendWhiteboardAnnotationRequest(msg) + case msg: GetWhiteboardShapesRequest => handleGetWhiteboardShapesRequest(msg) + case msg: ClearWhiteboardRequest => handleClearWhiteboardRequest(msg) + case msg: UndoWhiteboardRequest => handleUndoWhiteboardRequest(msg) + case msg: EnableWhiteboardRequest => handleEnableWhiteboardRequest(msg) + case msg: IsWhiteboardEnabledRequest => handleIsWhiteboardEnabledRequest(msg) + case msg: SetRecordingStatus => handleSetRecordingStatus(msg) + case msg: GetRecordingStatus => handleGetRecordingStatus(msg) + case msg: VoiceRecording => handleVoiceRecording(msg) + + case msg: EndMeeting => handleEndMeeting(msg) + case StopMeetingActor => exit + case _ => // do nothing + } + } + } + + def hasMeetingEnded():Boolean = { + meetingEnded + } + + private def handleStartTimer() { + println("***************timer started******************") +// val timerActor = new TimerActor(2000, self, "Hello") +// timerActor.start + } + + private def handleHello() { + println("***************hello received on [" + System.currentTimeMillis() + "]******************") + +// val timerActor = new TimerActor(2000, self, "Hello") +// timerActor.start + } + + def sendMeetingHasEnded(userId: String) { + outGW.send(new MeetingHasEnded(meetingID, userId)) + outGW.send(new DisconnectUser(meetingID, userId)) + } + + private def handleEndMeeting(msg: EndMeeting) { + meetingEnded = true + outGW.send(new MeetingEnded(msg.meetingID, recorded, voiceBridge)) + outGW.send(new DisconnectAllUsers(msg.meetingID)) + } + + private def handleVoiceRecording(msg: VoiceRecording) { + if (msg.recording) { + outGW.send(new VoiceRecordingStarted(meetingID, + recorded, msg.recordingFile, + msg.timestamp, voiceBridge)) + } else { + outGW.send(new VoiceRecordingStopped(meetingID, recorded, + msg.recordingFile, msg.timestamp, voiceBridge)) + } + } + + private def handleSetRecordingStatus(msg: SetRecordingStatus) { + recording = msg.recording + outGW.send(new RecordingStatusChanged(meetingID, recorded, msg.userId, msg.recording)) + } + + private def handleGetRecordingStatus(msg: GetRecordingStatus) { + outGW.send(new GetRecordingStatusReply(meetingID, recorded, msg.userId, recording.booleanValue())) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/User.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/User.scala new file mode 100755 index 0000000000..56ce8df5fb --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/User.scala @@ -0,0 +1,29 @@ +package org.bigbluebutton.core + +import org.bigbluebutton.core.api.UserVO +import org.bigbluebutton.core.api.Role._ + +class User(val intUserID: String, val extUserID: String, val name: String, val role: Role) { + + private var presenter = false + private var handRaised = false + private var hasStream = false + private var voiceId:String = _ + private var muted = false + private var talking = false + private var locked = false + + def isPresenter():Boolean = { + return presenter; + } + + def becomePresenter() { + presenter = true + } + + def unbecomePresenter() { + presenter = false + } +} + +case class VoiceUser(userId: String, muted: Boolean=false, talking: Boolean=false, locked: Boolean=false) diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ConsoleDispatcher.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ConsoleDispatcher.scala new file mode 100755 index 0000000000..df46b038da --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ConsoleDispatcher.scala @@ -0,0 +1,8 @@ +package org.bigbluebutton.core.api + +class ConsoleDispatcher extends IDispatcher { + + def dispatch(jsonMessage: String) { + println(jsonMessage) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala new file mode 100755 index 0000000000..434743bcc0 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala @@ -0,0 +1,89 @@ +package org.bigbluebutton.core.api + +object Constants { + val NAME = "name" + val HEADER = "header" + val PAYLOAD = "payload" + val MEETING_ID = "meeting_id" + val TIMESTAMP = "timestamp" + val USER_ID = "userid" + val RECORDED = "recorded" + val MEETING_NAME = "meeting_name" + val VOICE_CONF = "voice_conf" + val DURATION = "duration" + val AUTH_TOKEN = "auth_token" + val ROLE = "role" + val EXT_USER_ID = "external_user_id" + val REQUESTER_ID = "requester_id" + val REPLY_TO = "reply_to" + val LOWERED_BY = "lowered_by" + val STREAM = "stream" + val LOCKED = "locked" + val SETTINGS = "settings" + val LOCK = "lock" + val EXCEPT_USERS = "except_users" + val STATUS = "status" + val VALUE = "value" + val NEW_PRESENTER_ID = "new_presenter_id" + val NEW_PRESENTER_NAME = "new_presenter_name" + val ASSIGNED_BY = "assigned_by" + val RECORDING = "recording" + val LAYOUT_ID = "layout_id" + val POLL = "poll" + val POLL_ID = "poll_id" + val FORCE = "force" + val RESPONSE = "response" + val PRESENTATION_ID = "presentation_id" + val X_OFFSET = "x_offset" + val Y_OFFSET = "y_offset" + val WIDTH_RATIO = "width_ratio" + val HEIGHT_RATIO = "height_ratio" + val PAGE = "page" + val SHARE = "share" + val PRESENTATIONS = "presentations" + val MESSAGE_KEY = "message_key" + val CODE = "code" + val PRESENTATION_NAME = "presentation_name" + val NUM_PAGES = "num_pages" + val MAX_NUM_PAGES = "max_num_pages" + val PAGES_COMPLETED = "pages_completed" + val MUTE = "mute" + val CALLER_ID_NUM = "caller_id_num" + val CALLER_ID_NAME = "caller_id_name" + val TALKING = "talking" + val USER = "user" + val MUTED = "muted" + val VOICE_USER = "voice_user" + val RECORDING_FILE = "recording_file" + val ANNOTATION = "annotation" + val WHITEBOARD_ID = "whiteboard_id" + val ENABLE = "enable" + val PRESENTER = "presenter" + val USERS = "users" + val RAISE_HAND = "raise_hand" + val HAS_STREAM = "has_stream" + val WEBCAM_STREAM = "webcam_stream" + val PHONE_USER = "phone_user" + val PERMISSIONS = "permissions" + val VALID = "valid" + val CHAT_HISTORY = "chat_history" + val MESSAGE = "message" + val SET_BY_USER_ID = "set_by_user_id" + val POLLS = "polls" + val REASON = "reason" + val RESPONDER = "responder" + val PRESENTATION_INFO = "presentation_info" + val SHAPES = "shapes" + val SHAPE = "shape" + val SHAPE_ID = "shape_id" + val PRESENTATION = "presentation" + val ID = "id" + val CURRENT = "current" + val PAGES = "pages" + val WEB_USER_ID = "web_user_id" + val JOINED = "joined" + val X_PERCENT = "x_percent" + val Y_PERCENT = "y_percent" + val KEEP_ALIVE_ID = "keep_alive_id" + val LISTEN_ONLY = "listen_only" +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala new file mode 100644 index 0000000000..5c37178afd --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala @@ -0,0 +1,498 @@ +package org.bigbluebutton.core.api + +import org.bigbluebutton.core.api.Role._ +import org.bigbluebutton.core.apps.poll._ +import org.bigbluebutton.core.apps.whiteboard.vo.AnnotationVO +import org.bigbluebutton.core.apps.presentation.Presentation + +trait InMessage {val meetingID: String} + +case class KeepAliveMessage +( + aliveID:String +) + +case class CreateMeeting +( + meetingID: String, + meetingName: String, + recorded: Boolean, + voiceBridge: String, + duration: Long +) extends InMessage + +case class InitializeMeeting( + meetingID: String, + recorded: Boolean) extends InMessage + +case class DestroyMeeting( + meetingID: String) extends InMessage + +case class StartMeeting( + meetingID: String) extends InMessage + +case class EndMeeting( + meetingID: String) extends InMessage + +case class LockSetting( + meetingID: String, + locked: Boolean, + settings: Map[String, Boolean]) extends InMessage + +// Lock +case class LockUser( + meetingID: String, + userId: String, + lock: Boolean) extends InMessage + +case class LockAllUsers( + meetingID: String, + lock: Boolean, + exceptUsers: Seq[String]) extends InMessage + +case class InitLockSettings( + meetingID: String, + locked: Boolean, + settings: PermissionsSetting) extends InMessage + +case class SetLockSettings( + meetingID: String, + setByUser: String, + settings: PermissionsSetting +) extends InMessage + +case class GetLockSettings( + meetingID: String, + userId: String +) extends InMessage + +case class IsMeetingLocked( + meetingID: String, + userId: String +) extends InMessage + + +// Users +case class ValidateAuthToken( + meetingID: String, + userId: String, + token: String, + correlationId: String) extends InMessage + +case class RegisterUser( + meetingID: String, + userID: String, + name: String, + role: Role, + extUserID: String, + authToken: String +) extends InMessage + +case class UserJoining( + meetingID: String, + userID: String +) extends InMessage + +case class UserLeaving( + meetingID: String, + userID: String +) extends InMessage + +case class GetUsers( + meetingID: String, + requesterID: String +) extends InMessage + +case class UserRaiseHand( + meetingID: String, + userId: String +) extends InMessage + +case class UserLowerHand( + meetingID: String, + userId: String, + loweredBy: String +) extends InMessage + +case class UserShareWebcam( + meetingID: String, + userId: String, + stream: String +) extends InMessage + +case class UserUnshareWebcam( + meetingID: String, + userId: String +) extends InMessage + +case class ChangeUserStatus( + meetingID: String, + userID: String, + status: String, + value: Object +) extends InMessage + +case class AssignPresenter( + meetingID: String, + newPresenterID: String, + newPresenterName: String, + assignedBy: String +) extends InMessage + +case class SetRecordingStatus( + meetingID: String, + userId: String, + recording: Boolean +) extends InMessage + +case class GetRecordingStatus( + meetingID: String, + userId: String +) extends InMessage + +// Chat +case class GetChatHistoryRequest( + meetingID: String, + requesterID: String, + replyTo: String +) extends InMessage + +case class SendPublicMessageRequest( + meetingID: String, + requesterID: String, + message: Map[String, String] +) extends InMessage + +case class SendPrivateMessageRequest( + meetingID: String, + requesterID: String, + message: Map[String, String] +) extends InMessage + +case class UserConnectedToGlobalAudio( + meetingID: String, /** Not used. Just to satisfy trait **/ + voiceConf: String, + userid: String, + name: String +) extends InMessage + +case class UserDisconnectedFromGlobalAudio( + meetingID: String, /** Not used. Just to satisfy trait **/ + voiceConf: String, + userid: String, + name: String +) extends InMessage + +// Layout +case class GetCurrentLayoutRequest( + meetingID: String, + requesterID: String +) extends InMessage + +case class SetLayoutRequest( + meetingID: String, + requesterID: String, + layoutID: String +) extends InMessage + +case class LayoutLockSettings( + meetingID: String, + requesterId: String, + locked: Boolean +) extends InMessage + +case class LockLayoutRequest( + meetingID: String, + requesterID: String, + layoutID: String +) extends InMessage + +case class UnlockLayoutRequest( + meetingID: String, + requesterID: String +) extends InMessage + +// Poll +case class PreCreatedPoll( + meetingID: String, + poll: PollVO +) extends InMessage + +case class CreatePoll( + meetingID: String, + requesterID: String, + poll: PollVO +) extends InMessage + +case class UpdatePoll( + meetingID: String, + requesterID: String, + poll: PollVO +) extends InMessage + +case class GetPolls( + meetingID: String, + requesterID: String +) extends InMessage + +case class DestroyPoll( + meetingID: String, + requesterID: String, + pollID: String +) extends InMessage + +case class RemovePoll( + meetingID: String, + requesterID: String, + pollID: String +) extends InMessage + +case class SharePoll( + meetingID: String, + requesterID: String, + pollID: String +) extends InMessage + +case class ShowPollResult( + meetingID: String, + requesterID: String, + pollID: String +) extends InMessage + +case class HidePollResult( + meetingID: String, + requesterID: String, + pollID: String +) extends InMessage + +case class StopPoll( + meetingID:String, + requesterID: String, + pollID: String +) extends InMessage + +case class StartPoll( + meetingID:String, + requesterID: String, + pollID: String +) extends InMessage + +case class ClearPoll( + meetingID: String, + requesterID: String, + pollID: String, + force: Boolean=false +) extends InMessage + +case class GetPollResult( + meetingID:String, + requesterID: String, + pollID: String +) extends InMessage + +case class RespondToPoll( + meetingID: String, + requesterID: String, + response: PollResponseVO +) extends InMessage + +// Presentation +case class ClearPresentation( + meetingID: String +) extends InMessage + +case class RemovePresentation( + meetingID: String, + presentationID: String +) extends InMessage + +case class GetPresentationInfo( + meetingID: String, + requesterID: String, + replyTo:String +) extends InMessage + +case class SendCursorUpdate( + meetingID: String, + xPercent: Double, + yPercent: Double +) extends InMessage + +case class ResizeAndMoveSlide( + meetingID: String, + xOffset: Double, + yOffset: Double, + widthRatio: Double, + heightRatio: Double +) extends InMessage + +case class GotoSlide( + meetingID: String, + page: String +) extends InMessage + +case class SharePresentation( + meetingID: String, + presentationID: String, + share: Boolean +) extends InMessage + +case class GetSlideInfo( + meetingID: String, + requesterID: String, + replyTo: String +) extends InMessage + +case class PreuploadedPresentations( + meetingID: String, + presentations: Seq[Presentation] +) extends InMessage + +case class PresentationConversionUpdate( + meetingID: String, + messageKey: String, + code: String, + presentationId: String, + presName: String +) extends InMessage + +case class PresentationPageCountError( + meetingID: String, + messageKey: String, + code: String, + presentationId: String, + numberOfPages: Int, + maxNumberPages: Int, + presName: String +) extends InMessage + +case class PresentationSlideGenerated( + meetingID: String, + messageKey: String, + code: String, + presentationId: String, + numberOfPages: Int, + pagesCompleted: Int, + presName: String +) extends InMessage + +case class PresentationConversionCompleted( + meetingID: String, + messageKey: String, + code: String, + presentation: Presentation +) extends InMessage + +// Voice +case class SendVoiceUsersRequest( + meetingID: String, + requesterID: String) extends InMessage + +case class MuteMeetingRequest( + meetingID: String, + requesterID: String, + mute: Boolean) extends InMessage + +case class IsMeetingMutedRequest( + meetingID: String, + requesterID: String) extends InMessage + +case class MuteUserRequest( + meetingID: String, + requesterID: String, + userID: String, + mute: Boolean) extends InMessage + +case class LockUserRequest( + meetingID: String, + requesterID: String, + userID: String, + lock: Boolean) extends InMessage + +case class EjectUserRequest( + meetingID: String, + requesterID: String, + userID: String) extends InMessage + +case class VoiceUserJoinedMessage( + meetingID: String, + user: String, + voiceConfId: String, + callerIdNum: String, + callerIdName: String, + muted: Boolean, + talking: Boolean) extends InMessage + + +case class VoiceUserJoined( + meetingID: String, + voiceUser: VoiceUser +) extends InMessage + +case class VoiceUserLeft( + meetingID: String, + userId: String +) extends InMessage + +case class VoiceUserLocked( + meetingID: String, + userId: String, + locked: Boolean +) extends InMessage + +case class VoiceUserMuted( + meetingID: String, + userId: String, + muted: Boolean +) extends InMessage + +case class VoiceUserTalking( + meetingID: String, + userId: String, + talking: Boolean +) extends InMessage + +case class VoiceRecording( + meetingID: String, + recordingFile: String, + timestamp: String, + recording: Boolean +) extends InMessage + +// Whiteboard +case class SendWhiteboardAnnotationRequest( + meetingID: String, + requesterID: String, + annotation: AnnotationVO +) extends InMessage + +case class GetWhiteboardShapesRequest( + meetingID: String, + requesterID: String, + whiteboardId: String, + replyTo: String +) extends InMessage + +case class ClearWhiteboardRequest( + meetingID: String, + requesterID: String, + whiteboardId: String +) extends InMessage + +case class UndoWhiteboardRequest( + meetingID: String, + requesterID: String, + whiteboardId: String +) extends InMessage + +case class EnableWhiteboardRequest( + meetingID: String, + requesterID: String, + enable: Boolean +) extends InMessage + +case class IsWhiteboardEnabledRequest( + meetingID: String, + requesterID: String, + replyTo: String +) extends InMessage diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala new file mode 100755 index 0000000000..5a58b21806 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala @@ -0,0 +1,162 @@ +package org.bigbluebutton.core.api + +object MessageNames { + val CREATE_MEETING = "create_meeting_request" + val INITIALIZE_MEETING = "initialize_meeting_request" + val DESTROY_MEETING = "destroy_meeting_request" + val START_MEETING = "start_meeting_request" + val END_MEETING = "end_meeting_request" + val LOCK_SETTING = "lock_setting_request" + val LOCK_USER = "lock_user_request" + val INIT_LOCK_SETTINGS = "init_lock_settings" + val SET_LOCK_SETTINGS = "set_lock_settings" + val GET_LOCK_SETTINGS = "get_lock_settings" + val IS_MEETING_LOCKED = "is_meeting_locked" + val VALIDATE_AUTH_TOKEN = "validate_auth_token_request" + val VALIDATE_AUTH_TOKEN_REPLY = "validate_auth_token_reply" + val REGISTER_USER = "register_user_request" + val USER_JOINING = "user_joining_request" + val USER_LEAVING = "user_leaving_request" + val GET_USERS = "get_users_request" + val RAISE_HAND = "user_raise_hand_request" + val LOWER_HAND = "user_lower_hand_request" + val USER_SHARE_WEBCAM = "user_share_webcam_request" + val USER_UNSHARE_WEBCAM = "user_unshare_webcam_request" + val CHANGE_USER_STATUS = "change_user_status_request" + val ASSIGN_PRESENTER = "assign_presenter_request" + val SET_RECORDING_STATUS = "set_recording_status_request" + val GET_CHAT_HISTORY = "get_chat_history_request" + val SEND_PUBLIC_MESSAGE = "send_public_chat_message_request" + val SEND_PRIVATE_MESSAGE = "send_private_chat_message_request" + val GET_CURRENT_LAYOUT = "get_current_layout_request" + val SET_LAYOUT = "set_layout_request" + val LOCK_LAYOUT = "lock_layout_request" + val UNLOCK_LAYOUT = "unlock_layout_request" + val PRECREATED_POLL = "precreated_poll_request" + val CREATE_POLL = "create_poll_request" + val UPDATE_POLL = "update_poll_request" + val GET_POLLS = "get_polls_request" + val DESTROY_POLL = "destroy_poll_request" + val REMOVE_POLL = "remove_poll_request" + val SHARE_POLL = "share_poll_request" + val SHOW_POLL_RESULT = "show_poll_result_request" + val HIDE_POLL_RESULT = "hide_poll_result_request" + val START_POLL = "start_poll_request" + val STOP_POLL = "stop_poll_request" + val CLEAR_POLL = "clear_poll_request" + val GET_POLL_RESULT = "get_poll_result_request" + val RESPONT_TO_POLL = "respond_to_poll_request" + val CLEAR_PRESENTATION = "clear_presentation_request" + val REMOVE_PRESENTATION = "remove_presentation_request" + val GET_PRESENTATION_INFO = "get_presentation_info_request" + val RESIZE_AND_MOVE_SLIDE = "resize_and_move_slide_request" + val GO_TO_SLIDE = "go_to_slide_request" + val SHARE_PRESENTATION = "share_presentation_request" + val GET_SLIDE_INFO = "get_slide_info_request" + val GET_SLIDE_INFO_REPLY = "get_slide_info_reply" + val PREUPLOADED_PRESENTATIONS = "preuploaded_presentation_request" + val PRESENTATION_CONVERSION_UPDATE = "presentation_conversion_update_message" + val PRESENTATION_PAGE_COUNT_ERROR = "presentation_page_count_error_message" + val PRESENTATION_SLIDE_GENERATED = "presentation_slide_generated_message" + val PRESENTATION_CONVERSION_COMPLETED = "presentation_conversion_completed_message" + val PRESENTATION_CURSOR_UPDATED = "presentation_cursor_updated_message" + val SEND_VOICE_USERS_REQUEST = "send_voice_users_request" + val MUTE_MEETING_REQUEST = "mute_meeting_request" + val IS_MEETING_MUTED = "is_meeting_muted_request" + val MUTE_USER = "mute_user_request" + val EJECT_USER = "eject_user_request" + val VOICE_USER_JOINED_MESSAGE = "voice_user_joined_message" + val VOICE_USER_JOINED = "voice_user_joined" + val VOICE_USER_LEFT = "voice_user_left_message" + val VOICE_USER_LOCKED = "voice_user_locked_message" + val VOICE_USER_MUTED = "voice_user_muted_message" + val VOICE_USER_TALKING = "voice_user_talking_message" + val VOICE_RECORDING = "voice_recording_message" + val SEND_WHITEBOARD_ANNOTATION = "send_whiteboard_annotation_request" + val GET_WHITEBOARD_SHAPES = "get_whiteboard_shapes_request" + val CLEAR_WHITEBOARD = "clear_whiteboard_request" + val UNDO_WHITEBOARD = "undo_whiteboard_request" + val ENABLE_WHITEBOARD = "enable_whiteboard_request" + val IS_WHITEBOARD_ENABLED = "is_whiteboard_enabled_request" + + // OUT MESSAGES + val MEETING_CREATED = "meeting_created_message" + val VOICE_RECORDING_STARTED = "voice_recording_started_message" + val VOICE_RECORDING_STOPPED = "voice_recording_stopped_message" + val RECORDING_STATUS_CHANGED = "recording_status_changed_message" + val GET_RECORDING_STATUS_REPLY = "get_recording_status_reply" + val MEETING_ENDED = "meeting_ended_message" + val MEETING_HAS_ENDED = "meeting_has_ended_message" + val MEETING_DESTROYED = "meeting_destroyed_message" + val DISCONNECT_ALL_USERS = "disconnect_all_users_message" + val DISCONNECT_USER = "disconnect_user_message" + val PERMISSION_SETTING_INITIALIZED = "permisssion_setting_initialized_message" + val NEW_PERMISSION_SETTINGS = "new_permission_settings" + val USER_LOCKED = "user_locked_message" + val USERS_LOCKED = "users_locked_message" + val GET_PERMISSION_SETTINGS_REPLY = "get_permissions_setting_reply" + val IS_MEETING_LOCKED_REPLY = "is_meeting_locked_reply" + val USER_REGISTERED = "user_registered_message" + val USER_LEFT = "user_left_message" + val PRESENTER_ASSIGNED = "presenter_assigned_message" + val END_AND_KICK_ALL = "end_and_kick_all_message" + val GET_USERS_REPLY = "get_users_reply" + val USER_JOINED = "user_joined_message" + val USER_RAISED_HAND = "user_raised_hand_message" + val USER_LOWERED_HAND = "user_lowered_hand_message" + val USER_SHARED_WEBCAM = "user_shared_webcam_message" + val USER_UNSHARED_WEBCAM = "user_unshared_webcam_message" + val USER_STATUS_CHANGED = "user_status_changed_message" + val MUTE_VOICE_USER = "mute_voice_user_request" + val USER_VOICE_MUTED = "user_voice_muted_message" + val USER_VOICE_TALKING = "user_voice_talking_message" + val EJECT_VOICE_USER = "eject_voice_user_message" + val USER_JOINED_VOICE = "user_joined_voice_message" + val USER_LEFT_VOICE = "user_left_voice_message" + val IS_MEETING_MUTED_REPLY = "is_meeting_muted_reply" + val START_RECORDING = "start_recording_message" + val STOP_RECORDING = "stop_recording_message" + val GET_CHAT_HISTORY_REPLY = "get_chat_history_reply" + val SEND_PUBLIC_CHAT_MESSAGE = "send_public_chat_message" + val SEND_PRIVATE_CHAT_MESSAGE = "send_private_chat_message" + val GET_CURRENT_LAYOUT_REPLY = "get_current_layout_reply" + val SET_LAYOUT_REPLY = "set_layout_reply" + val LOCK_LAYOUT_REPLY = "lock_layout_reply" + val UNLOCK_LAYOUT_REPLY = "unlock_layout_reply" + val GET_POLL_RESULT_REPLY = "get_poll_result_reply" + val POLL_CLEARED = "poll_cleared_message" + val GET_POLLS_REPLY = "get_polls_reply" + val CLEAR_POLL_FAILED = "clear_poll_failed" + val POLL_STARTED = "poll_started_message" + val POLL_STOPPED = "poll_stopped_message" + val POLL_REMOVED = "poll_removed" + val POLL_UPDATED = "poll_updated_message" + val POLL_CREATED = "poll_created_message" + val POLL_RESPONSE = "poll_response_message" + val POLL_HIDE_RESULT = "poll_hide_result_message" + val POLL_SHOW_RESULT = "poll_show_result_message" + val PRESENTATION_CLEARED = "presentation_cleared_message" + val PRESENTATION_REMOVED = "presentation_removed_message" + val GET_PRESENTATION_INFO_REPLY = "get_presentation_info_reply" + val PRESENTATION_PAGE_RESIZED = "presentation_page_resized_message" + val PRESENTATION_PAGE_CHANGED = "presentation_page_changed_message" + val PRESENTATION_SHARED = "presentation_shared_message" + val GET_PREUPLOADED_PRESENTATIONS = "get_preuploaded_presentations_message" + val PRESENTATION_CONVERSION_PROGRESS = "presentation_conversion_progress_message" + val PRESENTATION_CONVERSION_ERROR = "presentation_conversion_error_message" + val PRESENTATION_CONVERSION_DONE = "presentation_conversion_done_message" + val PRESENTATION_CHANGED = "presentation_changed_message" + val GET_PRESENTATION_STATUS_REPLY = "get_presentation_status_reply" + val PRESENTATION_REMOVED_MESSAGE = "presentation_removed_message" + val PRESENTATION_PAGE_GENERATED = "presentation_page_generated_message" + val GET_WHITEBOARD_SHAPES_REPLY = "get_whiteboard_shapes_reply" + val SEND_WHITEBOARD_SHAPE = "send_whiteboard_shape_message" + val UNDO_WHITEBOARD_MESSAGE = "undo_whiteboard_message" + val WHITEBOARD_ENABLED = "whiteboard_enabled_message" + val WHITEBOARD_CLEARED = "whiteboard_cleared_message" + val IS_WHITEBOARD_ENABLED_REPLY = "is_whiteboard_enabled_reply" + val MEETING_DESTROYED_EVENT = "meeting_destroyed_event" + val KEEP_ALIVE_REPLY = "keep_alive_reply" + val USER_LISTEN_ONLY = "user_listening_only" + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala new file mode 100644 index 0000000000..1d54319146 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala @@ -0,0 +1,642 @@ +package org.bigbluebutton.core.api + +import org.bigbluebutton.core.apps.poll._ +import org.bigbluebutton.core.apps.whiteboard.vo.AnnotationVO +import org.bigbluebutton.core.apps.presentation.CurrentPresentationInfo +import org.bigbluebutton.core.apps.presentation.Presentation +import org.bigbluebutton.core.apps.presentation.Page + +abstract class OutMessage + +case class VoiceRecordingStarted( + meetingID: String, + recorded: Boolean, + recordingFile: String, + timestamp: String, + confNum: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class VoiceRecordingStopped( + meetingID: String, + recorded: Boolean, + recordingFile: String, + timestamp: String, + confNum: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class RecordingStatusChanged( + meetingID: String, + recorded: Boolean, + userId: String, + recording: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class GetRecordingStatusReply( + meetingID: String, + recorded: Boolean, + userId: String, + recording: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class MeetingCreated( + meetingID: String, + recorded: Boolean, + voiceBridge: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class MeetingEnded( + meetingID: String, + recorded: Boolean, + voiceBridge: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class MeetingHasEnded( + meetingID: String, + userId: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class MeetingDestroyed( + meetingID: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class DisconnectAllUsers( + meetingID: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class DisconnectUser( + meetingID: String, + userId: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class KeepAliveMessageReply( + aliveID:String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case object IsAliveMessage extends IOutMessage + +// Permissions +case class PermissionsSettingInitialized( + meetingID: String, + locked: Boolean, + settings: PermissionsSetting, + applyTo: Array[UserVO], + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class NewPermissionsSetting( + meetingID: String, + setByUser: String, + settings: PermissionsSetting, + applyTo: Array[UserVO], + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserLocked( + meetingID: String, + userId: String, + lock: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UsersLocked( + meetingID: String, + lock: Boolean, + exceptUsers: Seq[String], + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class GetPermissionsSettingReply( + meetingID: String, + userId: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class IsMeetingLockedReply( + meetingID: String, + userId: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +// Users +case class UserRegistered( + meetingID: String, + recorded: Boolean, + user: RegisteredUser, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserLeft( + meetingID: String, + recorded: Boolean, + user:UserVO, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class PresenterAssigned( + meetingID: String, + recorded: Boolean, + presenter: Presenter, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class EndAndKickAll( + meetingID: String, + recorded: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class GetUsersReply( + meetingID: String, + requesterID: String, + users: Array[UserVO], + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class ValidateAuthTokenReply( + meetingID: String, + requesterId: String, + token: String, + valid: Boolean, + correlationId: String, + version:String = Versions.V_0_0_1 + ) extends IOutMessage + +case class UserJoined( + meetingID: String, + recorded: Boolean, + user:UserVO, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserRaisedHand( + meetingID: String, + recorded: Boolean, + userID: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserLoweredHand( + meetingID: String, + recorded: Boolean, + userID: String, + loweredBy: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserListeningOnly( + meetingID: String, + recorded: Boolean, + userID: String, + listenOnly: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserSharedWebcam( + meetingID: String, + recorded: Boolean, + userID: String, + stream: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserUnsharedWebcam( + meetingID: String, + recorded: Boolean, + userID: String, + stream: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserStatusChange( + meetingID: String, + recorded: Boolean, + userID: String, + status: String, + value: Object, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class MuteVoiceUser( + meetingID: String, + recorded: Boolean, + requesterID: String, + userId: String, + mute: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserVoiceMuted( + meetingID: String, + recorded: Boolean, + confNum: String, + user:UserVO, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserVoiceTalking( + meetingID: String, + recorded: Boolean, + confNum: String, + user:UserVO, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class EjectVoiceUser( + meetingID: String, + recorded: Boolean, + requesterID: String, + userId: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserJoinedVoice( + meetingID: String, + recorded: Boolean, + confNum: String, + user:UserVO, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UserLeftVoice( + meetingID: String, + recorded: Boolean, + confNum: String, + user:UserVO, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +// Voice +case class IsMeetingMutedReply( + meetingID: String, + recorded: Boolean, + requesterID: String, + meetingMuted: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class StartRecording( + meetingID: String, + recorded: Boolean, + requesterID: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class StopRecording( + meetingID: String, + recorded: Boolean, + requesterID: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +// Chat +case class GetChatHistoryReply( + meetingID: String, + recorded: Boolean, + requesterID: String, + replyTo: String, + history: Array[Map[String, String]], + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class SendPublicMessageEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + message: Map[String, String], + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class SendPrivateMessageEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + message: Map[String, String], + version:String = Versions.V_0_0_1 +) extends IOutMessage + +// Layout +case class GetCurrentLayoutReply( + meetingID: String, + recorded: Boolean, + requesterID: String, + layoutID: String, + locked: Boolean, + setByUserID: String +) extends IOutMessage + +case class SetLayoutEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + layoutID: String, + locked: Boolean, + setByUserID: String, + applyTo: Array[UserVO] +) extends IOutMessage + +case class LockLayoutEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + layoutID: String, + locked: Boolean, + setByUserID: String, + applyTo: Array[UserVO] +) extends IOutMessage + +case class UnlockLayoutEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + layoutID: String, + locked: Boolean, + setByUserID: String, + applyTo: Array[UserVO] +) extends IOutMessage + +// Poll +case class GetPollResultReply( + meetingID: String, + recorded: Boolean, + requesterID: String, + pollVO: PollVO +) extends IOutMessage + +case class GetPollsReplyOutMsg( + meetingID: String, + recorded: Boolean, + requesterID: String, + polls: Array[PollVO] +) extends IOutMessage + +case class ClearPollFailed( + meetingID: String, + pollID: String, + requesterID: String, + reason: String +) extends IOutMessage + +case class PollClearedOutMsg( + meetingID: String, + recorded: Boolean, + pollID: String +) extends IOutMessage + +case class PollStartedOutMsg( + meetingID: String, + recorded: Boolean, + pollID: String +) extends IOutMessage + +case class PollStoppedOutMsg( + meetingID: String, + recorded: Boolean, + pollID: String +) extends IOutMessage + +case class PollRemovedOutMsg( + meetingID: String, + recorded: Boolean, + pollID: String +) extends IOutMessage + +case class PollUpdatedOutMsg( + meetingID: String, + recorded: Boolean, + pollID: String, + pollVO: PollVO +) extends IOutMessage + +case class PollCreatedOutMsg( + meetingID: String, + recorded: Boolean, + pollID: String, + pollVO: PollVO +) extends IOutMessage + +case class PollResponseOutMsg( + meetingID: String, + recorded: Boolean, + responder: Responder, + response: PollResponseVO +) extends IOutMessage + +case class PollHideResultOutMsg( + meetingID: String, + recorded: Boolean, + pollID: String +) extends IOutMessage + +case class PollShowResultOutMsg( + meetingID: String, + recorded: Boolean, + pollID: String +) extends IOutMessage + +// Presentation +case class ClearPresentationOutMsg( + meetingID: String, + recorded: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class RemovePresentationOutMsg( + meetingID: String, + recorded: Boolean, + presentationID: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class GetPresentationInfoOutMsg( + meetingID: String, + recorded: Boolean, + requesterID: String, + info: CurrentPresentationInfo, + replyTo:String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class SendCursorUpdateOutMsg( + meetingID: String, + recorded: Boolean, + xPercent: Double, + yPercent: Double, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class ResizeAndMoveSlideOutMsg( + meetingID: String, + recorded: Boolean, + page: Page, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class GotoSlideOutMsg( + meetingID: String, + recorded: Boolean, + page: Page, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class SharePresentationOutMsg( + meetingID: String, + recorded: Boolean, + presentation: Presentation, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class GetSlideInfoOutMsg( + meetingID: String, + recorded: Boolean, + requesterID: String, + page: Page, + replyTo: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class GetPreuploadedPresentationsOutMsg( + meetingID:String, + recorded: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class PresentationConversionProgress( + meetingID: String, + messageKey: String, + code: String, + presentationId: String, + presentationName: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class PresentationConversionError( + meetingID: String, + messageKey: String, + code: String, + presentationId: String, + numberOfPages: Int, + maxNumberPages: Int, + presentationName: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class PresentationPageGenerated( + meetingID: String, + messageKey: String, + code: String, + presentationId: String, + numberOfPages: Int, + pagesCompleted: Int, + presentationName: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class PresentationConversionDone( + meetingID: String, + recorded: Boolean, + messageKey: String, + code: String, + presentation: Presentation, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class PresentationChanged( + meetingID: String, + presentation: Presentation, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class GetPresentationStatusReply( + meetingID: String, + presentations: Seq[Presentation], + current: Presentation, + replyTo: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class PresentationRemoved( + meetingID: String, + presentationId: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class PageChanged( + meetingID: String, + page: Page, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +// Whiteboard +case class GetWhiteboardShapesReply( + meetingID: String, + recorded: Boolean, + requesterID: String, + whiteboardId: String, + shapes: Array[AnnotationVO], + replyTo: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class SendWhiteboardAnnotationEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + whiteboardId: String, + shape: AnnotationVO, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class ClearWhiteboardEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + whiteboardId: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class UndoWhiteboardEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + whiteboardId: String, + shapeId: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + + +case class WhiteboardEnabledEvent( + meetingID: String, + recorded: Boolean, + requesterID: String, + enable: Boolean, + version:String = Versions.V_0_0_1 +) extends IOutMessage + +case class IsWhiteboardEnabledReply( + meetingID: String, + recorded: Boolean, + requesterID: String, + enabled: Boolean, + replyTo: String, + version:String = Versions.V_0_0_1 +) extends IOutMessage + + +// Value Objects +case class MeetingVO( + id: String, + recorded: Boolean +) + + diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/TimestampGenerator.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/TimestampGenerator.scala new file mode 100755 index 0000000000..34cd971729 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/TimestampGenerator.scala @@ -0,0 +1,10 @@ +package org.bigbluebutton.core.api + +import java.util.concurrent.TimeUnit + +object TimestampGenerator { + + def generateTimestamp():Long = { + TimeUnit.NANOSECONDS.toMillis(System.nanoTime()) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala new file mode 100644 index 0000000000..c0ac890036 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala @@ -0,0 +1,109 @@ +package org.bigbluebutton.core.api + +object Role extends Enumeration { + type Role = Value + val MODERATOR = Value("MODERATOR") + val VIEWER = Value("VIEWER") +} + +case class Presenter( + presenterID: String, + presenterName: String, + assignedBy: String) + +case class User( + id: String, + externId: String, + name: String, + moderator: Boolean, + avatarUrl: String, + logoutUrl: String, + presenter: Boolean, + callerId: CallerId, + phoneCaller: Boolean, + handRaised: Boolean, + muted: Boolean, + talking: Boolean +) + +case class CallerId( + name: String, + number: String +) + +case class Permissions( + disableCam: Boolean = false, + disableMic: Boolean = false, + disablePrivChat: Boolean = false, + disablePubChat: Boolean = false, + lockedLayout:Boolean = false +) + +case class PermissionsSetting( + permissions: Permissions +) + +case class RegisteredUser ( + id: String, + externId: String, + name: String, + role: Role.Role, + authToken: String +) + +case class Voice( + id: String, + webId: String, + callId: CallerId, + phoningIn: Boolean, + joined: Boolean, + locked: Boolean, + muted: Boolean, + talking: Boolean +) + +case class UserVO( + userID: String, + externUserID: String, + name: String, + role: Role.Role, + raiseHand: Boolean, + presenter: Boolean, + hasStream: Boolean, + locked: Boolean, + webcamStream: String, + phoneUser: Boolean, + voiceUser: VoiceUser, + listenOnly: Boolean, + permissions: Permissions = new Permissions()) + +case class VoiceUser(userId: String, + webUserId: String, + callerName: String, + callerNum: String, + joined: Boolean, + locked: Boolean, + muted: Boolean, + talking: Boolean) + +case class MeetingConfig(name: String, + id: MeetingID, + passwords: MeetingPasswords, + welcomeMsg: String, + logoutUrl: String, + maxUsers: Int, + record: Boolean=false, + duration: MeetingDuration, + defaultAvatarURL: String, + defaultConfigToken: String) + +case class MeetingName(name: String) + +case class MeetingID(internal:String, external: String) + +case class VoiceConfig(telVoice: String, webVoice: String, dialNumber: String) + +case class MeetingPasswords(moderatorPass: String, viewerPass: String) + +case class MeetingDuration(duration: Int = 0, createdTime: Long = 0, + startTime: Long = 0, endTime: Long = 0) \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Versions.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Versions.scala new file mode 100755 index 0000000000..6fe5b194e8 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Versions.scala @@ -0,0 +1,5 @@ +package org.bigbluebutton.core.api + +object Versions { + val V_0_0_1 = "0.0.1" +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp.scala new file mode 100755 index 0000000000..5bcb0223b7 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp.scala @@ -0,0 +1,31 @@ +package org.bigbluebutton.core.apps.chat + +import org.bigbluebutton.core.api._ +import scala.collection.mutable.ArrayBuffer +import org.bigbluebutton.core.MeetingActor + +trait ChatApp { + this : MeetingActor => + + val outGW: MessageOutGateway + + val messages = new ArrayBuffer[Map[String, String]]() + + def handleGetChatHistoryRequest(msg: GetChatHistoryRequest) { + val history = new Array[Map[String, String]](messages.size) + messages.copyToArray(history) + outGW.send(new GetChatHistoryReply(meetingID, recorded, msg.requesterID, msg.replyTo, history)) + } + + def handleSendPublicMessageRequest(msg: SendPublicMessageRequest) { + messages append msg.message.toMap + val pubMsg = msg.message.toMap + + outGW.send(new SendPublicMessageEvent(meetingID, recorded, msg.requesterID, pubMsg)) + } + + def handleSendPrivateMessageRequest(msg: SendPrivateMessageRequest) { + val pubMsg = msg.message.toMap + outGW.send(new SendPrivateMessageEvent(meetingID, recorded, msg.requesterID, pubMsg)) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatInGateway.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatInGateway.scala new file mode 100755 index 0000000000..db21b72009 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatInGateway.scala @@ -0,0 +1,19 @@ +package org.bigbluebutton.core.apps.chat + +import org.bigbluebutton.core.BigBlueButtonGateway +import org.bigbluebutton.core.api._ + +class ChatInGateway(bbbGW: BigBlueButtonGateway) { + + def getChatHistory(meetingID: String, requesterID: String, replyTo: String) { + bbbGW.accept(new GetChatHistoryRequest(meetingID, requesterID, replyTo)) + } + + def sendPrivateMessage(meetingID: String, requesterID: String, msg: Map[String, String]) { + bbbGW.accept(new SendPrivateMessageRequest(meetingID, requesterID, msg)) + } + + def sendPublicMessage(meetingID: String, requesterID: String, msg: Map[String, String]) { + bbbGW.accept(new SendPublicMessageRequest(meetingID, requesterID, msg)) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/red5/ChatClientMessageSender.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/red5/ChatClientMessageSender.scala new file mode 100755 index 0000000000..9f333aa67b --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/red5/ChatClientMessageSender.scala @@ -0,0 +1,66 @@ +package org.bigbluebutton.core.apps.chat.red5 + +import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.meeting.messaging.red5.DirectClientMessage +import com.google.gson.Gson +import org.bigbluebutton.conference.meeting.messaging.red5.BroadcastClientMessage +import scala.collection.mutable.HashMap +import collection.JavaConverters._ +import scala.collection.JavaConversions._ +import java.util.ArrayList + +class ChatClientMessageSender(service: ConnectionInvokerService) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: GetChatHistoryReply => handleGetChatHistoryReply(msg) + case msg: SendPublicMessageEvent => handleSendPublicMessageEvent(msg) + case msg: SendPrivateMessageEvent => handleSendPrivateMessageEvent(msg) + case _ => // do nothing + } + } + + private def handleGetChatHistoryReply(msg: GetChatHistoryReply) { + val gson = new Gson(); + val message = new java.util.HashMap[String, Object]() + + val collection = new ArrayList[java.util.Map[String, String]](); + + msg.history.foreach(p => { + collection.add(mapAsJavaMap(p)) + }) + + val jsonMsg = gson.toJson(collection) + + System.out.println("************ CHAT HISTORY = \n" + jsonMsg + "\n") + message.put("msg", jsonMsg) + + val m = new DirectClientMessage(msg.meetingID, msg.requesterID, "ChatRequestMessageHistoryReply", message); + service.sendMessage(m); + } + + private def handleSendPublicMessageEvent(msg: SendPublicMessageEvent) { + val gson = new Gson() + val jsonMsg = gson.toJson(mapAsJavaMap(msg.message)) + System.out.println("************ PUBLIC CHAT MESSAGE = \n" + jsonMsg + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "ChatReceivePublicMessageCommand", mapAsJavaMap(msg.message)); + service.sendMessage(m); + } + + private def handleSendPrivateMessageEvent(msg: SendPrivateMessageEvent) { + msg.message.get("toUserID") match { + case Some(uid) => { + val m = new DirectClientMessage(msg.meetingID, uid, "ChatReceivePrivateMessageCommand", mapAsJavaMap(msg.message)); + service.sendMessage(m); + } + case None => // do nothing + + } + + val m2 = new DirectClientMessage(msg.meetingID, msg.requesterID, "ChatReceivePrivateMessageCommand", mapAsJavaMap(msg.message)); + service.sendMessage(m2); + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatEventRedisPublisher.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatEventRedisPublisher.scala new file mode 100755 index 0000000000..828162c6d2 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatEventRedisPublisher.scala @@ -0,0 +1,38 @@ +package org.bigbluebutton.core.apps.chat.redis + +import org.bigbluebutton.core.api.OutMessageListener2 +import org.bigbluebutton.conference.service.messaging.redis.MessageSender +import org.bigbluebutton.core.api._ +import com.google.gson.Gson +import scala.collection.mutable.HashMap +import collection.JavaConverters._ +import scala.collection.JavaConversions._ +import java.util.ArrayList +import org.bigbluebutton.conference.service.messaging.MessagingConstants +import org.bigbluebutton.core.messaging.Util + +class ChatEventRedisPublisher(service: MessageSender) extends OutMessageListener2 { + def handleMessage(msg: IOutMessage) { + msg match { + case msg: GetChatHistoryReply => handleGetChatHistoryReply(msg) + case msg: SendPublicMessageEvent => handleSendPublicMessageEvent(msg) + case msg: SendPrivateMessageEvent => handleSendPrivateMessageEvent(msg) + case _ => // do nothing + } + } + + private def handleGetChatHistoryReply(msg: GetChatHistoryReply) { + val json = ChatMessageToJsonConverter.getChatHistoryReplyToJson(msg) + service.send(MessagingConstants.FROM_CHAT_CHANNEL, json) + } + + private def handleSendPublicMessageEvent(msg: SendPublicMessageEvent) { + val json = ChatMessageToJsonConverter.sendPublicMessageEventToJson(msg) + service.send(MessagingConstants.FROM_CHAT_CHANNEL, json) + } + + private def handleSendPrivateMessageEvent(msg: SendPrivateMessageEvent) { + val json = ChatMessageToJsonConverter.sendPrivateMessageEventToJson(msg) + service.send(MessagingConstants.FROM_CHAT_CHANNEL, json) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatEventRedisRecorder.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatEventRedisRecorder.scala new file mode 100755 index 0000000000..8c650e4d92 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatEventRedisRecorder.scala @@ -0,0 +1,30 @@ +package org.bigbluebutton.core.apps.chat.redis + +import org.bigbluebutton.conference.service.recorder.RecorderApplication +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.recorder.chat.PublicChatRecordEvent +import scala.collection.JavaConversions._ + +class ChatEventRedisRecorder(recorder: RecorderApplication) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: SendPublicMessageEvent => handleSendPublicMessageEvent(msg) + case _ => // do nothing + } + } + + private def handleSendPublicMessageEvent(msg: SendPublicMessageEvent) { + if (msg.recorded) { + val message = mapAsJavaMap(msg.message) + val ev = new PublicChatRecordEvent(); + ev.setTimestamp(TimestampGenerator.generateTimestamp); + ev.setMeetingId(msg.meetingID); + ev.setSender(message.get("fromUsername")); + ev.setMessage(message.get("message")); + ev.setLocale(message.get("fromLang")); + ev.setColor(message.get("fromColor")); + recorder.record(msg.meetingID, ev); + } + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatMessageToJsonConverter.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatMessageToJsonConverter.scala new file mode 100755 index 0000000000..f4ea16dfc3 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/redis/ChatMessageToJsonConverter.scala @@ -0,0 +1,68 @@ +package org.bigbluebutton.core.apps.chat.redis + +import scala.collection.mutable.HashMap +import org.bigbluebutton.conference.service.chat.ChatKeyUtil +import org.bigbluebutton.core.api._ +import com.google.gson.Gson +import scala.collection.mutable.HashMap +import collection.JavaConverters._ +import scala.collection.JavaConversions._ +import java.util.ArrayList +import org.bigbluebutton.conference.service.messaging.MessagingConstants +import org.bigbluebutton.core.messaging.Util + +object ChatMessageToJsonConverter { + + val UNKNOWN = "unknown" + + private def chatMessageToMap(msg: Map[String, String]):HashMap[String, String] = { + val res = new HashMap[String, String] + res += "chat_type" -> msg.get(ChatKeyUtil.CHAT_TYPE).getOrElse(UNKNOWN) + res += "from_userid" -> msg.get(ChatKeyUtil.FROM_USERID).getOrElse(UNKNOWN) + res += "from_username" -> msg.get(ChatKeyUtil.FROM_USERNAME).getOrElse(UNKNOWN) + res += "from_color" -> msg.get(ChatKeyUtil.FROM_COLOR).getOrElse(UNKNOWN) + res += "from_time" -> msg.get(ChatKeyUtil.FROM_TIME).getOrElse(UNKNOWN) + res += "from_tz_offset" -> msg.get(ChatKeyUtil.FROM_TZ_OFFSET).getOrElse(UNKNOWN) + res += "from_lang" -> msg.get(ChatKeyUtil.FROM_LANG).getOrElse(UNKNOWN) + res += "to_userid" -> msg.get(ChatKeyUtil.TO_USERID).getOrElse(UNKNOWN) + res += "to_username" -> msg.get(ChatKeyUtil.TO_USERNAME).getOrElse(UNKNOWN) + res += "message" -> msg.get(ChatKeyUtil.MESSAGE).getOrElse(UNKNOWN) + + res + } + + def getChatHistoryReplyToJson(msg: GetChatHistoryReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val collection = new ArrayList[java.util.Map[String, String]](); + + msg.history.foreach(p => { + collection.add(mapAsJavaMap(ChatMessageToJsonConverter.chatMessageToMap(p))) + }) + + payload.put(Constants.CHAT_HISTORY, collection) + + val header = Util.buildHeader(MessageNames.GET_CHAT_HISTORY_REPLY, msg.version, Some(msg.replyTo)) + Util.buildJson(header, payload) + } + + def sendPublicMessageEventToJson(msg: SendPublicMessageEvent):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE, mapAsJavaMap(ChatMessageToJsonConverter.chatMessageToMap(msg.message))) + + val header = Util.buildHeader(MessageNames.SEND_PUBLIC_CHAT_MESSAGE, msg.version, None) + Util.buildJson(header, payload) + } + + def sendPrivateMessageEventToJson(msg: SendPrivateMessageEvent):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE, mapAsJavaMap(ChatMessageToJsonConverter.chatMessageToMap(msg.message))) + + val header = Util.buildHeader(MessageNames.SEND_PRIVATE_CHAT_MESSAGE, msg.version, None) + Util.buildJson(header, payload) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala new file mode 100644 index 0000000000..d5a3b019ef --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala @@ -0,0 +1,57 @@ +package org.bigbluebutton.core.apps.layout + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.core.MeetingActor +import scala.collection.mutable.ArrayBuffer + +trait LayoutApp { + this : MeetingActor => + + val outGW: MessageOutGateway + + private var _locked:Boolean = false; + private var _setByUserID:String = "system"; + private var _currentLayoutID = ""; + + def handleGetCurrentLayoutRequest(msg: GetCurrentLayoutRequest) { + outGW.send(new GetCurrentLayoutReply(msg.meetingID, recorded, msg.requesterID, _currentLayoutID, _locked, _setByUserID)) + } + + def handleSetLayoutRequest(msg: SetLayoutRequest) { + _currentLayoutID = msg.layoutID + outGW.send(new SetLayoutEvent(msg.meetingID, recorded, msg.requesterID, _currentLayoutID, _locked, _setByUserID, affectedUsers)) + } + + def handleLayoutLockSettings(msg: LayoutLockSettings) { + if (msg.locked) { + _locked = true + _setByUserID = msg.requesterId + outGW.send(new LockLayoutEvent(msg.meetingID, recorded, msg.requesterId, _currentLayoutID, _locked, _setByUserID, affectedUsers)) + } else { + _locked = false + _setByUserID = msg.requesterId + outGW.send(new UnlockLayoutEvent(msg.meetingID, recorded, msg.requesterId, _currentLayoutID, _locked, _setByUserID, affectedUsers)) + } + } + + def affectedUsers():Array[UserVO] = { + val au = ArrayBuffer[UserVO]() + users.getUsers foreach {u => + if (! u.presenter && u.role != Role.MODERATOR) { + au += u + } + } + au.toArray + } + + def handleLockLayoutRequest(msg: LockLayoutRequest) { + _locked = true + _currentLayoutID = msg.layoutID + outGW.send(new LockLayoutEvent(msg.meetingID, recorded, msg.requesterID, _currentLayoutID, _locked, _setByUserID, affectedUsers)) + } + + def handleUnlockLayoutRequest(msg: UnlockLayoutRequest) { + _locked = false + outGW.send(new UnlockLayoutEvent(msg.meetingID, recorded, msg.requesterID, _currentLayoutID, _locked, _setByUserID, affectedUsers)) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutInGateway.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutInGateway.scala new file mode 100755 index 0000000000..1eba8f2fd8 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutInGateway.scala @@ -0,0 +1,23 @@ +package org.bigbluebutton.core.apps.layout + +import org.bigbluebutton.core.BigBlueButtonGateway +import org.bigbluebutton.core.api._ + +class LayoutInGateway(bbbGW: BigBlueButtonGateway) { + + def getCurrentLayout(meetingID: String, requesterID: String) { + bbbGW.accept(new GetCurrentLayoutRequest(meetingID, requesterID)) + } + + def setLayout(meetingID: String, requesterID: String, layoutID: String) { + bbbGW.accept(new SetLayoutRequest(meetingID, requesterID, layoutID)) + } + + def lockLayout(meetingID: String, requesterID: String, layoutID: String) { + bbbGW.accept(new LockLayoutRequest(meetingID, requesterID, layoutID)) + } + + def unlockLayout(meetingID: String, requesterID: String) { + bbbGW.accept(new UnlockLayoutRequest(meetingID, requesterID)) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/red5/LayoutClientMessageSender.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/red5/LayoutClientMessageSender.scala new file mode 100644 index 0000000000..8228a1f3bb --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/red5/LayoutClientMessageSender.scala @@ -0,0 +1,60 @@ +package org.bigbluebutton.core.apps.layout.red5 + +import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.meeting.messaging.red5.DirectClientMessage +import com.google.gson.Gson +import org.bigbluebutton.conference.meeting.messaging.red5.BroadcastClientMessage + +class LayoutClientMessageSender(service: ConnectionInvokerService) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg:GetCurrentLayoutReply => handleGetCurrentLayoutReply(msg) + case msg:SetLayoutEvent => handleSetLayoutEvent(msg) + case msg:LockLayoutEvent => handleLockLayoutEvent(msg) + case msg:UnlockLayoutEvent => handleUnlockLayoutEvent(msg) + case _ => // do nothing + } + } + + private def handleGetCurrentLayoutReply(msg: GetCurrentLayoutReply) { + val message = new java.util.HashMap[String, Object]() + message.put("locked", msg.locked:java.lang.Boolean); + message.put("setByUserID", msg.setByUserID); + message.put("layout", msg.layoutID); + + var m = new DirectClientMessage(msg.meetingID, msg.requesterID, "getCurrentLayoutResponse", message); + service.sendMessage(m); + } + + private def handleSetLayoutEvent(msg: SetLayoutEvent) { + val message = new java.util.HashMap[String, Object]() + message.put("locked", msg.locked:java.lang.Boolean); + message.put("setByUserID", msg.setByUserID); + message.put("layout", msg.layoutID); + + var m = new BroadcastClientMessage(msg.meetingID, "syncLayout", message); + service.sendMessage(m); + } + + private def handleLockLayoutEvent(msg: LockLayoutEvent) { + val message = new java.util.HashMap[String, Object]() + message.put("locked", msg.locked:java.lang.Boolean); + message.put("setByUserID", msg.setByUserID); + message.put("layout", msg.layoutID); + + var m = new BroadcastClientMessage(msg.meetingID, "remoteUpdateLayout", message); + service.sendMessage(m); + } + + private def handleUnlockLayoutEvent(msg: UnlockLayoutEvent) { + val message = new java.util.HashMap[String, Object]() + message.put("locked", msg.locked:java.lang.Boolean); + message.put("setByUserID", msg.setByUserID); + message.put("layout", msg.layoutID); + + var m = new BroadcastClientMessage(msg.meetingID, "remoteUpdateLayout", message); + service.sendMessage(m); + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/Poll.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/Poll.scala new file mode 100755 index 0000000000..893a9d0aff --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/Poll.scala @@ -0,0 +1,141 @@ +package org.bigbluebutton.core.apps.poll + +import scala.collection.mutable.HashMap +import scala.collection.mutable.ArrayBuffer + +case class QuestionResponsesVO(val questionID:String, val responseIDs:Array[String]) +case class PollResponseVO(val pollID: String, val responses: Array[QuestionResponsesVO]) +case class ResponderVO(responseID: String, user: Responder) + +case class ResponseVO(id: String, text: String, responders: Array[Responder] = Array[Responder]()) +case class QuestionVO(id: String, multiResponse: Boolean, question: String, responses: Array[ResponseVO]) +case class PollVO(id: String, title: String, questions: Array[QuestionVO], started: Boolean = false, stopped: Boolean = false) + +case class Responder(val userID: String, name: String) + +case class ResponseOutVO(id: String, text: String, responders: Array[Responder] = Array[Responder]()) +case class QuestionOutVO(id: String, multiResponse: Boolean, question: String, responses: Array[ResponseOutVO]) +case class PollOutVO(id: String, title: String, started: Boolean, stopped: Boolean, questions: Array[QuestionOutVO]) + + +class Poll(val id: String, val title: String, val questions: Array[Question]) { + private var _started: Boolean = false + private var _stopped: Boolean = false + + private var _showResult: Boolean = false + + def showResult() { + _showResult = true + } + + def hideResult() { + _showResult = false + } + + def resultShown(): Boolean = { + _showResult + } + + def start() { + _started = true; + } + + def stop() { + _stopped = true; + } + + def isStarted():Boolean = { + return _started + } + + def isStopped():Boolean = { + return _stopped + } + + def clear() { + questions.foreach(q => { + q.clear + }) + + _started = false + _stopped = false + } + + def hasResponses():Boolean = { + questions.foreach(q => { + if (q.hasResponders) return true + }) + + return false + } + + def respondToQuestion(questionID: String, responseID: String, responder: Responder) { + questions.foreach(q => { + if (q.id.equals(questionID)) { + q.respondToQuestion(responseID, responder) + } + }) + } + + def toPollVO():PollVO = { + val qvos = new ArrayBuffer[QuestionVO] + questions.foreach(q => { + qvos += q.toQuestionVO + }) + + new PollVO(id, title, qvos.toArray, _started, _stopped) + } +} + +class Question(val id: String, val multiResponse: Boolean, val question: String, val responses: Array[Response]) { + + def clear() { + responses.foreach(r => r.clear) + } + + def hasResponders():Boolean = { + responses.foreach(r => { + if (r.numResponders > 0) return true + }) + + return false + } + + def respondToQuestion(id: String, responder: Responder) { + responses.foreach(r => { + if (r.id == id) r.addResponder(responder) + }) + } + + def toQuestionVO():QuestionVO = { + val rvos = new ArrayBuffer[ResponseVO] + responses.foreach(response => { + val r = new ResponseVO(response.id, response.response, response.getResponders) + rvos += r + }) + + new QuestionVO(id, multiResponse, question, rvos.toArray) + } +} + +class Response(val id: String, val response: String) { + + val responders = new ArrayBuffer[Responder]() + + def clear() { + responders.clear + } + def addResponder(responder: Responder) { + responders += responder + } + + def numResponders():Int = { + responders.length; + } + + def getResponders():Array[Responder] = { + var r = new Array[Responder](responders.length) + responders.copyToArray(r) + return r + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollApp.scala new file mode 100755 index 0000000000..1b66d21659 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollApp.scala @@ -0,0 +1,123 @@ +package org.bigbluebutton.core.apps.poll + +import scala.collection.mutable.HashMap +import org.bigbluebutton.core.api._ +import scala.collection.mutable.ArrayBuffer +import org.bigbluebutton.core.MeetingActor + +trait PollApp { + this : MeetingActor => + + val outGW: MessageOutGateway + + private val pollModel = new PollModel + + def handleHidePollResult(msg: HidePollResult) { + val pollID = msg.pollID + + if (pollModel.hasPoll(pollID)) { + pollModel.hidePollResult(pollID) + outGW.send(new PollHideResultOutMsg(meetingID, recorded, pollID)) + } + } + + def handleShowPollResult(msg: ShowPollResult) { + val pollID = msg.pollID + + if (pollModel.hasPoll(pollID)) { + pollModel.showPollResult(pollID) + outGW.send(new PollShowResultOutMsg(meetingID, recorded, pollID)) + } + } + + def handleRespondToPoll(msg: RespondToPoll) { + val pollID = msg.response.pollID + + if (pollModel.hasPoll(pollID)) { + if (hasUser(msg.requesterID)) { + getUser(msg.requesterID) match { + case Some(user) => { + val responder = new Responder(user.userID, user.name) + msg.response.responses.foreach(question => { + question.responseIDs.foreach(response => { + pollModel.respondToQuestion(pollID, question.questionID, response, responder) + }) + }) + + pollModel.getPoll(msg.response.pollID) match { + case Some(poll) => outGW.send(new PollResponseOutMsg(meetingID, recorded, responder, msg.response)) + case None => // do nothing + } + } + case None => //do nothing + } + } + } + } + + def handleGetPolls(msg: GetPolls) { + var polls = pollModel.getPolls + outGW.send(new GetPollsReplyOutMsg(meetingID, recorded, msg.requesterID, polls)) + } + + def handleClearPoll(msg: ClearPoll) { + if (pollModel.clearPoll(msg.pollID)) { + outGW.send(new PollClearedOutMsg(meetingID, recorded, msg.pollID)) + } else { + print("PollApp:: handleClearPoll - " + msg.pollID + " not found" ) + } + } + + def handleStartPoll(msg: StartPoll) { + if (pollModel.hasPoll(msg.pollID)) { + pollModel.startPoll(msg.pollID) + outGW.send(new PollStartedOutMsg(meetingID, recorded, msg.pollID)) + } else { + print("PollApp:: handleStartPoll - " + msg.pollID + " not found" ) + } + } + + def handleStopPoll(msg: StopPoll) { + if (pollModel.hasPoll(msg.pollID)) { + pollModel.stopPoll(msg.pollID) + outGW.send(new PollStoppedOutMsg(meetingID, recorded, msg.pollID)) + } else { + print("PollApp:: handleStopPoll - " + msg.pollID + " not found" ) + } + } + + def handleSharePoll(msg: SharePoll) { + + } + + def handleRemovePoll(msg: RemovePoll) { + if (pollModel.hasPoll(msg.pollID)) { + pollModel.removePoll(msg.pollID) + outGW.send(new PollRemovedOutMsg(meetingID, recorded, msg.pollID)) + } else { + print("PollApp:: handleRemovePoll - " + msg.pollID + " not found" ) + } + } + + def handleDestroyPoll(msg: DestroyPoll) { + + } + + def handleUpdatePoll(msg: UpdatePoll) { + if (pollModel.updatePoll(msg.poll)) { + outGW.send(new PollUpdatedOutMsg(meetingID, recorded, msg.poll.id, msg.poll)) + } else { + print("PollApp:: handleUpdatePoll - " + msg.poll.id + " not found" ) + } + } + + def handlePreCreatedPoll(msg: PreCreatedPoll) { + pollModel.createPoll(msg.poll) + outGW.send(new PollCreatedOutMsg(meetingID, recorded, msg.poll.id, msg.poll)) + } + + def handleCreatePoll(msg: CreatePoll) { + pollModel.createPoll(msg.poll) + outGW.send(new PollCreatedOutMsg(meetingID, recorded, msg.poll.id, msg.poll)) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollInGateway.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollInGateway.scala new file mode 100755 index 0000000000..6a31c26d6f --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollInGateway.scala @@ -0,0 +1,56 @@ +package org.bigbluebutton.core.apps.poll + +import org.bigbluebutton.core.BigBlueButtonGateway +import org.bigbluebutton.core.api._ + +class PollInGateway(bbbGW: BigBlueButtonGateway) { + + val msgConverter = new PollMessageConverter + + def getPolls(meetingID: String, requesterID: String) { + bbbGW.accept(new GetPolls(meetingID, requesterID)) + } + + def preCreatedPoll(meetingID: String, msg: String) { + val pvo = msgConverter.convertPreCreatedPollMessage(msg) + bbbGW.accept(new PreCreatedPoll(meetingID, pvo)) + } + + def createPoll(meetingID: String, requesterID: String, msg: String) { + val pvo = msgConverter.convertCreatePollMessage(msg) + bbbGW.accept(new CreatePoll(meetingID, requesterID, pvo)) + } + + def updatePoll(meetingID: String, requesterID: String, msg: String) { + val pvo = msgConverter.convertUpdatePollMessage(msg) + bbbGW.accept(new UpdatePoll(meetingID, requesterID, pvo)) + } + + def startPoll(meetingID: String, requesterID: String, msg: String) { + val pollID = msgConverter.convertStartPollMessage(msg) + bbbGW.accept(new StartPoll(meetingID, requesterID, pollID)) + } + + def stopPoll(meetingID: String, requesterID: String, msg: String) { + val pollID = msgConverter.convertStopPollMessage(msg) + bbbGW.accept(new StopPoll(meetingID, requesterID, pollID)) + } + + def removePoll(meetingID: String, requesterID: String, msg: String) { + val pollID = msgConverter.convertRemovePollMessage(msg) + bbbGW.accept(new RemovePoll(meetingID, requesterID, pollID)) + } + + def respondPoll(meetingID: String, requesterID: String, msg: String) { + val pollResponse = msgConverter.convertTakePollMessage(msg) + bbbGW.accept(new RespondToPoll(meetingID, requesterID, pollResponse)) + } + + def showPollResult(meetingID: String, requesterID: String, pollID: String) { + bbbGW.accept(new ShowPollResult(meetingID, requesterID, pollID)) + } + + def hidePollResult(meetingID: String, requesterID: String, pollID: String) { + bbbGW.accept(new HidePollResult(meetingID, requesterID, pollID)) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollMessageConverter.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollMessageConverter.scala new file mode 100755 index 0000000000..e3763ef85c --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollMessageConverter.scala @@ -0,0 +1,190 @@ +package org.bigbluebutton.core.apps.poll + +import com.google.gson.Gson +import com.google.gson.JsonParser +import org.bigbluebutton.core.util.RandomStringGenerator._ +import scala.collection.mutable.ArrayBuffer + +class PollMessageConverter { + + def convertPreCreatedPollMessage(msg:String):PollVO = { + val gson = new Gson(); + val parser = new JsonParser(); + val obj = parser.parse(msg).getAsJsonObject(); + val title = gson.fromJson(obj.get("title"), classOf[String]); + + val question = gson.fromJson(obj.get("question"), classOf[String]); + val qType = gson.fromJson(obj.get("questionType"), classOf[String]) + + val cvoArray = ArrayBuffer[QuestionVO]() + + val responses = obj.get("answers").getAsJsonArray(); + + val rvoArray = ArrayBuffer[ResponseVO]() + + var j = 0 + val respIter = responses.iterator() + while(respIter.hasNext()) { + val response = gson.fromJson(respIter.next(), classOf[String]); + + rvoArray += new ResponseVO(j.toString, response) + + j += 1 + } + + val questionType = if (qType.equalsIgnoreCase(QuestionType.MULTI_CHOICE.toString())) true else false + + cvoArray += new QuestionVO(0.toString, questionType, question, rvoArray.toArray) + + new PollVO(randomAlphanumericString(12), title, cvoArray.toArray) + + } + + def convertCreatePollMessage(msg:String):PollVO = { + val gson = new Gson(); + val parser = new JsonParser(); + val obj = parser.parse(msg).getAsJsonObject(); + val title = gson.fromJson(obj.get("title"), classOf[String]); + + val questions = obj.get("questions").getAsJsonArray(); + val cvoArray = ArrayBuffer[QuestionVO]() + + val iter = questions.iterator() + var i = 0 + while(iter.hasNext()) { + val aquestion = iter.next().getAsJsonObject(); + val questionText = gson.fromJson(aquestion.get("question"), classOf[String]) + + val qType = gson.fromJson(aquestion.get("questionType"), classOf[String]) + + val responses = aquestion.get("responses").getAsJsonArray(); + + val rvoArray = ArrayBuffer[ResponseVO]() + + var j = 0 + val respIter = responses.iterator() + while(respIter.hasNext()) { + val response = gson.fromJson(respIter.next(), classOf[String]); + + rvoArray += new ResponseVO(j.toString, response) + + j += 1 + } + + val questionType = if (! qType.equalsIgnoreCase(QuestionType.MULTI_CHOICE.toString())) true else false + + cvoArray += new QuestionVO(i.toString, questionType, questionText, rvoArray.toArray) + + i += 1 + } + + new PollVO(randomAlphanumericString(12), title, cvoArray.toArray) + + } + + def convertUpdatePollMessage(msg:String):PollVO = { + val gson = new Gson(); + val parser = new JsonParser(); + val obj = parser.parse(msg).getAsJsonObject(); + val title = gson.fromJson(obj.get("title"), classOf[String]); + val pollID = gson.fromJson(obj.get("id"), classOf[String]); + + val questions = obj.get("questions").getAsJsonArray(); + + val cvoArray = ArrayBuffer[QuestionVO]() + + val iter = questions.iterator() + var i = 0 + while(iter.hasNext()) { + val aquestion = iter.next().getAsJsonObject(); + val questionText = gson.fromJson(aquestion.get("question"), classOf[String]) + + val responses = aquestion.get("responses").getAsJsonArray(); + + val rvoArray = ArrayBuffer[ResponseVO]() + + var j = 0 + val respIter = responses.iterator() + while(respIter.hasNext()) { + val response = respIter.next().getAsJsonObject() + + // Get the old response id + val oldRespID = gson.fromJson(response.get("id"), classOf[String]) + // if the old response id is empty, then this is a new answer, create a new id + val respID = if (oldRespID == "") j.toString() else oldRespID + val respText = gson.fromJson(response.get("response"), classOf[String]) + + rvoArray += new ResponseVO(respID, respText) + + j += 1 + } + + val qType = gson.fromJson(aquestion.get("questionType"), classOf[String]) + val qID = gson.fromJson(aquestion.get("id"), classOf[String]) + val questionType = if (qType.equalsIgnoreCase(QuestionType.MULTI_CHOICE.toString())) true else false + + cvoArray += new QuestionVO(qID, questionType, questionText, rvoArray.toArray) + + i += 1 + } + + new PollVO(pollID, title, cvoArray.toArray) + } + + def convertStartPollMessage(msg: String):String = { + val gson = new Gson(); + val parser = new JsonParser(); + val obj = parser.parse(msg).getAsJsonObject(); + val pollID = gson.fromJson(obj.get("pollID"), classOf[String]); + + pollID + } + + def convertStopPollMessage(msg: String):String = { + val gson = new Gson(); + val parser = new JsonParser(); + val obj = parser.parse(msg).getAsJsonObject(); + val pollID = gson.fromJson(obj.get("pollID"), classOf[String]); + + pollID + } + + def convertRemovePollMessage(msg: String):String = { + val gson = new Gson(); + val parser = new JsonParser(); + val obj = parser.parse(msg).getAsJsonObject(); + val pollID = gson.fromJson(obj.get("pollID"), classOf[String]); + + pollID + } + + def convertTakePollMessage(msg: String):PollResponseVO = { + val gson = new Gson(); + val parser = new JsonParser(); + val obj = parser.parse(msg).getAsJsonObject(); + val pollID = gson.fromJson(obj.get("pollID"), classOf[String]); + val questions = obj.get("questions").getAsJsonArray(); + + val qVO = ArrayBuffer[QuestionResponsesVO](); + + val iter = questions.iterator() + while(iter.hasNext()) { + val aquestion = iter.next().getAsJsonObject(); + val questionID = gson.fromJson(aquestion.get("questionID"), classOf[String]) + + val responses = aquestion.get("responseIDs").getAsJsonArray(); + + val rvoArray = ArrayBuffer[String]() + + val respIter = responses.iterator() + while(respIter.hasNext()) { + val response = gson.fromJson(respIter.next(), classOf[String]); + rvoArray += response + } + + qVO += new QuestionResponsesVO(questionID, rvoArray.toArray) + } + + new PollResponseVO(pollID, qVO.toArray) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollModel.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollModel.scala new file mode 100755 index 0000000000..1b1efcb26d --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollModel.scala @@ -0,0 +1,235 @@ +package org.bigbluebutton.core.apps.poll + +import scala.collection.mutable.ArrayBuffer +import scala.collection.mutable.HashMap + +class PollModel { + + private val polls = new HashMap[String, Poll]() + + /*** + * Uncomment to create sample polls for manual testing purposes + */ + //createSamplePoll + + def numPolls():Int = { + polls.size + } + + def createPoll(pollVO: PollVO) { + val questions = new ArrayBuffer[Question] + pollVO.questions.foreach(qv => { + val responses = new ArrayBuffer[Response] + qv.responses.foreach(rv => { + val response = new Response(rv.id, rv.text) + responses += response + }) + questions += new Question(qv.id, qv.multiResponse, qv.question, responses.toArray) + }) + + val poll = new Poll(pollVO.id, pollVO.title, questions.toArray) + polls += poll.id -> poll + } + + def updatePoll(pollVO: PollVO):Boolean = { + var success = false + + polls.get(pollVO.id) match { + case Some(p) => { + val questions = new ArrayBuffer[Question] + pollVO.questions.foreach(qv => { + val responses = new ArrayBuffer[Response] + qv.responses.foreach(rv => { + val response = new Response(rv.id, rv.text) + responses += response + }) + questions += new Question(qv.id, qv.multiResponse, qv.question, responses.toArray) + }) + + val poll = new Poll(pollVO.id, pollVO.title, questions.toArray) + polls += poll.id -> poll + success = true + } + case None => success = false + } + + success + } + + def getPolls():Array[PollVO] = { + val poll = new ArrayBuffer[PollVO] + polls.values.foreach(p => { + poll += p.toPollVO + }) + + poll.toArray + } + + def clearPoll(pollID: String):Boolean = { + var success = false + polls.get(pollID) match { + case Some(p) => { + p.clear + success = true + } + case None => success = false + } + + success + } + + def startPoll(pollID: String):Boolean = { + var success = false + polls.get(pollID) match { + case Some(p) => { + p.start + success = true + } + case None => success = false + } + + success + } + + def removePoll(pollID: String):Boolean = { + var success = false + polls.get(pollID) match { + case Some(p) => { + polls -= p.id + success = true + } + case None => success = false + } + + success + } + + def stopPoll(pollID: String):Boolean = { + var success = false + polls.get(pollID) match { + case Some(p) => { + p.stop + success = true + } + case None => success = false + } + + success + } + + def hasPoll(pollID: String):Boolean = { + var present = false + polls.get(pollID) match { + case Some(p) => { + present = true + } + case None => present = false + } + + present + } + + def getPoll(pollID: String):Option[PollVO] = { + var poll:Option[PollVO] = None + + polls.get(pollID) match { + case Some(p) => { + val questions = new ArrayBuffer[QuestionVO] + p.questions.foreach(q => { + val responses = new ArrayBuffer[ResponseVO] + q.responses.foreach(response => { + val r = new ResponseVO(response.id, response.response, response.getResponders) + responses += r + }) + + val quest = new QuestionVO(q.id, q.multiResponse, q.question, responses.toArray) + questions += quest + }) + poll = Some(new PollVO(p.id, p.title, questions.toArray)) + } + case None => poll = None + } + + poll + } + + def hidePollResult(pollID: String) { + polls.get(pollID) match { + case Some(p) => p.hideResult + case None => // do nothing + } + } + + def showPollResult(pollID: String) { + polls.get(pollID) match { + case Some(p) => p.showResult + case None => // do nothing + } + } + + def respondToQuestion(pollID: String, questionID: String, responseID: String, responder: Responder) { + polls.get(pollID) match { + case Some(p) => { + p.respondToQuestion(questionID, responseID, responder) + } + case None => + } + } + + /******************************************************** + * Some pre-created polls for testing and simulation so we don't have + * to manually generate polls when testing the UI. + */ + def createSamplePoll() { + addSamplePoll1() + addSamplePoll2() + addSamplePoll3() + } + + def addSamplePoll1() { + val r1 = new ResponseVO("0", "Visa") + val r2 = new ResponseVO("1", "MasterCard") + val r3 = new ResponseVO("2", "AmEx") + val r4 = new ResponseVO("3", "Diners Club") + + var q = new QuestionVO("q1", false, "What type of credit card do you prefer?", Array(r1, r2, r3, r4)) + val pvo = new PollVO("pollID-101", "Preferred Credit Card", Array(q)) + + createPoll(pvo) + + respondToQuestion("pollID-101", "q1", "1", new Responder("user1", "Juan Tamad")) + respondToQuestion("pollID-101", "q1", "0", new Responder("user2", "Asyong Aksaya")) + } + + def addSamplePoll2() { + val r1 = new ResponseVO("0", "Visa") + val r2 = new ResponseVO("1", "MasterCard") + val r3 = new ResponseVO("2", "AmEx") + val r4 = new ResponseVO("3", "Diners Club") + + var q = new QuestionVO("q1", true, "Which credit cards do you own?", Array(r1, r2, r3, r4)) + val pvo = new PollVO("pollID-102", "Owned Credit Cards", Array(q)) + + createPoll(pvo) + + respondToQuestion("pollID-102", "q1", "1", new Responder("user1", "Juan Tamad")) + respondToQuestion("pollID-102", "q1", "0", new Responder("user2", "Asyong Aksaya")) + } + + def addSamplePoll3() { + val r1 = new ResponseVO("0", "Dumaguete") + val r2 = new ResponseVO("1", "Cebu") + val r3 = new ResponseVO("2", "Zamboanga") + val r4 = new ResponseVO("3", "None of the above") + + var q = new QuestionVO("q1", true, "What is the capital of the Philippines?", Array(r1, r2, r3, r4)) + val pvo = new PollVO("pollID-103", "Philippine Capital", Array(q)) + + createPoll(pvo) + + respondToQuestion("pollID-103", "q1", "1", new Responder("user1", "Juan Tamad")) + respondToQuestion("pollID-103", "q1", "0", new Responder("user2", "Asyong")) + respondToQuestion("pollID-103", "q1", "2", new Responder("user3", "Pedro")) + respondToQuestion("pollID-103", "q1", "3", new Responder("user4", "Aksaya")) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/QuestionType.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/QuestionType.scala new file mode 100755 index 0000000000..fdfc60122e --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/QuestionType.scala @@ -0,0 +1,7 @@ +package org.bigbluebutton.core.apps.poll + +object QuestionType extends Enumeration { + type QuestionType = Value + val MULTI_CHOICE = Value("MULTI_CHOICE") + val MULTI_REPONSE = Value("MULTI_REPONSE") +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/red5/PollClientMessageSender.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/red5/PollClientMessageSender.scala new file mode 100755 index 0000000000..3ea81f0c93 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/red5/PollClientMessageSender.scala @@ -0,0 +1,125 @@ +package org.bigbluebutton.core.apps.poll.red5 + +import com.google.gson.Gson +import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.meeting.messaging.red5.DirectClientMessage +import org.bigbluebutton.conference.meeting.messaging.red5.BroadcastClientMessage +import java.util.ArrayList +import org.bigbluebutton.core.apps.poll.PollVO + +class PollClientMessageSender(service: ConnectionInvokerService) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: GetPollsReplyOutMsg => handleGetPollsReplyOutMsg(msg) + case msg: PollClearedOutMsg => handlePollClearedOutMsg(msg) + case msg: PollStartedOutMsg => handlePollStartedOutMsg(msg) + case msg: PollStoppedOutMsg => handlePollStoppedOutMsg(msg) + case msg: PollRemovedOutMsg => handlePollRemovedOutMsg(msg) + case msg: PollUpdatedOutMsg => handlePollUpdatedOutMsg(msg) + case msg: PollCreatedOutMsg => handlePollCreatedOutMsg(msg) + case msg: PollResponseOutMsg => handlePollResponseOutMsg(msg) + case _ => // do nothing + } + } + + private def handlePollResponseOutMsg(msg: PollResponseOutMsg) { + val gson = new Gson(); + val map = new java.util.HashMap[String, Object]() + map.put("responder", msg.responder) + map.put("response", msg.response) + + val message = new java.util.HashMap[String, Object]() + message.put("msg", gson.toJson(map)) + + println("PollClientMessageSender - Handling PollResponseOutMsg \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "pollResultUpdatedMessage", message); + service.sendMessage(m); + } + + private def handleGetPollsReplyOutMsg(msg: GetPollsReplyOutMsg) { + val gson = new Gson(); + val message = new java.util.HashMap[String, Object]() + + val collection = new ArrayList[PollVO](); + + msg.polls.foreach(p => { + collection.add(p) + }) + + message.put("msg", gson.toJson(collection)) + + println("PollClientMessageSender - Handling GetPollsReplyOutMsg \n" + message.get("msg") + "\n") + + var m = new DirectClientMessage(msg.meetingID, msg.requesterID, "pollGetPollsReply", message); + service.sendMessage(m); + } + + private def handlePollClearedOutMsg(msg: PollClearedOutMsg) { + println("PollClientMessageSender - Handling PollClearedOutMsg") + } + + private def handlePollStartedOutMsg(msg: PollStartedOutMsg) { + println("PollClientMessageSender - Handling PollStartedOutMsg") + + val map = new java.util.HashMap[String, Object]() + map.put("pollID", msg.pollID) + + val gson = new Gson(); + val message = new java.util.HashMap[String, Object]() + message.put("msg", gson.toJson(map)) + + var m = new BroadcastClientMessage(msg.meetingID, "pollStartedMessage", message); + service.sendMessage(m); + } + + private def handlePollStoppedOutMsg(msg: PollStoppedOutMsg) { + println("PollClientMessageSender - Handling PollStoppedOutMsg") + + val map = new java.util.HashMap[String, Object]() + map.put("pollID", msg.pollID) + + val gson = new Gson(); + val message = new java.util.HashMap[String, Object]() + message.put("msg", gson.toJson(map)) + + var m = new BroadcastClientMessage(msg.meetingID, "pollStoppedMessage", message); + service.sendMessage(m); + } + + private def handlePollRemovedOutMsg(msg: PollRemovedOutMsg) { + println("PollClientMessageSender - Handling PollRemovedOutMsg") + val map = new java.util.HashMap[String, Object]() + map.put("pollID", msg.pollID) + + val gson = new Gson(); + val message = new java.util.HashMap[String, Object]() + message.put("msg", gson.toJson(map)) + + var m = new BroadcastClientMessage(msg.meetingID, "pollDestroyedMessage", message); + service.sendMessage(m); + } + + private def handlePollUpdatedOutMsg(msg: PollUpdatedOutMsg) { + println("PollClientMessageSender - Handling PollUpdatedOutMsg") + val gson= new Gson(); + val message = new java.util.HashMap[String, Object]() + message.put("msg", gson.toJson(msg.pollVO)) + + var m = new BroadcastClientMessage(msg.meetingID, "pollUpdatedMessage", message); + service.sendMessage(m); + } + + private def handlePollCreatedOutMsg(msg: PollCreatedOutMsg) { + println("PollClientMessageSender - Handling PollCreatedOutMsg") + val gson= new Gson(); + + val message = new java.util.HashMap[String, Object]() + message.put("msg", gson.toJson(msg.pollVO)) + + var m = new BroadcastClientMessage(msg.meetingID, "pollCreatedMessage", message); + service.sendMessage(m); + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/redis/PollEventRedisPublisher.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/redis/PollEventRedisPublisher.scala new file mode 100755 index 0000000000..a23c02a314 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/redis/PollEventRedisPublisher.scala @@ -0,0 +1,114 @@ +package org.bigbluebutton.core.apps.poll.redis + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.messaging.redis.MessageSender +import com.google.gson.Gson +import org.bigbluebutton.conference.service.messaging.MessagingConstants +import java.util.ArrayList +import org.bigbluebutton.core.apps.poll.PollVO + +class PollEventRedisPublisher(service: MessageSender) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: GetPollsReplyOutMsg => handleGetPollsReplyOutMsg(msg) + case msg: PollClearedOutMsg => handlePollClearedOutMsg(msg) + case msg: PollStartedOutMsg => handlePollStartedOutMsg(msg) + case msg: PollStoppedOutMsg => handlePollStoppedOutMsg(msg) + case msg: PollRemovedOutMsg => handlePollRemovedOutMsg(msg) + case msg: PollUpdatedOutMsg => handlePollUpdatedOutMsg(msg) + case msg: PollCreatedOutMsg => handlePollCreatedOutMsg(msg) + case msg: PollResponseOutMsg => handlePollResponseOutMsg(msg) + case _ => // do nothing + } + } + + private def handlePollResponseOutMsg(msg: PollResponseOutMsg) { + val gson = new Gson(); + val map = new java.util.HashMap[String, Object]() + + map.put("meetingID", msg.meetingID) + map.put("event", "PollResponseEvent") + map.put("responder", msg.responder) + map.put("response", msg.response) + + service.send(MessagingConstants.FROM_POLLING_CHANNEL, gson.toJson(map)); + } + + private def handleGetPollsReplyOutMsg(msg: GetPollsReplyOutMsg) { + val gson = new Gson(); + val message = new java.util.HashMap[String, Object]() + + val collection = new ArrayList[PollVO](); + + msg.polls.foreach(p => { + collection.add(p) + }) + + message.put("msg", gson.toJson(collection)) + + println("PollClientMessageSender - Handling GetPollsReplyOutMsg \n" + message.get("msg") + "\n") + + } + + private def handlePollClearedOutMsg(msg: PollClearedOutMsg) { + println("PollClientMessageSender - Handling PollClearedOutMsg") + } + + private def handlePollStartedOutMsg(msg: PollStartedOutMsg) { + println("PollClientMessageSender - Handling PollStartedOutMsg") + + val gson = new Gson(); + val map = new java.util.HashMap[String, Object]() + map.put("meetingID", msg.meetingID) + map.put("event", "PollStartedEvent") + map.put("pollID", msg.pollID) + service.send(MessagingConstants.FROM_POLLING_CHANNEL, gson.toJson(map)); + + } + + private def handlePollStoppedOutMsg(msg: PollStoppedOutMsg) { + println("PollClientMessageSender - Handling PollStoppedOutMsg") + + val gson = new Gson(); + val map = new java.util.HashMap[String, Object]() + map.put("meetingID", msg.meetingID) + map.put("event", "PollStoppedEvent") + map.put("pollID", msg.pollID) + service.send(MessagingConstants.FROM_POLLING_CHANNEL, gson.toJson(map)); + } + + private def handlePollRemovedOutMsg(msg: PollRemovedOutMsg) { + println("PollClientMessageSender - Handling PollRemovedOutMsg") + + val gson = new Gson(); + val map = new java.util.HashMap[String, Object]() + map.put("meetingID", msg.meetingID) + map.put("event", "PollRemovedEvent") + map.put("pollID", msg.pollID) + service.send(MessagingConstants.FROM_POLLING_CHANNEL, gson.toJson(map)); + } + + private def handlePollUpdatedOutMsg(msg: PollUpdatedOutMsg) { + println("PollClientMessageSender - Handling PollUpdatedOutMsg") + val gson = new Gson(); + val map = new java.util.HashMap[String, Object]() + map.put("meetingID", msg.meetingID) + map.put("event", "PollUpdatedEvent") + map.put("msg", gson.toJson(msg.pollVO)) + + service.send(MessagingConstants.FROM_POLLING_CHANNEL, gson.toJson(map)); + } + + private def handlePollCreatedOutMsg(msg: PollCreatedOutMsg) { + println("PollClientMessageSender - Handling PollCreatedOutMsg") + val gson = new Gson(); + + val map = new java.util.HashMap[String, Object]() + map.put("meetingID", msg.meetingID) + map.put("event", "PollCreatedEvent") + map.put("msg", gson.toJson(msg.pollVO)) + + service.send(MessagingConstants.FROM_POLLING_CHANNEL, gson.toJson(map)); + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/redis/PollEventRedisRecorder.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/redis/PollEventRedisRecorder.scala new file mode 100755 index 0000000000..aa5b37865d --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/redis/PollEventRedisRecorder.scala @@ -0,0 +1,115 @@ +package org.bigbluebutton.core.apps.poll.redis + +import org.bigbluebutton.conference.service.recorder.RecorderApplication +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.recorder.polling.PollCreatedRecordEvent +import org.bigbluebutton.conference.service.recorder.polling.PollUpdatedRecordEvent +import org.bigbluebutton.conference.service.recorder.polling.PollRemovedRecordEvent +import org.bigbluebutton.conference.service.recorder.polling.PollStoppedRecordEvent +import org.bigbluebutton.conference.service.recorder.polling.PollStartedRecordEvent +import org.bigbluebutton.conference.service.recorder.polling.PollClearedRecordEvent + +class PollEventRedisRecorder(recorder: RecorderApplication) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: GetPollsReplyOutMsg => // do nothing? + case msg: PollClearedOutMsg => handlePollClearedOutMsg(msg) + case msg: PollStartedOutMsg => handlePollStartedOutMsg(msg) + case msg: PollStoppedOutMsg => handlePollStoppedOutMsg(msg) + case msg: PollRemovedOutMsg => handlePollRemovedOutMsg(msg) + case msg: PollUpdatedOutMsg => handlePollUpdatedOutMsg(msg) + case msg: PollCreatedOutMsg => handlePollCreatedOutMsg(msg) + case _ => // do nothing + } + } + + def handlePollCreatedOutMsg(msg: PollCreatedOutMsg):Unit = { + if (msg.recorded) { + val ev = new PollCreatedRecordEvent(); + ev.setPollID(msg.pollVO.id) + ev.setTitle(msg.pollVO.title) + + for ( q <- msg.pollVO.questions ) { + ev.addQuestion(q.id, q.question, q.multiResponse) + for( resp <- q.responses ){ + ev.addResponse(q.id, resp.id, resp.text) + + /*for( responder <- resp.responders ){ + ev.addResponder(q.id, resp.id, responder.id, ) + }*/ + } + } + + ev.setTimestamp(System.currentTimeMillis()) + ev.setMeetingId(msg.meetingID) + recorder.record(msg.meetingID, ev) + } + + } + + def handlePollUpdatedOutMsg(msg:PollUpdatedOutMsg):Unit = { + if(msg.recorded){ + val ev = new PollUpdatedRecordEvent(); + ev.setPollID(msg.pollVO.id) + ev.setTitle(msg.pollVO.title) + + for ( q <- msg.pollVO.questions ) { + ev.addQuestion(q.id, q.question, q.multiResponse) + for( resp <- q.responses ){ + ev.addResponse(q.id, resp.id, resp.text) + + /*for( responder <- resp.responders ){ + ev.addResponder(q.id, resp.id, responder.id, ) + }*/ + } + } + + ev.setTimestamp(System.currentTimeMillis()) + ev.setMeetingId(msg.meetingID) + recorder.record(msg.meetingID, ev) + } + } + + def handlePollRemovedOutMsg(msg:PollRemovedOutMsg):Unit = { + if(msg.recorded){ + val ev = new PollRemovedRecordEvent() + ev.setPollID(msg.pollID) + ev.setTimestamp(System.currentTimeMillis()) + ev.setMeetingId(msg.meetingID) + recorder.record(msg.meetingID, ev) + } + } + + def handlePollStoppedOutMsg(msg:PollStoppedOutMsg):Unit = { + if(msg.recorded){ + val ev = new PollStoppedRecordEvent() + ev.setPollID(msg.pollID) + ev.setTimestamp(System.currentTimeMillis()) + ev.setMeetingId(msg.meetingID) + recorder.record(msg.meetingID, ev) + } + } + + def handlePollStartedOutMsg(msg:PollStartedOutMsg):Unit = { + if(msg.recorded){ + val ev = new PollStartedRecordEvent() + ev.setPollID(msg.pollID) + ev.setTimestamp(System.currentTimeMillis()) + ev.setMeetingId(msg.meetingID) + recorder.record(msg.meetingID, ev) + } + } + + def handlePollClearedOutMsg(msg:PollClearedOutMsg):Unit = { + if(msg.recorded){ + val ev = new PollClearedRecordEvent() + ev.setPollID(msg.pollID) + ev.setTimestamp(System.currentTimeMillis()) + ev.setMeetingId(msg.meetingID) + recorder.record(msg.meetingID, ev) + } + } + + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp.scala new file mode 100755 index 0000000000..30e668e509 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp.scala @@ -0,0 +1,150 @@ +package org.bigbluebutton.core.apps.presentation + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.core.MeetingActor +import com.google.gson.Gson + +case class CurrentPresenter(userId: String, name: String, assignedBy: String) + +case class CurrentPresentationInfo(presenter: CurrentPresenter, + presentations: Seq[Presentation]) +case class CursorLocation(xPercent: Double = 0D, yPercent: Double = 0D) + + + +trait PresentationApp { + this : MeetingActor => + + val outGW: MessageOutGateway + + private var cursorLocation = new CursorLocation + private val presModel = new PresentationModel + + + def handlePreuploadedPresentations(msg: PreuploadedPresentations) { + val pres = msg.presentations + + msg.presentations.foreach(presentation => { + presModel.addPresentation(presentation) + + sharePresentation(presentation.id, true) + }) + } + + def handleInitializeMeeting(msg: InitializeMeeting) { + + } + + def handleClearPresentation(msg: ClearPresentation) { + outGW.send(new ClearPresentationOutMsg(meetingID, recorded)) + } + + def handlePresentationConversionUpdate(msg: PresentationConversionUpdate) { + outGW.send(new PresentationConversionProgress(meetingID, msg.messageKey, + msg.code, msg.presentationId, msg.presName)) + } + + def handlePresentationPageCountError(msg: PresentationPageCountError) { + outGW.send(new PresentationConversionError(meetingID, msg.messageKey, + msg.code, msg.presentationId, + msg.numberOfPages, + msg.maxNumberPages, msg.presName)) + } + + def handlePresentationSlideGenerated(msg: PresentationSlideGenerated) { + outGW.send(new PresentationPageGenerated(meetingID, msg.messageKey, + msg.code, msg.presentationId, + msg.numberOfPages, + msg.pagesCompleted, msg.presName)) + } + + def handlePresentationConversionCompleted(msg: PresentationConversionCompleted) { + + presModel.addPresentation(msg.presentation) + + outGW.send(new PresentationConversionDone(meetingID, recorded, msg.messageKey, + msg.code, msg.presentation)) + + sharePresentation(msg.presentation.id, true) + } + + def handleRemovePresentation(msg: RemovePresentation) { + val curPres = presModel.getCurrentPresentation + + val removedPresentation = presModel.remove(msg.presentationID) + + curPres foreach (cp => { + if (cp.id == msg.presentationID) { + sharePresentation(msg.presentationID, false); + } + }) + } + + def handleGetPresentationInfo(msg: GetPresentationInfo) { + println("PresentationApp : handleGetPresentationInfo GetPresentationInfo for meeting [" + msg.meetingID + "] [" + msg.requesterID + "]" ) + + val curPresenter = getCurrentPresenter; + val presenter = new CurrentPresenter(curPresenter.presenterID, + curPresenter.presenterName, + curPresenter.assignedBy) + val presentations = presModel.getPresentations + val presentationInfo = new CurrentPresentationInfo(presenter, presentations) + outGW.send(new GetPresentationInfoOutMsg(meetingID, recorded, msg.requesterID, presentationInfo, msg.replyTo)) + } + + def handleSendCursorUpdate(msg: SendCursorUpdate) { + cursorLocation = new CursorLocation(msg.xPercent, msg.yPercent) + outGW.send(new SendCursorUpdateOutMsg(meetingID, recorded, msg.xPercent, msg.yPercent)) + } + + def handleResizeAndMoveSlide(msg: ResizeAndMoveSlide) { + val page = presModel.resizePage(msg.xOffset, msg.yOffset, + msg.widthRatio, msg.heightRatio); + page foreach (p => outGW.send(new ResizeAndMoveSlideOutMsg(meetingID, recorded, p))) + } + + def handleGotoSlide(msg: GotoSlide) { + println("Received GotoSlide for meeting=[" + msg.meetingID + "] page=[" + msg.page + "]") + println("*** Before change page ****") + printPresentations + presModel.changePage(msg.page) foreach {page => + println("Switching page for meeting=[" + msg.meetingID + "] page=[" + page.id + "]") + outGW.send(new GotoSlideOutMsg(meetingID, recorded, page)) + } + println("*** After change page ****") + printPresentations + } + + def handleSharePresentation(msg: SharePresentation) { + sharePresentation(msg.presentationID, msg.share) + } + + def sharePresentation(presentationID: String, share: Boolean) { + val pres = presModel.sharePresentation(presentationID) + + pres foreach { p => + outGW.send(new SharePresentationOutMsg(meetingID, recorded, p)) + } + + } + + def handleGetSlideInfo(msg: GetSlideInfo) { + presModel.getCurrentPresentation foreach {pres => + presModel.getCurrentPage(pres) foreach {page => + outGW.send(new GetSlideInfoOutMsg(meetingID, recorded, msg.requesterID, page, msg.replyTo)) + } + } + + } + + def printPresentations() { + presModel.getPresentations foreach {pres => + println("presentation id=[" + pres.id + "] current=[" + pres.current + "]") + pres.pages.values foreach {page => + println("page id=[" + page.id + "] current=[" + page.current + "]") + } + } + + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala new file mode 100755 index 0000000000..131ca8f6db --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala @@ -0,0 +1,128 @@ +package org.bigbluebutton.core.apps.presentation + +case class Presentation(id: String, name: String, current: Boolean = false, + pages: scala.collection.immutable.HashMap[String, Page]) + +case class Page(id: String, num: Int, + thumbUri: String = "", + swfUri: String, + txtUri: String, + pngUri: String, + current: Boolean = false, + xOffset: Double = 0, yOffset: Double = 0, + widthRatio: Double = 100D, heightRatio: Double = 100D) + +class PresentationModel { + private var presentations = new scala.collection.immutable.HashMap[String, Presentation] + + def addPresentation(pres: Presentation) { + savePresentation(pres) + } + + def getPresentations():Seq[Presentation] = { + presentations.values.toSeq + } + + def getCurrentPresentation():Option[Presentation] = { + presentations.values find (p => p.current) + } + + def getCurrentPage(pres: Presentation):Option[Page] = { + pres.pages.values find (p => p.current) + } + + def remove(presId: String):Option[Presentation] = { + val pres = presentations.get(presId) + pres foreach (p => presentations -= p.id) + pres + } + + def sharePresentation(presId: String):Option[Presentation] = { + getCurrentPresentation foreach (curPres => { + if (curPres.id != presId) { + val newPres = curPres.copy(current = false) + savePresentation(newPres) + } + }) + + presentations.get(presId) match { + case Some(pres) => { + val cp = pres.copy(current = true) + savePresentation(cp) + Some(cp) + } + case None => None + } + } + + private def savePresentation(pres: Presentation) { + presentations += pres.id -> pres + } + + private def resizeCurrentPage(pres: Presentation, + xOffset: Double, yOffset: Double, + widthRatio: Double, + heightRatio: Double):Option[Page] = { + getCurrentPage(pres) match { + case Some(cp) => { + val page = cp.copy(xOffset = xOffset, yOffset = yOffset, + widthRatio= widthRatio, heightRatio = heightRatio) + val nPages = pres.pages + (page.id -> page) + val newPres = pres.copy(pages= nPages) + savePresentation(newPres) + Some(page) + } + case None => None + } + } + + def resizePage(xOffset: Double, yOffset: Double, + widthRatio: Double, heightRatio: Double):Option[Page] = { + for { + curPres <- getCurrentPresentation + page <- resizeCurrentPage(curPres, xOffset, yOffset, widthRatio, heightRatio) + } yield page + } + + private def deactivateCurrentPage(pres: Presentation) { + getCurrentPage(pres) foreach {cp => + val page = cp.copy(current = false) + val nPages = pres.pages + (page.id -> page) + val newPres = pres.copy(pages= nPages) + savePresentation(newPres) + println("Making page[" + page.id + "] not current[" + page.current + "]") + println("After deact page. presentation id=[" + newPres.id + "] current=[" + newPres.current + "]") + newPres.pages.values foreach {page => + println("page id=[" + page.id + "] current=[" + page.current + "]") + } + } + } + + + private def makePageCurrent(pres: Presentation, page: String):Option[Page] = { + pres.pages.values find (p => p.id == page) match { + case Some(newCurPage) => { + val page = newCurPage.copy(current=true) + val newPages = pres.pages + (page.id -> page) + val newPres = pres.copy(pages= newPages) + savePresentation(newPres) + println("Making page[" + page.id + "] current[" + page.current + "]") + Some(page) + } + case None => { + println("Could not find page[" + page + "] in presentation [" + pres.id + "]") + None + } + } + } + + def changePage(pageId: String):Option[Page] = { + getCurrentPresentation foreach {pres => deactivateCurrentPage(pres)} + + for { + pres <- getCurrentPresentation + page <- makePageCurrent(pres, pageId) + } yield page + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala new file mode 100755 index 0000000000..b469f54eb8 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala @@ -0,0 +1,295 @@ +package org.bigbluebutton.core.apps.presentation.red5 + +import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.meeting.messaging.red5.BroadcastClientMessage +import org.bigbluebutton.conference.meeting.messaging.red5.DirectClientMessage +import collection.JavaConversions._ +import com.google.gson.Gson +import java.util.ArrayList +import org.bigbluebutton.core.apps.presentation.Page +import org.bigbluebutton.core.apps.presentation.Presentation + + +class PresentationClientMessageSender(service: ConnectionInvokerService) extends OutMessageListener2 { + + private val OFFICE_DOC_CONVERSION_SUCCESS_KEY = "OFFICE_DOC_CONVERSION_SUCCESS"; + private val OFFICE_DOC_CONVERSION_FAILED_KEY = "OFFICE_DOC_CONVERSION_FAILED"; + private val SUPPORTED_DOCUMENT_KEY = "SUPPORTED_DOCUMENT"; + private val UNSUPPORTED_DOCUMENT_KEY = "UNSUPPORTED_DOCUMENT"; + private val PAGE_COUNT_FAILED_KEY = "PAGE_COUNT_FAILED"; + private val PAGE_COUNT_EXCEEDED_KEY = "PAGE_COUNT_EXCEEDED"; + private val GENERATED_SLIDE_KEY = "GENERATED_SLIDE"; + private val GENERATING_THUMBNAIL_KEY = "GENERATING_THUMBNAIL"; + private val GENERATED_THUMBNAIL_KEY = "GENERATED_THUMBNAIL"; + private val CONVERSION_COMPLETED_KEY = "CONVERSION_COMPLETED"; + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: ClearPresentationOutMsg => handleClearPresentationOutMsg(msg) + case msg: RemovePresentationOutMsg => handleRemovePresentationOutMsg(msg) + case msg: GetPresentationInfoOutMsg => handleGetPresentationInfoOutMsg(msg) + case msg: SendCursorUpdateOutMsg => handleSendCursorUpdateOutMsg(msg) + case msg: ResizeAndMoveSlideOutMsg => handleResizeAndMoveSlideOutMsg(msg) + case msg: GotoSlideOutMsg => handleGotoSlideOutMsg(msg) + case msg: SharePresentationOutMsg => handleSharePresentationOutMsg(msg) + case msg: GetSlideInfoOutMsg => handleGetSlideInfoOutMsg(msg) + case msg: PresentationConversionProgress => handlePresentationConversionProgress(msg) + case msg: PresentationConversionError => handlePresentationConversionError(msg) + case msg: PresentationPageGenerated => handlePresentationPageGenerated(msg) + case msg: PresentationConversionDone => handlePresentationConversionDone(msg) + case _ => // do nothing + } + } + + private def handleClearPresentationOutMsg(msg: ClearPresentationOutMsg) { + + } + + private def handlePresentationConversionProgress(msg: PresentationConversionProgress) { + val args = new java.util.HashMap[String, String](); + args.put("meetingID", msg.meetingID); + args.put("code", msg.code); + args.put("presentationID", msg.presentationId); + args.put("presentationName", msg.presentationName); + args.put("messageKey", msg.messageKey); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("PresentationClientMessageSender - handlePresentationConversionProgress \n" + message.get("msg") + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "conversionUpdateMessageCallback", message); + service.sendMessage(m); + } + + private def handlePresentationConversionError(msg: PresentationConversionError) { + val args = new java.util.HashMap[String, String](); + args.put("meetingID", msg.meetingID); + args.put("code", msg.code); + args.put("presentationID", msg.presentationId); + args.put("presentationName", msg.presentationName); + args.put("messageKey", msg.messageKey); + args.put("numberOfPages", msg.numberOfPages.toString); + args.put("maxNumberPages", msg.maxNumberPages.toString); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("PresentationClientMessageSender - handlePresentationConversionError \n" + message.get("msg") + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "pageCountExceededUpdateMessageCallback", message); + service.sendMessage(m); + } + + private def handlePresentationPageGenerated(msg: PresentationPageGenerated) { + val args = new java.util.HashMap[String, String](); + args.put("meetingID", msg.meetingID); + args.put("code", msg.code); + args.put("presentationID", msg.presentationId); + args.put("presentationName", msg.presentationName); + args.put("messageKey", msg.messageKey); + args.put("numberOfPages", msg.numberOfPages.toString); + args.put("pagesCompleted", msg.pagesCompleted.toString); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("PresentationClientMessageSender - handlePresentationPageGenerated \n" + message.get("msg") + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "generatedSlideUpdateMessageCallback", message); + service.sendMessage(m); + } + + private def handlePresentationConversionDone(msg: PresentationConversionDone) { + val args = new java.util.HashMap[String, Object]() + args.put("meetingID", msg.meetingID); + args.put("code", msg.code); + + val presentation = new java.util.HashMap[String, Object](); + presentation.put("id", msg.presentation.id) + presentation.put("name", msg.presentation.name) + presentation.put("current", msg.presentation.current:java.lang.Boolean) + + val pages = new ArrayList[Page]() + + msg.presentation.pages.values foreach {p => + println("PresentationClientMessageSender **** Page [" + p.id + "," + p.num + "]") + pages.add(p) + } + + presentation.put("pages", pages) + + args.put("presentation", presentation); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("PresentationClientMessageSender - handlePresentationConversionDone \n" + message.get("msg") + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "conversionCompletedUpdateMessageCallback", message); + service.sendMessage(m); + } + + private def handleRemovePresentationOutMsg(msg: RemovePresentationOutMsg) { + val args = new java.util.HashMap[String, Object](); + args.put("presentationID", msg.presentationID); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + val m = new BroadcastClientMessage(msg.meetingID, "removePresentationCallback", message); + service.sendMessage(m); + } + + private def handleGetPresentationInfoOutMsg(msg: GetPresentationInfoOutMsg) { + val info = msg.info + + // Build JSON + val args = new java.util.HashMap[String, Object]() + args.put("meetingID", msg.meetingID); + + // Create a map for our current presenter + val presenter = new java.util.HashMap[String, String]() + presenter.put("userId", info.presenter.userId) + presenter.put("name", info.presenter.name) + presenter.put("assignedBy", info.presenter.assignedBy) + + args.put("presenter", presenter) + + // Create an array for our presentations + val presentations = new ArrayList[java.util.HashMap[String, Object]] + info.presentations.foreach { pres => + val presentation = new java.util.HashMap[String, Object](); + presentation.put("id", pres.id) + presentation.put("name", pres.name) + presentation.put("current", pres.current:java.lang.Boolean) + + // Get the pages for a presentation + val pages = new ArrayList[Page]() + pres.pages.values foreach {p => + pages.add(p) + } + // store the pages in the presentation + presentation.put("pages", pages) + + // add this presentation into our presentations list + presentations.add(presentation); + } + + // add the presentation to our map to complete our json + args.put("presentations", presentations) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("***** PresentationClientMessageSender - handleGetPresentationInfoOutMsg to user[" +msg.requesterID + "] message[" + message.get("msg") + "]") + + val m = new DirectClientMessage(msg.meetingID, msg.requesterID, "getPresentationInfoReply", message); + service.sendMessage(m); + } + + private def handleSendCursorUpdateOutMsg(msg: SendCursorUpdateOutMsg) { + val args = new java.util.HashMap[String, Object](); + args.put("xPercent", msg.xPercent:java.lang.Double); + args.put("yPercent", msg.yPercent:java.lang.Double); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + val m = new BroadcastClientMessage(msg.meetingID, "PresentationCursorUpdateCommand", message); + service.sendMessage(m); + } + + private def handleResizeAndMoveSlideOutMsg(msg: ResizeAndMoveSlideOutMsg) { + val args = new java.util.HashMap[String, Object](); + args.put("id", msg.page.id) + args.put("num", msg.page.num:java.lang.Integer) + args.put("current", msg.page.current:java.lang.Boolean) + args.put("swfUri", msg.page.swfUri) + args.put("txtUri", msg.page.txtUri) + args.put("pngUri", msg.page.pngUri) + args.put("thumbUri", msg.page.thumbUri) + args.put("xOffset", msg.page.xOffset:java.lang.Double); + args.put("yOffset", msg.page.yOffset:java.lang.Double); + args.put("widthRatio", msg.page.widthRatio:java.lang.Double); + args.put("heightRatio", msg.page.heightRatio:java.lang.Double); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + val m = new BroadcastClientMessage(msg.meetingID, "moveCallback", message); + service.sendMessage(m); + } + + private def handleGotoSlideOutMsg(msg: GotoSlideOutMsg) { + val args = new java.util.HashMap[String, Object](); + args.put("id", msg.page.id) + args.put("num", msg.page.num:java.lang.Integer) + args.put("current", msg.page.current:java.lang.Boolean) + args.put("swfUri", msg.page.swfUri) + args.put("txtUri", msg.page.txtUri) + args.put("pngUri", msg.page.pngUri) + args.put("thumbUri", msg.page.thumbUri) + args.put("xOffset", msg.page.xOffset:java.lang.Double); + args.put("yOffset", msg.page.yOffset:java.lang.Double); + args.put("widthRatio", msg.page.widthRatio:java.lang.Double); + args.put("heightRatio", msg.page.heightRatio:java.lang.Double); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + val m = new BroadcastClientMessage(msg.meetingID, "goToSlideCallback", message); + service.sendMessage(m); + } + + private def handleSharePresentationOutMsg(msg: SharePresentationOutMsg) { + val args = new java.util.HashMap[String, Object](); + + val presentation = new java.util.HashMap[String, Object](); + presentation.put("id", msg.presentation.id) + presentation.put("name", msg.presentation.name) + presentation.put("current", msg.presentation.current:java.lang.Boolean) + + // Get the pages for a presentation + val pages = new ArrayList[Page]() + msg.presentation.pages.values foreach {p => + pages.add(p) + } + // store the pages in the presentation + presentation.put("pages", pages) + + args.put("presentation", presentation); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + val m = new BroadcastClientMessage(msg.meetingID, "sharePresentationCallback", message); + service.sendMessage(m); + } + + private def handleGetSlideInfoOutMsg(msg: GetSlideInfoOutMsg) { + val args = new java.util.HashMap[String, Object](); + args.put("xOffset", msg.page.xOffset:java.lang.Double); + args.put("yOffest", msg.page.yOffset:java.lang.Double); + args.put("widthRatio", msg.page.widthRatio:java.lang.Double); + args.put("heightRatio", msg.page.heightRatio:java.lang.Double); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + val m = new DirectClientMessage(msg.meetingID, msg.requesterID, "getPresentationInfoReply", message); + service.sendMessage(m); + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PesentationMessageToJsonConverter.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PesentationMessageToJsonConverter.scala new file mode 100755 index 0000000000..817eb33273 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PesentationMessageToJsonConverter.scala @@ -0,0 +1,281 @@ +package org.bigbluebutton.core.apps.presentation.redis + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.core.messaging.Util +import org.bigbluebutton.core.apps.presentation.Page +import collection.JavaConverters._ +import scala.collection.JavaConversions._ + +object PesentationMessageToJsonConverter { + private def pageToMap(page: Page):java.util.Map[String, Any] = { + val res = new scala.collection.mutable.HashMap[String, Any] + res += "id" -> page.id + res += "num" -> page.num + res += "thumb_uri" -> page.thumbUri + res += "swf_uri" -> page.swfUri + res += "txt_uri" -> page.txtUri + res += "png_uri" -> page.pngUri + res += "current" -> page.current + res += "x_offset" -> page.xOffset + res += "y_offset" -> page.yOffset + res += "width_ratio" -> page.widthRatio + res += "height_ratio" -> page.heightRatio + + mapAsJavaMap(res) + } + + def clearPresentationOutMsgToJson(msg: ClearPresentationOutMsg):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = Util.buildHeader(MessageNames.PRESENTATION_CLEARED, msg.version, None) + Util.buildJson(header, payload) + } + + def removePresentationOutMsgToJson(msg: RemovePresentationOutMsg):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PRESENTATION_ID, msg.presentationID) + + val header = Util.buildHeader(MessageNames.PRESENTATION_REMOVED, msg.version, None) + Util.buildJson(header, payload) + } + + def getPresentationInfoOutMsgToJson(msg: GetPresentationInfoOutMsg): String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PRESENTATION_INFO, msg.info) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val info = msg.info + + // Create a map for our current presenter + val presenter = new java.util.HashMap[String, String]() + presenter.put(Constants.USER_ID, info.presenter.userId) + presenter.put(Constants.NAME, info.presenter.name) + presenter.put(Constants.ASSIGNED_BY, info.presenter.assignedBy) + + payload.put(Constants.PRESENTER, presenter) + + // Create an array for our presentations + val presentations = new java.util.ArrayList[java.util.HashMap[String, Object]] + info.presentations.foreach { pres => + val presentation = new java.util.HashMap[String, Object]() + presentation.put(Constants.ID, pres.id) + presentation.put(Constants.NAME, pres.name) + presentation.put(Constants.CURRENT, pres.current:java.lang.Boolean) + + // Get the pages for a presentation + val pages = new java.util.ArrayList[java.util.Map[String, Any]]() + pres.pages.values foreach {p => + pages.add(pageToMap(p)) + } + // store the pages in the presentation + presentation.put(Constants.PAGES, pages) + + // add this presentation into our presentations list + presentations.add(presentation); + } + + // add the presentation to our map to complete our json + payload.put(Constants.PRESENTATIONS, presentations) + + val header = Util.buildHeader(MessageNames.GET_PRESENTATION_INFO_REPLY, msg.version, Some(msg.replyTo)) + Util.buildJson(header, payload) + } + + def sendCursorUpdateOutMsgToJson(msg: SendCursorUpdateOutMsg):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.X_PERCENT, msg.xPercent) + payload.put(Constants.Y_PERCENT, msg.yPercent) + + val header = Util.buildHeader(MessageNames.PRESENTATION_CURSOR_UPDATED, msg.version, None) + Util.buildJson(header, payload) + } + + def resizeAndMoveSlideOutMsgToJson(msg: ResizeAndMoveSlideOutMsg):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PAGE, pageToMap(msg.page)) + + val header = Util.buildHeader(MessageNames.PRESENTATION_PAGE_RESIZED, msg.version, None) + Util.buildJson(header, payload) + } + + def gotoSlideOutMsgToJson(msg: GotoSlideOutMsg):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PAGE, pageToMap(msg.page)) + + val header = Util.buildHeader(MessageNames.PRESENTATION_PAGE_CHANGED, msg.version, None) + Util.buildJson(header, payload) + } + + def sharePresentationOutMsgToJson(msg: SharePresentationOutMsg):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val presentation = new java.util.HashMap[String, Object](); + presentation.put(Constants.ID, msg.presentation.id) + presentation.put(Constants.NAME, msg.presentation.name) + presentation.put(Constants.CURRENT, msg.presentation.current:java.lang.Boolean) + + // Get the pages for a presentation + val pages = new java.util.ArrayList[java.util.Map[String, Any]]() + msg.presentation.pages.values foreach {p => + pages.add(pageToMap(p)) + } + + // store the pages in the presentation + presentation.put(Constants.PAGES, pages) + + payload.put(Constants.PRESENTATION, presentation); + + val header = Util.buildHeader(MessageNames.PRESENTATION_SHARED, msg.version, None) + Util.buildJson(header, payload) + } + + def getSlideInfoOutMsgToJson(msg: GetSlideInfoOutMsg):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.PAGE, pageToMap(msg.page)) + + val header = Util.buildHeader(MessageNames.GET_SLIDE_INFO_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def getPreuploadedPresentationsOutMsgToJson(msg: GetPreuploadedPresentationsOutMsg):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = Util.buildHeader(MessageNames.GET_PREUPLOADED_PRESENTATIONS, msg.version, None) + Util.buildJson(header, payload) + } + + def presentationConversionProgressToJson(msg: PresentationConversionProgress):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE_KEY, msg.messageKey) + payload.put(Constants.CODE, msg.code) + payload.put(Constants.PRESENTATION_ID, msg.presentationId) + payload.put(Constants.PRESENTATION_NAME, msg.presentationName) + + val header = Util.buildHeader(MessageNames.PRESENTATION_CONVERSION_PROGRESS, msg.version, None) + Util.buildJson(header, payload) + } + + def presentationConversionErrorToJson(msg: PresentationConversionError):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE_KEY, msg.messageKey) + payload.put(Constants.CODE, msg.code) + payload.put(Constants.PRESENTATION_ID, msg.presentationId) + payload.put(Constants.PRESENTATION_NAME, msg.presentationName) + payload.put(Constants.NUM_PAGES, msg.numberOfPages) + payload.put(Constants.MAX_NUM_PAGES, msg.maxNumberPages) + + val header = Util.buildHeader(MessageNames.PRESENTATION_CONVERSION_ERROR, msg.version, None) + Util.buildJson(header, payload) + } + + def presentationPageGenerated(msg: PresentationPageGenerated):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE_KEY, msg.messageKey) + payload.put(Constants.CODE, msg.code) + payload.put(Constants.PRESENTATION_ID, msg.presentationId) + payload.put(Constants.PRESENTATION_NAME, msg.presentationName) + payload.put(Constants.NUM_PAGES, msg.numberOfPages) + payload.put(Constants.PAGES_COMPLETED, msg.pagesCompleted) + + val header = Util.buildHeader(MessageNames.PRESENTATION_PAGE_GENERATED, msg.version, None) + Util.buildJson(header, payload) + } + + def presentationConversionDoneToJson(msg: PresentationConversionDone):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.MESSAGE_KEY, msg.messageKey) + payload.put(Constants.CODE, msg.code) + + val presentation = new java.util.HashMap[String, Object](); + presentation.put(Constants.ID, msg.presentation.id) + presentation.put(Constants.NAME, msg.presentation.name) + presentation.put(Constants.CURRENT, msg.presentation.current:java.lang.Boolean) + + val pages = new java.util.ArrayList[java.util.Map[String, Any]]() + msg.presentation.pages.values foreach {p => + pages.add(pageToMap(p)) + } + + presentation.put(Constants.PAGES, pages) + + payload.put(Constants.PRESENTATION, presentation); + + val header = Util.buildHeader(MessageNames.PRESENTATION_CONVERSION_DONE, msg.version, None) + Util.buildJson(header, payload) + } + + def presentationChangedToJson(msg: PresentationChanged):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + val presentation = new java.util.HashMap[String, Object](); + presentation.put(Constants.ID, msg.presentation.id) + presentation.put(Constants.NAME, msg.presentation.name) + presentation.put(Constants.CURRENT, msg.presentation.current:java.lang.Boolean) + + val pages = new java.util.ArrayList[java.util.Map[String, Any]]() + msg.presentation.pages.values foreach {p => + pages.add(pageToMap(p)) + } + + presentation.put(Constants.PAGES, pages) + payload.put(Constants.PRESENTATION, presentation); + + val header = Util.buildHeader(MessageNames.PRESENTATION_CHANGED, msg.version, None) + Util.buildJson(header, payload) + } + + def getPresentationStatusReplyToJson(msg: GetPresentationStatusReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + val presentation = new java.util.HashMap[String, Object](); + + presentation.put(Constants.ID, msg.current.id) + presentation.put(Constants.NAME, msg.current.name) + presentation.put(Constants.CURRENT, msg.current.current:java.lang.Boolean) + + val pages = new java.util.ArrayList[java.util.Map[String, Any]]() + + msg.current.pages.values foreach {p => + pages.add(pageToMap(p)) + } + + presentation.put(Constants.PAGES, pages) + + payload.put(Constants.PRESENTATION, presentation); + + val header = Util.buildHeader(MessageNames.GET_PRESENTATION_STATUS_REPLY, msg.version, Some(msg.replyTo)) + Util.buildJson(header, payload) + } + + def presentationRemovedToJson(msg: PresentationRemoved):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PRESENTATION_ID, msg.presentationId) + + val header = Util.buildHeader(MessageNames.PRESENTATION_REMOVED, msg.version, None) + Util.buildJson(header, payload) + } + + def pageChangedToJson(msg: PageChanged):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.PAGE, pageToMap(msg.page)) + + val header = Util.buildHeader(MessageNames.PRESENTATION_PAGE_CHANGED, msg.version, None) + Util.buildJson(header, payload) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisPublisher.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisPublisher.scala new file mode 100755 index 0000000000..37977b0a09 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisPublisher.scala @@ -0,0 +1,111 @@ +package org.bigbluebutton.core.apps.presentation.redis + +import org.bigbluebutton.core.api.OutMessageListener2 +import org.bigbluebutton.conference.service.messaging.redis.MessageSender +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.messaging.MessagingConstants + +class PresentationEventRedisPublisher(service: MessageSender) extends OutMessageListener2 { + def handleMessage(msg: IOutMessage) { + msg match { + case msg: ClearPresentationOutMsg => handleClearPresentationOutMsg(msg) + case msg: RemovePresentationOutMsg => handleRemovePresentationOutMsg(msg) + case msg: GetPresentationInfoOutMsg => handleGetPresentationInfoOutMsg(msg) + case msg: SendCursorUpdateOutMsg => handleSendCursorUpdateOutMsg(msg) + case msg: ResizeAndMoveSlideOutMsg => handleResizeAndMoveSlideOutMsg(msg) + case msg: GotoSlideOutMsg => handleGotoSlideOutMsg(msg) + case msg: SharePresentationOutMsg => handleSharePresentationOutMsg(msg) + case msg: GetSlideInfoOutMsg => handleGetSlideInfoOutMsg(msg) + case msg: PresentationConversionProgress => handlePresentationConversionProgress(msg) + case msg: PresentationConversionError => handlePresentationConversionError(msg) + case msg: PresentationPageGenerated => handlePresentationPageGenerated(msg) + case msg: PresentationConversionDone => handlePresentationConversionDone(msg) + case _ => // do nothing + } + } + + private def handleClearPresentationOutMsg(msg: ClearPresentationOutMsg) { + val json = PesentationMessageToJsonConverter.clearPresentationOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleRemovePresentationOutMsg(msg: RemovePresentationOutMsg) { + val json = PesentationMessageToJsonConverter.removePresentationOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleGetPresentationInfoOutMsg(msg: GetPresentationInfoOutMsg) { + val json = PesentationMessageToJsonConverter.getPresentationInfoOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleSendCursorUpdateOutMsg(msg: SendCursorUpdateOutMsg) { + val json = PesentationMessageToJsonConverter.sendCursorUpdateOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleResizeAndMoveSlideOutMsg(msg: ResizeAndMoveSlideOutMsg) { + val json = PesentationMessageToJsonConverter.resizeAndMoveSlideOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleGotoSlideOutMsg(msg: GotoSlideOutMsg) { + val json = PesentationMessageToJsonConverter.gotoSlideOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleSharePresentationOutMsg(msg: SharePresentationOutMsg) { + val json = PesentationMessageToJsonConverter.sharePresentationOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleGetSlideInfoOutMsg(msg: GetSlideInfoOutMsg) { + val json = PesentationMessageToJsonConverter.getSlideInfoOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleGetPreuploadedPresentationsOutMsg(msg: GetPreuploadedPresentationsOutMsg) { + val json = PesentationMessageToJsonConverter.getPreuploadedPresentationsOutMsgToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handlePresentationConversionProgress(msg: PresentationConversionProgress) { + val json = PesentationMessageToJsonConverter.presentationConversionProgressToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handlePresentationConversionError(msg: PresentationConversionError) { + val json = PesentationMessageToJsonConverter.presentationConversionErrorToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handlePresentationPageGenerated(msg: PresentationPageGenerated) { + val json = PesentationMessageToJsonConverter.presentationPageGenerated(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handlePresentationConversionDone(msg: PresentationConversionDone) { + val json = PesentationMessageToJsonConverter.presentationConversionDoneToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handlePresentationChanged(msg: PresentationChanged) { + val json = PesentationMessageToJsonConverter.presentationChangedToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handleGetPresentationStatusReply(msg: GetPresentationStatusReply) { + val json = PesentationMessageToJsonConverter.getPresentationStatusReplyToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handlePresentationRemoved(msg: PresentationRemoved) { + val json = PesentationMessageToJsonConverter.presentationRemovedToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } + + private def handlePageChanged(msg: PageChanged) { + val json = PesentationMessageToJsonConverter.pageChangedToJson(msg) + service.send(MessagingConstants.FROM_PRESENTATION_CHANNEL, json) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala new file mode 100755 index 0000000000..3bf9418ece --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala @@ -0,0 +1,127 @@ +package org.bigbluebutton.core.apps.presentation.redis + +import org.bigbluebutton.conference.service.recorder.RecorderApplication +import org.bigbluebutton.core.api.OutMessageListener2 +import org.bigbluebutton.core.api.IOutMessage +import org.bigbluebutton.conference.service.recorder.presentation.GenerateSlidePresentationRecordEvent +import org.bigbluebutton.conference.service.recorder.presentation.ConversionCompletedPresentationRecordEvent +import org.bigbluebutton.core.api.GotoSlideOutMsg +import org.bigbluebutton.conference.service.recorder.presentation.GotoSlidePresentationRecordEvent +import org.bigbluebutton.core.api.ResizeAndMoveSlideOutMsg +import org.bigbluebutton.conference.service.recorder.presentation.ResizeAndMoveSlidePresentationRecordEvent +import org.bigbluebutton.core.api.RemovePresentationOutMsg +import org.bigbluebutton.conference.service.recorder.presentation.RemovePresentationPresentationRecordEvent +import org.bigbluebutton.core.api.SharePresentationOutMsg +import org.bigbluebutton.conference.service.recorder.presentation.SharePresentationPresentationRecordEvent +import org.bigbluebutton.core.api.SendCursorUpdateOutMsg +import org.bigbluebutton.conference.service.recorder.presentation.CursorUpdateRecordEvent +import org.bigbluebutton.core.api.ClearPresentationOutMsg +import org.bigbluebutton.core.api.PresentationConversionDone + +class PresentationEventRedisRecorder(recorder: RecorderApplication) extends OutMessageListener2 { + private val GENERATED_SLIDE_KEY = "GENERATED_SLIDE"; + private val CONVERSION_COMPLETED_KEY = "CONVERSION_COMPLETED"; + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: ClearPresentationOutMsg => handleClearPresentationOutMsg(msg) + case msg: RemovePresentationOutMsg => handleRemovePresentationOutMsg(msg) + case msg: SendCursorUpdateOutMsg => handleSendCursorUpdateOutMsg(msg) + case msg: ResizeAndMoveSlideOutMsg => handleResizeAndMoveSlideOutMsg(msg) + case msg: GotoSlideOutMsg => handleGotoSlideOutMsg(msg) + case msg: SharePresentationOutMsg => handleSharePresentationOutMsg(msg) + case _ => // do nothing + } + } + + private def handleClearPresentationOutMsg(msg: ClearPresentationOutMsg) { + + } + + + private def handlePresentationConversionDone(msg: PresentationConversionDone) { + if (msg.recorded) { + val event = new ConversionCompletedPresentationRecordEvent(); + event.setMeetingId(msg.meetingID); + event.setTimestamp(System.currentTimeMillis()); + event.setPresentationName(msg.presentation.id); + event.setOriginalFilename(msg.presentation.name); + recorder.record(msg.meetingID, event); + } + + } + + private def handleGotoSlideOutMsg(msg: GotoSlideOutMsg) { + if (msg.recorded) { + val event = new GotoSlidePresentationRecordEvent(); + event.setMeetingId(msg.meetingID); + event.setTimestamp(System.currentTimeMillis()); + event.setSlide(msg.page.num); + event.setId(msg.page.id); + event.setNum(msg.page.num); + event.setThumbUri(msg.page.thumbUri); + event.setSwfUri(msg.page.swfUri); + event.setTxtUri(msg.page.txtUri); + event.setPngUri(msg.page.pngUri); + event.setXOffset(msg.page.xOffset); + event.setYOffset(msg.page.yOffset); + event.setWidthRatio(msg.page.widthRatio); + event.setHeightRatio(msg.page.heightRatio); + recorder.record(msg.meetingID, event); + } + } + + private def handleResizeAndMoveSlideOutMsg(msg: ResizeAndMoveSlideOutMsg) { + if (msg.recorded) { + val event = new ResizeAndMoveSlidePresentationRecordEvent(); + event.setMeetingId(msg.meetingID); + event.setTimestamp(System.currentTimeMillis()); + event.setId(msg.page.id); + event.setNum(msg.page.num); + event.setThumbUri(msg.page.thumbUri); + event.setSwfUri(msg.page.swfUri); + event.setTxtUri(msg.page.txtUri); + event.setPngUri(msg.page.pngUri); + event.setXOffset(msg.page.xOffset); + event.setYOffset(msg.page.yOffset); + event.setWidthRatio(msg.page.widthRatio); + event.setHeightRatio(msg.page.heightRatio); + + recorder.record(msg.meetingID, event); + } + } + + private def handleRemovePresentationOutMsg(msg: RemovePresentationOutMsg) { + if (msg.recorded) { + val event = new RemovePresentationPresentationRecordEvent(); + event.setMeetingId(msg.meetingID); + event.setTimestamp(System.currentTimeMillis()); + event.setPresentationName(msg.presentationID); + recorder.record(msg.meetingID, event); + } + } + + private def handleSharePresentationOutMsg(msg: SharePresentationOutMsg) { + if (msg.recorded) { + val event = new SharePresentationPresentationRecordEvent(); + event.setMeetingId(msg.meetingID); + event.setTimestamp(System.currentTimeMillis()); + event.setPresentationName(msg.presentation.id); + event.setOriginalFilename(msg.presentation.name); + event.setShare(true); + recorder.record(msg.meetingID, event); + } + } + + private def handleSendCursorUpdateOutMsg(msg: SendCursorUpdateOutMsg) { + if (msg.recorded) { + val event = new CursorUpdateRecordEvent(); + event.setMeetingId(msg.meetingID); + event.setTimestamp(System.currentTimeMillis()); + event.setXPercent(msg.xPercent); + event.setYPercent(msg.yPercent); + + recorder.record(msg.meetingID, event); + } + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/Users.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/Users.scala new file mode 100755 index 0000000000..4148bbfe65 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/Users.scala @@ -0,0 +1,133 @@ +package org.bigbluebutton.core.apps.users + +import org.bigbluebutton.core.models.{UserV, Voice} +import scala.collection.mutable.ArrayBuffer +import org.bigbluebutton.core.api.Role._ + +class Users { + + private val users = collection.mutable.HashMap[String, UserV]() + + /** + * Add a new user. + */ + def add(user: UserV) = users += user.id -> user + + /** + * Returns the number of users. + */ + def count = users.size + + /** + * Removes a user. + */ + def remove(id: String) = users -= id + + /** + * Gets a user. + */ + def get(id: String):Option[UserV] = users.values.find(u => u.id == id) + + /** + * Get all users. + */ + def all():Array[UserV] = users.values.toArray + + def getPresenter():Option[UserV] = users.values.find(u => u.status.isPresenter) + + def makeEveryoneNotPresenter():Unit = { + users.values map (u => { + val p = u.copy(status = u.status.copy(isPresenter=false)) + users += p.id -> p + }) + } + + def makePresenter(id:String):Option[UserV] = { + var newPresenter: Option[UserV] = None + get(id) match { + case Some(u) => { + val p = u.copy(status = u.status.copy(isPresenter=true)) + newPresenter = Some(p) + users += p.id -> p + } + case None => + } + newPresenter + } + + def moderatorCount:Int = users.values.filter(u => u.role == MODERATOR).size + + def getVoiceUser(id:String):Option[UserV] = users.values.find(u => u.voice.id == id) + + def mute(id:String):Option[UserV] = { + var user:Option[UserV] = None + getVoiceUser(id) match { + case Some(u) => { + val mutedUser = u.copy(voice=u.voice.copy(muted=true)) + users += mutedUser.id -> mutedUser + user = Some(mutedUser) + } + case None => + } + + user + } + + def unmute(id:String):Option[UserV] = { + var user:Option[UserV] = None + getVoiceUser(id) match { + case Some(u) => { + val unmutedUser = u.copy(voice=u.voice.copy(muted=false)) + users += unmutedUser.id -> unmutedUser + user = Some(unmutedUser) + } + case None => + } + + user + } + + def lockVoice(id:String, lock: Boolean):Option[UserV] = { + var user:Option[UserV] = None + get(id) match { + case Some(u) => { + val lockedUser = u.copy(voice=u.voice.copy(locked=lock)) + users += lockedUser.id -> lockedUser + user = Some(lockedUser) + } + case None => + } + + user + } + + def joinedVoice(id:String, voice: Voice):Option[UserV] = { + var user:Option[UserV] = None + get(id) match { + case Some(u) => { + val voiceUser = u.copy(voice=voice) + users += voiceUser.id -> voiceUser + user = Some(voiceUser) + } + case None => + } + + user + } + + def leftVoice(id:String):Option[UserV] = { + var user:Option[UserV] = None + getVoiceUser(id) match { + case Some(u) => { + val voiceUser = u.copy(voice=Voice()) + users += voiceUser.id -> voiceUser + user = Some(voiceUser) + } + case None => + } + + user + } + + def unlockedUsers():Array[UserV] = users.values filter (u => !u.voice.locked) toArray +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala new file mode 100644 index 0000000000..d2dd418892 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala @@ -0,0 +1,358 @@ + package org.bigbluebutton.core.apps.users + +import org.bigbluebutton.core.api._ + import scala.collection.mutable.HashMap + import org.bigbluebutton.core.User + import java.util.ArrayList + import org.bigbluebutton.core.MeetingActor + import scala.collection.mutable.ArrayBuffer + +trait UsersApp { + this : MeetingActor => + + val outGW: MessageOutGateway + + val users = new UsersModel + private var regUsers = new collection.immutable.HashMap[String, RegisteredUser] + + private var locked = false + private var meetingMuted = false + private var currentPresenter = new Presenter("system", "system", "system") + + def hasUser(userID: String):Boolean = { + users.hasUser(userID) + } + + def getUser(userID:String):Option[UserVO] = { + users.getUser(userID) + } + + def getCurrentPresenter:Presenter = { + currentPresenter + } + + def handleUserConnectedToGlobalAudio(msg: UserConnectedToGlobalAudio) { + println("*************** Got UserConnectedToGlobalAudio message for [" + msg.name + "] ********************" ) + val user = users.getUser(msg.userid) + user foreach {u => + val uvo = u.copy(listenOnly=true) + users.addUser(uvo) + outGW.send(new UserListeningOnly(meetingID, recorded, uvo.userID, uvo.listenOnly)) + } + } + + def handleUserDisconnectedFromGlobalAudio(msg: UserDisconnectedFromGlobalAudio) { + println("*************** Got UserDisconnectedToGlobalAudio message for [" + msg.name + "] ********************" ) + val user = users.getUser(msg.userid) + user foreach {u => + val uvo = u.copy(listenOnly=false) + users.addUser(uvo) + outGW.send(new UserListeningOnly(meetingID, recorded, uvo.userID, uvo.listenOnly)) + } + } + + def handleMuteMeetingRequest(msg: MuteMeetingRequest) { + meetingMuted = msg.mute + +// users2.unlockedUsers map ({ u => +// outGW.send(new MuteVoiceUser(meetingID, recorded, msg.requesterID, u.voice.id, msg.mute)) +// }) + } + + def handleValidateAuthToken(msg: ValidateAuthToken) { + println("*************** Got ValidateAuthToken message ********************" ) + regUsers.get (msg.userId) match { + case Some(u) => + { + val replyTo = meetingID + '/' + msg.userId + + //send the reply + outGW.send(new ValidateAuthTokenReply(meetingID, msg.userId, msg.token, true, msg.correlationId)) + + //send the list of users in the meeting + outGW.send(new GetUsersReply(meetingID, msg.userId, users.getUsers)) + + //send chat history + this ! (new GetChatHistoryRequest(meetingID, msg.userId, replyTo)) + + //join the user + handleUserJoin(new UserJoining(meetingID, msg.userId)) + + //send the presentation + this ! (new GetPresentationInfo(meetingID, msg.userId, replyTo)) + } + case None => outGW.send(new ValidateAuthTokenReply(meetingID, msg.userId, msg.token, false, msg.correlationId)) + } + } + + def handleRegisterUser(msg: RegisterUser) { + if (hasMeetingEnded) { + // Check first if the meeting has ended and the user refreshed the client to re-connect. + sendMeetingHasEnded(msg.userID) + } else { + val regUser = new RegisteredUser(msg.userID, msg.extUserID, msg.name, msg.role, msg.authToken) + regUsers += msg.userID -> regUser + outGW.send(new UserRegistered(meetingID, recorded, regUser)) + } + + } + + def handleIsMeetingMutedRequest(msg: IsMeetingMutedRequest) { + outGW.send(new IsMeetingMutedReply(meetingID, recorded, msg.requesterID, meetingMuted)) + } + + def handleMuteUserRequest(msg: MuteUserRequest) { + println("Received mute user request uid=[" + msg.userID + "] mute=[" + msg.mute + "]") + users.getUser(msg.userID) match { + case Some(u) => { + println("Sending mute user request uid=[" + msg.userID + "] mute=[" + msg.mute + "]") + outGW.send(new MuteVoiceUser(meetingID, recorded, msg.requesterID, u.userID, msg.mute)) + } + case None => { + println("Could not find user to mute. uid=[" + msg.userID + "] mute=[" + msg.mute + "]") + } + } + } + + def handleLockUserRequest(msg: LockUserRequest) { +// users2.lockVoice(msg.userID, msg.lock) + } + + def handleEjectUserRequest(msg: EjectUserRequest) { + println("Received eject user request uid=[" + msg.userID + "]") + users.getUser(msg.userID) match { + case Some(u) => outGW.send(new EjectVoiceUser(meetingID, recorded, msg.requesterID, u.userID)) + case None => // do nothing + } + } + + def handleLockUser(msg: LockUser) { + + } + + def handleLockAllUsers(msg: LockAllUsers) { + + } + + def handleGetLockSettings(msg: GetLockSettings) { + + } + + def handleIsMeetingLocked(msg: IsMeetingLocked) { + + } + + def handleSetLockSettings(msg: SetLockSettings) { + println("*************** Received new lock settings ********************") + if (permissions != msg.settings) { + permissions = msg.settings + val au = affectedUsers(msg.settings) + outGW.send(new NewPermissionsSetting(meetingID, msg.setByUser, permissions, au)) + + changeLayout(msg) + } + } + + private def changeLayout(msg: SetLockSettings) { + this ! new LayoutLockSettings(msg.meetingID, msg.setByUser, permissions.permissions.lockedLayout) + } + + def handleInitLockSettings(msg: InitLockSettings) { + if (! permissionsInited) { + permissionsInited = true + if (permissions != msg.settings || locked != msg.locked) { + permissions = msg.settings + locked = msg.locked + val au = affectedUsers(msg.settings) + outGW.send(new PermissionsSettingInitialized(msg.meetingID, msg.locked, msg.settings, au)) + } + } + } + + def affectedUsers(settings: PermissionsSetting):Array[UserVO] = { + val au = ArrayBuffer[UserVO]() + + users.getUsers foreach {u => + val nu = u.copy(permissions=settings.permissions) + users.addUser(nu) + if (! u.presenter && u.role != Role.MODERATOR) { + au += nu + } + } + au.toArray + } + + def handleUserRaiseHand(msg: UserRaiseHand) { + users.getUser(msg.userId) foreach {user => + val uvo = user.copy(raiseHand=true) + users.addUser(uvo) + outGW.send(new UserRaisedHand(meetingID, recorded, uvo.userID)) + } + } + + def handleUserLowerHand(msg: UserLowerHand) { + users.getUser(msg.userId) foreach {user => + val uvo = user.copy(raiseHand=false) + users.addUser(uvo) + outGW.send(new UserLoweredHand(meetingID, recorded, uvo.userID, msg.loweredBy)) + } + } + + def handleUserShareWebcam(msg: UserShareWebcam) { + users.getUser(msg.userId) foreach {user => + val uvo = user.copy(hasStream=true, webcamStream=msg.stream) + users.addUser(uvo) + outGW.send(new UserSharedWebcam(meetingID, recorded, uvo.userID, msg.stream)) + } + } + + def handleUserunshareWebcam(msg: UserUnshareWebcam) { + users.getUser(msg.userId) foreach {user => + val stream = user.webcamStream + val uvo = user.copy(hasStream=false, webcamStream="") + users.addUser(uvo) + outGW.send(new UserUnsharedWebcam(meetingID, recorded, uvo.userID, stream)) + } + } + + def handleChangeUserStatus(msg: ChangeUserStatus):Unit = { + if (users.hasUser(msg.userID)) { + outGW.send(new UserStatusChange(meetingID, recorded, msg.userID, msg.status, msg.value)) + } + } + + def handleGetUsers(msg: GetUsers):Unit = { + outGW.send(new GetUsersReply(msg.meetingID, msg.requesterID, users.getUsers)) + } + + def handleUserJoin(msg: UserJoining):Unit = { + val regUser = regUsers.get(msg.userID) + regUser foreach { ru => + val vu = new VoiceUser(msg.userID, msg.userID, ru.name, ru.name, + false, false, false, false) + val uvo = new UserVO(msg.userID, ru.externId, ru.name, + ru.role, raiseHand=false, presenter=false, + hasStream=false, locked=false, webcamStream="", + phoneUser=false, vu, listenOnly=false, permissions.permissions) + + users.addUser(uvo) + + outGW.send(new UserJoined(meetingID, recorded, uvo)) + + // Become presenter if the only moderator + if (users.numModerators == 1) { + if (ru.role == Role.MODERATOR) { + assignNewPresenter(msg.userID, ru.name, msg.userID) + } + } + } + } + + def handleUserLeft(msg: UserLeaving):Unit = { + if (users.hasUser(msg.userID)) { + val user = users.removeUser(msg.userID) + user foreach (u => outGW.send(new UserLeft(msg.meetingID, recorded, u))) + + } + else{ + + } + } + + def handleVoiceUserJoined(msg: VoiceUserJoined) = { + val user = users.getUser(msg.voiceUser.webUserId) match { + case Some(user) => { + val nu = user.copy(voiceUser=msg.voiceUser) + users.addUser(nu) + println("Received user joined voice for user [" + nu.name + "] userid=[" + msg.voiceUser.webUserId + "]" ) + outGW.send(new UserJoinedVoice(meetingID, recorded, voiceBridge, nu)) + } + case None => { + // No current web user. This means that the user called in through + // the phone. We need to generate a new user as we are not able + // to match with a web user. + val webUserId = users.generateWebUserId + val vu = new VoiceUser(msg.voiceUser.userId, webUserId, + msg.voiceUser.callerName, msg.voiceUser.callerNum, + true, false, false, false) + val uvo = new UserVO(webUserId, webUserId, msg.voiceUser.callerName, + Role.VIEWER, raiseHand=false, presenter=false, + hasStream=false, locked=false, webcamStream="", + phoneUser=true, vu, listenOnly=false, permissions.permissions) + + users.addUser(uvo) + println("New user joined voice for user [" + uvo.name + "] userid=[" + msg.voiceUser.webUserId + "]") + outGW.send(new UserJoined(meetingID, recorded, uvo)) + + outGW.send(new UserJoinedVoice(meetingID, recorded, voiceBridge, uvo)) + } + } + } + + def handleVoiceUserLeft(msg: VoiceUserLeft) { + users.getUser(msg.userId) foreach {user => + val vu = new VoiceUser(user.userID, user.userID, user.name, user.name, + false, false, false, false) + val nu = user.copy(voiceUser=vu) + users.addUser(nu) + + println("Received voice user left =[" + user.name + "] wid=[" + msg.userId + "]" ) + outGW.send(new UserLeftVoice(meetingID, recorded, voiceBridge, nu)) + + if (user.phoneUser) { + if (users.hasUser(user.userID)) { + val userLeaving = users.removeUser(user.userID) + userLeaving foreach (u => outGW.send(new UserLeft(msg.meetingID, recorded, u))) + } + } + } + } + + def handleVoiceUserMuted(msg: VoiceUserMuted) { + users.getUser(msg.userId) foreach {user => + val nv = user.voiceUser.copy(muted=msg.muted) + val nu = user.copy(voiceUser=nv) + users.addUser(nu) + println("Received voice muted=[" + msg.muted + "] wid=[" + msg.userId + "]" ) + outGW.send(new UserVoiceMuted(meetingID, recorded, voiceBridge, nu)) + } + } + + def handleVoiceUserTalking(msg: VoiceUserTalking) { + users.getUser(msg.userId) foreach {user => + val nv = user.voiceUser.copy(talking=msg.talking) + val nu = user.copy(voiceUser=nv) + users.addUser(nu) + println("Received voice talking=[" + msg.talking + "] wid=[" + msg.userId + "]" ) + outGW.send(new UserVoiceTalking(meetingID, recorded, voiceBridge, nu)) + } + } + + def handleAssignPresenter(msg: AssignPresenter):Unit = { + assignNewPresenter(msg.newPresenterID, msg.newPresenterName, msg.assignedBy) + } + + def assignNewPresenter(newPresenterID:String, newPresenterName: String, assignedBy: String) { + if (users.hasUser(newPresenterID)) { + + users.getCurrentPresenter match { + case Some(curPres) => { + users.unbecomePresenter(curPres.userID) + outGW.send(new UserStatusChange(meetingID, recorded, curPres.userID, "presenter", false:java.lang.Boolean)) + } + case None => // do nothing + } + + users.getUser(newPresenterID) match { + case Some(newPres) => { + users.becomePresenter(newPres.userID) + currentPresenter = new Presenter(newPresenterID, newPresenterName, assignedBy) + outGW.send(new PresenterAssigned(meetingID, recorded, new Presenter(newPresenterID, newPresenterName, assignedBy))) + outGW.send(new UserStatusChange(meetingID, recorded, newPresenterID, "presenter", true:java.lang.Boolean)) + } + case None => // do nothing + } + + } + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala new file mode 100755 index 0000000000..2966a19c4b --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala @@ -0,0 +1,85 @@ +package org.bigbluebutton.core.apps.users + +import org.bigbluebutton.core.User +import scala.collection.mutable.HashMap +import org.bigbluebutton.core.api.UserVO +import org.bigbluebutton.core.api.Role._ +import scala.collection.mutable.ArrayBuffer +import org.bigbluebutton.core.api.VoiceUser +import org.bigbluebutton.core.util.RandomStringGenerator + +class UsersModel { + private var uservos = new collection.immutable.HashMap[String, UserVO] + + def generateWebUserId:String = { + val webUserId = RandomStringGenerator.randomAlphanumericString(6) + if (! hasUser(webUserId)) webUserId else generateWebUserId + } + + def addUser(uvo: UserVO) { + uservos += uvo.userID -> uvo + } + + def removeUser(userId: String):Option[UserVO] = { + val user = uservos get (userId) + user foreach (u => uservos -= userId) + + user + } + + def hasUser(userID: String):Boolean = { + uservos.contains(userID) + } + + def numUsers():Int = { + uservos.size + } + + def getUser(userID:String):Option[UserVO] = { + uservos.values find (u => u.userID == userID) + } + + def getUsers():Array[UserVO] = { + uservos.values toArray + } + + def numModerators():Int = { + getModerators.length + } + + def getLoneModerator():Option[UserVO] = { + uservos.values find (u => u.role == MODERATOR) + } + + def getCurrentPresenter():Option[UserVO] = { + uservos.values find (u => u.presenter == true) + } + + def unbecomePresenter(userID: String) = { + uservos.get(userID) match { + case Some(u) => { + val nu = u.copy(presenter = false) + uservos += nu.userID -> nu + } + case None => // do nothing + } + } + + def becomePresenter(userID: String) = { + uservos.get(userID) match { + case Some(u) => { + val nu = u.copy(presenter = true) + uservos += nu.userID -> nu + } + case None => // do nothing + } + } + + def getModerators():Array[UserVO] = { + uservos.values filter (u => u.role == MODERATOR ) toArray + } + + def getViewers():Array[UserVO] = { + uservos.values filter (u => u.role == VIEWER ) toArray + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala new file mode 100644 index 0000000000..7f5459fe4c --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala @@ -0,0 +1,425 @@ +package org.bigbluebutton.core.apps.users.red5 + +import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService +import org.bigbluebutton.conference.meeting.messaging.red5.SharedObjectClientMessage +import java.util.ArrayList +import java.util.Map +import java.util.HashMap +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.meeting.messaging.red5.DirectClientMessage +import org.bigbluebutton.conference.meeting.messaging.red5.BroadcastClientMessage +import com.google.gson.Gson +import scala.collection.JavaConversions._ +import org.bigbluebutton.conference.meeting.messaging.red5.DisconnectAllClientsMessage +import org.bigbluebutton.conference.meeting.messaging.red5.DisconnectClientMessage + +class UsersClientMessageSender(service: ConnectionInvokerService) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: MeetingEnded => handleMeetingEnded(msg) + case msg: DisconnectAllUsers => handleDisconnectAllUsers(msg) + case msg: MeetingHasEnded => handleMeetingHasEnded(msg) + case msg: DisconnectUser => handleDisconnectUser(msg) + case msg: PresenterAssigned => handleAssignPresenter(msg) + case msg: UserJoined => handleUserJoined(msg) + case msg: UserLeft => handleUserLeft(msg) + case msg: UserStatusChange => handleUserStatusChange(msg) + case msg: UserRaisedHand => handleUserRaisedHand(msg) + case msg: UserLoweredHand => handleUserLoweredHand(msg) + case msg: UserSharedWebcam => handleUserSharedWebcam(msg) + case msg: UserUnsharedWebcam => handleUserUnshareWebcam(msg) + case msg: GetUsersReply => handleGetUsersReply(msg) + case msg: UserJoinedVoice => handleUserJoinedVoice(msg) + case msg: UserVoiceMuted => handleUserVoiceMuted(msg) + case msg: UserVoiceTalking => handleUserVoiceTalking(msg) + case msg: UserLeftVoice => handleUserLeftVoice(msg) + case msg: RecordingStatusChanged => handleRecordingStatusChanged(msg) + case msg: GetRecordingStatusReply => handleGetRecordingStatusReply(msg) + case msg: ValidateAuthTokenReply => handleValidateAuthTokenReply(msg) + case msg: UserRegistered => handleRegisteredUser(msg) + case msg: UserListeningOnly => handleUserListeningOnly(msg) + case msg: NewPermissionsSetting => handleNewPermissionsSetting(msg) + case _ => // println("Unhandled message in UsersClientMessageSender") + } + } + + private def buildUserHashMap(user: UserVO):java.util.HashMap[String, Object] = { + val vu = user.voiceUser + val vuser = new HashMap[String, Object]() + vuser.put("userId", vu.userId) + vuser.put("webUserId", vu.webUserId) + vuser.put("callerName", vu.callerName) + vuser.put("callerNum", vu.callerNum) + vuser.put("joined", vu.joined:java.lang.Boolean) + vuser.put("locked", vu.locked:java.lang.Boolean) + vuser.put("muted", vu.muted:java.lang.Boolean) + vuser.put("talking", vu.talking:java.lang.Boolean) + + val wuser = new HashMap[String, Object]() + wuser.put("userId", user.userID) + wuser.put("externUserID", user.externUserID) + wuser.put("name", user.name) + wuser.put("role", user.role.toString()) + wuser.put("raiseHand", user.raiseHand:java.lang.Boolean) + wuser.put("presenter", user.presenter:java.lang.Boolean) + wuser.put("hasStream", user.hasStream:java.lang.Boolean) + wuser.put("locked", user.locked:java.lang.Boolean) + wuser.put("webcamStream", user.webcamStream) + wuser.put("phoneUser", user.phoneUser:java.lang.Boolean) + wuser.put("voiceUser", vuser) + wuser.put("listenOnly", user.listenOnly:java.lang.Boolean) + + val permissions = new HashMap[String, Object]() + permissions.put("disableCam", user.permissions.disableCam:java.lang.Boolean) + permissions.put("disableMic", user.permissions.disableMic:java.lang.Boolean) + permissions.put("disablePrivChat", user.permissions.disablePrivChat:java.lang.Boolean) + permissions.put("disablePubChat", user.permissions.disablePubChat:java.lang.Boolean) + permissions.put("lockedLayout", user.permissions.lockedLayout:java.lang.Boolean) + + wuser.put("permissions", permissions) + + wuser + } + + private def handleNewPermissionsSetting(msg: NewPermissionsSetting) { + val args = new java.util.HashMap[String, Object](); + args.put("disableCam", msg.settings.permissions.disableCam:java.lang.Boolean); + args.put("disableMic", msg.settings.permissions.disableMic:java.lang.Boolean); + args.put("disablePrivChat", msg.settings.permissions.disablePrivChat:java.lang.Boolean); + args.put("disablePubChat", msg.settings.permissions.disablePubChat:java.lang.Boolean); + args.put("lockedLayout", msg.settings.permissions.lockedLayout:java.lang.Boolean); + + var users = new ArrayList[java.util.HashMap[String, Object]]; + msg.applyTo.foreach(uvo => { + users.add(buildUserHashMap(uvo)) + }) + + args.put("users", users); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleNewPermissionsSetting \n" + message.get("msg") + "\n") + val m = new BroadcastClientMessage(msg.meetingID, "permissionsSettingsChanged", message); + service.sendMessage(m); + } + + private def handleRegisteredUser(msg: UserRegistered) { + val args = new java.util.HashMap[String, Object](); + args.put("userId", msg.user.id); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleRegisteredUser \n" + message.get("msg") + "\n") + } + + private def handleValidateAuthTokenReply(msg: ValidateAuthTokenReply) { + val args = new java.util.HashMap[String, Object](); + args.put("userId", msg.requesterId); + args.put("valid", msg.valid:java.lang.Boolean); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleValidateAuthTokenReply \n" + message.get("msg") + "\n") + val m = new DirectClientMessage(msg.meetingID, msg.requesterId, "validateAuthTokenReply", message); + service.sendMessage(m); + } + + private def handleGetRecordingStatusReply(msg: GetRecordingStatusReply) { + val args = new java.util.HashMap[String, Object](); + args.put("userId", msg.userId); + args.put("recording", msg.recording:java.lang.Boolean); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleGetRecordingStatusReply \n" + message.get("msg") + "\n") + val m = new DirectClientMessage(msg.meetingID, msg.userId, "getRecordingStatusReply", message); + service.sendMessage(m); + } + + private def handleRecordingStatusChanged(msg: RecordingStatusChanged) { + val args = new java.util.HashMap[String, Object](); + args.put("userId", msg.userId); + args.put("recording", msg.recording:java.lang.Boolean); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleRecordingStatusChanged \n" + message.get("msg") + "\n") + val m = new BroadcastClientMessage(msg.meetingID, "recordingStatusChanged", message); + service.sendMessage(m); + } + + private def handleUserVoiceMuted(msg: UserVoiceMuted) { + val args = new java.util.HashMap[String, Object](); + args.put("meetingID", msg.meetingID); + args.put("userId", msg.user.userID); + args.put("voiceUserId", msg.user.voiceUser.userId); + args.put("muted", msg.user.voiceUser.muted:java.lang.Boolean); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserVoiceMuted \n" + message.get("msg") + "\n") +// log.debug("UsersClientMessageSender - handlePresentationConversionProgress \n" + message.get("msg") + "\n") + val m = new BroadcastClientMessage(msg.meetingID, "voiceUserMuted", message); + service.sendMessage(m); + } + + private def handleUserVoiceTalking(msg: UserVoiceTalking) { + val args = new java.util.HashMap[String, Object](); + args.put("meetingID", msg.meetingID); + args.put("userId", msg.user.userID); + args.put("voiceUserId", msg.user.voiceUser.userId); + args.put("talking", msg.user.voiceUser.talking:java.lang.Boolean); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserVoiceTalking \n" + message.get("msg") + "\n") +// log.debug("UsersClientMessageSender - handlePresentationConversionProgress \n" + message.get("msg") + "\n") + val m = new BroadcastClientMessage(msg.meetingID, "voiceUserTalking", message); + service.sendMessage(m); + } + + private def handleUserLeftVoice(msg: UserLeftVoice) { + val args = new java.util.HashMap[String, Object](); + args.put("meetingID", msg.meetingID); + args.put("user", buildUserHashMap(msg.user)) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserLeftVoice \n" + message.get("msg") + "\n") +// log.debug("UsersClientMessageSender - handleUserLeftVoice \n" + message.get("msg") + "\n") + val m = new BroadcastClientMessage(msg.meetingID, "userLeftVoice", message); + service.sendMessage(m); + } + + private def handleUserJoinedVoice(msg: UserJoinedVoice) { + val args = new java.util.HashMap[String, Object](); + args.put("meetingID", msg.meetingID); + args.put("user", buildUserHashMap(msg.user)) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserJoinedVoice \n" + message.get("msg") + "\n") +// log.debug("UsersClientMessageSender - handlePresentationConversionProgress \n" + message.get("msg") + "\n") + val m = new BroadcastClientMessage(msg.meetingID, "userJoinedVoice", message); + service.sendMessage(m); + } + + private def handleGetUsersReply(msg: GetUsersReply):Unit = { + var args = new HashMap[String, Object](); + args.put("count", msg.users.length:java.lang.Integer) + + var users = new ArrayList[java.util.HashMap[String, Object]]; + msg.users.foreach(uvo => { + users.add(buildUserHashMap(uvo)) + }) + + args.put("users", users); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson() + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleGetUsersReply \n" + message.get("msg") + "\n") + + var m = new DirectClientMessage(msg.meetingID, msg.requesterID, "getUsersReply", message) + service.sendMessage(m) + } + + private def handleMeetingHasEnded(msg: MeetingHasEnded):Unit = { + var args = new HashMap[String, Object](); + args.put("status", "Meeting has already ended."); + + var message = new HashMap[String, Object](); + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleMeetingHasEnded \n" + message.get("msg") + "\n") + + var m = new DirectClientMessage(msg.meetingID, msg.userId, "meetingHasEnded", message) + service.sendMessage(m); + } + + private def handleDisconnectUser(msg: DisconnectUser) { + println("UsersClientMessageSender - handleDisconnectUser mid=[" + msg.meetingID + "], uid=[" + msg.userId + "]\n") + + var m = new DisconnectClientMessage(msg.meetingID, msg.userId) + service.sendMessage(m); + } + + private def handleMeetingEnded(msg: MeetingEnded):Unit = { + var args = new HashMap[String, Object](); + args.put("status", "Meeting has been ended."); + + var message = new HashMap[String, Object](); + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleMeetingEnded \n" + msg.meetingID + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "meetingEnded", message); + service.sendMessage(m); + } + + private def handleDisconnectAllUsers(msg: DisconnectAllUsers) { + var dm = new DisconnectAllClientsMessage(msg.meetingID) + service.sendMessage(dm) + } + + private def handleAssignPresenter(msg:PresenterAssigned):Unit = { + var args = new HashMap[String, Object](); + args.put("newPresenterID", msg.presenter.presenterID); + args.put("newPresenterName", msg.presenter.presenterName); + args.put("assignedBy", msg.presenter.assignedBy); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleAssignPresenter \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "assignPresenterCallback", message); + service.sendMessage(m); + } + + private def handleUserJoined(msg: UserJoined):Unit = { + var args = new HashMap[String, Object](); + args.put("user", buildUserHashMap(msg.user)); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - joinMeetingReply \n" + message.get("msg") + "\n") + + var jmr = new DirectClientMessage(msg.meetingID, msg.user.userID, "joinMeetingReply", message); + service.sendMessage(jmr); + + println("UsersClientMessageSender - handleUserJoined \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "participantJoined", message); + service.sendMessage(m); + } + + + private def handleUserLeft(msg: UserLeft):Unit = { + var args = new HashMap[String, Object](); + args.put("user", buildUserHashMap(msg.user)); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserLeft \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "participantLeft", message); + service.sendMessage(m); + } + + def handleUserRaisedHand(msg: UserRaisedHand) { + var args = new HashMap[String, Object]() + args.put("userId", msg.userID) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserRaisedHand \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "userRaisedHand", message); + service.sendMessage(m); + } + + def handleUserLoweredHand(msg: UserLoweredHand) { + var args = new HashMap[String, Object](); + args.put("userId", msg.userID) + args.put("loweredBy", msg.loweredBy) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserLoweredHand \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "userLoweredHand", message); + service.sendMessage(m); + } + + def handleUserSharedWebcam(msg: UserSharedWebcam) { + var args = new HashMap[String, Object]() + args.put("userId", msg.userID) + args.put("webcamStream", msg.stream) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserSharedWebcam \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "userSharedWebcam", message); + service.sendMessage(m); + } + + def handleUserUnshareWebcam(msg: UserUnsharedWebcam) { + var args = new HashMap[String, Object]() + args.put("userId", msg.userID) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserUnshareWebcam \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "userUnsharedWebcam", message); + service.sendMessage(m); + } + + private def handleUserStatusChange(msg: UserStatusChange):Unit = { + var args = new HashMap[String, Object](); + args.put("userID", msg.userID); + args.put("status", msg.status); + args.put("value", msg.value); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserStatusChange \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "participantStatusChange", message); + service.sendMessage(m); + } + + private def handleUserListeningOnly(msg: UserListeningOnly) { + var args = new HashMap[String, Object](); + args.put("userId", msg.userID); + args.put("listenOnly", msg.listenOnly:java.lang.Boolean); + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("UsersClientMessageSender - handleUserListeningOnly \n" + message.get("msg") + "\n") + + var m = new BroadcastClientMessage(msg.meetingID, "user_listening_only", message); + service.sendMessage(m); + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala new file mode 100755 index 0000000000..4ff759917e --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala @@ -0,0 +1,194 @@ +package org.bigbluebutton.core.apps.users.redis + +import org.bigbluebutton.conference.service.messaging.redis.MessageSender +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.messaging.MessagingConstants +import com.google.gson.Gson + +class UsersEventRedisPublisher(service: MessageSender) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + + case msg: DisconnectAllUsers => handleDisconnectAllUsers(msg) + case msg: DisconnectUser => handleDisconnectUser(msg) + case msg: PermissionsSettingInitialized => handlePermissionsSettingInitialized(msg) + case msg: NewPermissionsSetting => handleNewPermissionsSetting(msg) + case msg: UserLocked => handleUserLocked(msg) + case msg: UsersLocked => handleUsersLocked(msg) + case msg: GetPermissionsSettingReply => handleGetPermissionsSettingReply(msg) + case msg: IsMeetingLockedReply => handleIsMeetingLockedReply(msg) + case msg: UserRegistered => handleUserRegistered(msg) + case msg: UserLeft => handleUserLeft(msg) + case msg: PresenterAssigned => handlePresenterAssigned(msg) + case msg: EndAndKickAll => handleEndAndKickAll(msg) + case msg: GetUsersReply => handleGetUsersReply(msg) + case msg: ValidateAuthTokenReply => handleValidateAuthTokenReply(msg) + case msg: UserJoined => handleUserJoined(msg) + case msg: UserRaisedHand => handleUserRaisedHand(msg) + case msg: UserLoweredHand => handleUserLoweredHand(msg) + case msg: UserSharedWebcam => handleUserSharedWebcam(msg) + case msg: UserUnsharedWebcam => handleUserUnsharedWebcam(msg) + case msg: UserStatusChange => handleUserStatusChange(msg) + case msg: UserVoiceMuted => handleUserVoiceMuted(msg) + case msg: UserVoiceTalking => handleUserVoiceTalking(msg) + case msg: EjectVoiceUser => handleEjectVoiceUser(msg) + case msg: UserJoinedVoice => handleUserJoinedVoice(msg) + case msg: UserLeftVoice => handleUserLeftVoice(msg) + case msg: IsMeetingMutedReply => handleIsMeetingMutedReply(msg) + case msg: UserListeningOnly => handleUserListeningOnly(msg) + case _ => //println("Unhandled message in UsersClientMessageSender") + } + } + + private def handleDisconnectAllUsers(msg: DisconnectAllUsers) { + val json = UsersMessageToJsonConverter.disconnectAllUsersToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleDisconnectUser(msg: DisconnectUser) { + val json = UsersMessageToJsonConverter.disconnectUserToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handlePermissionsSettingInitialized(msg: PermissionsSettingInitialized) { + val json = UsersMessageToJsonConverter.permissionsSettingInitializedToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleNewPermissionsSetting(msg: NewPermissionsSetting) { + val json = UsersMessageToJsonConverter.newPermissionsSettingToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleUserLocked(msg: UserLocked) { + val json = UsersMessageToJsonConverter.userLockedToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleUsersLocked(msg: UsersLocked) { + val json = UsersMessageToJsonConverter.usersLockedToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleGetPermissionsSettingReply(msg: GetPermissionsSettingReply) { + val json = UsersMessageToJsonConverter.getPermissionsSettingReplyToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleIsMeetingLockedReply(msg: IsMeetingLockedReply) { + val json = UsersMessageToJsonConverter.isMeetingLockedReplyToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleUserRegistered(msg: UserRegistered) { + val json = UsersMessageToJsonConverter.userRegisteredToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleUserStatusChange(msg: UserStatusChange) { + val json = UsersMessageToJsonConverter.userStatusChangeToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserRaisedHand(msg: UserRaisedHand) { + val json = UsersMessageToJsonConverter.userRaisedHandToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserLoweredHand(msg: UserLoweredHand) { + val json = UsersMessageToJsonConverter.userLoweredHandToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserSharedWebcam(msg: UserSharedWebcam) { + val json = UsersMessageToJsonConverter.userSharedWebcamToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserUnsharedWebcam(msg: UserUnsharedWebcam) { + val json = UsersMessageToJsonConverter.userUnsharedWebcamToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleGetUsersReply(msg: GetUsersReply) { + val json = UsersMessageToJsonConverter.getUsersReplyToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserJoinedVoice(msg: UserJoinedVoice) { + val json = UsersMessageToJsonConverter.userJoinedVoice(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserVoiceMuted(msg: UserVoiceMuted) { + val json = UsersMessageToJsonConverter.userVoiceMuted(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserVoiceTalking(msg: UserVoiceTalking) { + val json = UsersMessageToJsonConverter.userVoiceTalking(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleEjectVoiceUser(msg: EjectVoiceUser) { + val json = UsersMessageToJsonConverter.ejectVoiceUserToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserLeftVoice(msg: UserLeftVoice) { + val json = UsersMessageToJsonConverter.userLeftVoiceToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleIsMeetingMutedReply(msg: IsMeetingMutedReply) { + val json = UsersMessageToJsonConverter.isMeetingMutedReplyToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleRecordingStatusChanged(msg: RecordingStatusChanged) { + val json = UsersMessageToJsonConverter.recordingStatusChangedToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleGetRecordingStatusReply(msg: GetRecordingStatusReply) { + val json = UsersMessageToJsonConverter.getRecordingStatusReplyToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleValidateAuthTokenReply(msg: ValidateAuthTokenReply) { + val json = UsersMessageToJsonConverter.validateAuthTokenReplyToJson(msg) + println("************** Publishing [" + json + "] *******************") + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserJoined(msg: UserJoined) { + val json = UsersMessageToJsonConverter.userJoinedToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleRegisteredUser(msg: UserRegistered) { + val json = UsersMessageToJsonConverter.userRegisteredToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserLeft(msg: UserLeft) { + val json = UsersMessageToJsonConverter.userLeftToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handlePresenterAssigned(msg: PresenterAssigned) { + val json = UsersMessageToJsonConverter.presenterAssignedToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleEndAndKickAll(msg: EndAndKickAll) { + val json = UsersMessageToJsonConverter.endAndKickAllToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } + + private def handleUserListeningOnly(msg: UserListeningOnly) { + val json = UsersMessageToJsonConverter.userListeningOnlyToJson(msg) + service.send(MessagingConstants.FROM_USERS_CHANNEL, json) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisRecorder.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisRecorder.scala new file mode 100755 index 0000000000..e203aaa81f --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisRecorder.scala @@ -0,0 +1,214 @@ +package org.bigbluebutton.core.apps.users.redis + +import org.bigbluebutton.conference.service.recorder.RecorderApplication +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.recorder.participants.ParticipantEndAndKickAllRecordEvent +import org.bigbluebutton.conference.service.recorder.participants.AssignPresenterRecordEvent +import org.bigbluebutton.conference.service.recorder.participants.ParticipantStatusChangeRecordEvent +import org.bigbluebutton.conference.service.recorder.participants.ParticipantLeftRecordEvent +import org.bigbluebutton.conference.service.recorder.participants.ParticipantJoinRecordEvent +import org.bigbluebutton.webconference.voice.ParticipantMutedVoiceRecordEvent +import org.bigbluebutton.webconference.voice.ParticipantTalkingVoiceRecordEvent +import org.bigbluebutton.webconference.voice.ParticipantJoinedVoiceRecordEvent +import org.bigbluebutton.webconference.voice.ParticipantLeftVoiceRecordEvent +import org.bigbluebutton.conference.service.recorder.participants.RecordStatusRecordEvent +import org.bigbluebutton.webconference.voice.StartRecordingVoiceRecordEvent + +class UsersEventRedisRecorder(recorder: RecorderApplication) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: EndAndKickAll => handleEndAndKickAll(msg) + case msg: PresenterAssigned => handleAssignPresenter(msg) + case msg: UserJoined => handleUserJoined(msg) + case msg: UserLeft => handleUserLeft(msg) + case msg: UserStatusChange => handleUserStatusChange(msg) + case msg: UserVoiceMuted => handleUserVoiceMuted(msg) + case msg: UserVoiceTalking => handleUserVoiceTalking(msg) + case msg: UserJoinedVoice => handleUserJoinedVoice(msg) + case msg: UserLeftVoice => handleUserLeftVoice(msg) + case msg: RecordingStatusChanged => handleRecordingStatusChanged(msg) + case msg: UserRaisedHand => handleUserRaisedHand(msg) + case msg: UserLoweredHand => handleUserLoweredHand(msg) + case msg: UserSharedWebcam => handleUserSharedWebcam(msg) + case msg: UserUnsharedWebcam => handleUserUnsharedWebcam(msg) + case msg: VoiceRecordingStarted => handleVoiceRecordingStarted(msg) + case msg: VoiceRecordingStopped => handleVoiceRecordingStopped(msg) + case _ => //println("Unhandled message in UsersClientMessageSender") + } + } + + private def handleEndAndKickAll(msg: EndAndKickAll):Unit = { + if (msg.recorded) { + val ev = new ParticipantEndAndKickAllRecordEvent(); + ev.setTimestamp(TimestampGenerator.generateTimestamp); + ev.setMeetingId(msg.meetingID); + recorder.record(msg.meetingID, ev); + } + } + + private def handleUserJoined(msg: UserJoined):Unit = { + if (msg.recorded) { + val ev = new ParticipantJoinRecordEvent(); + ev.setTimestamp(TimestampGenerator.generateTimestamp); + ev.setUserId(msg.user.userID); + ev.setName(msg.user.name); + ev.setMeetingId(msg.meetingID); + ev.setRole(msg.user.role.toString()); + + recorder.record(msg.meetingID, ev); + } + } + + def handleVoiceRecordingStarted(msg: VoiceRecordingStarted) { + if (msg.recorded) { + val evt = new StartRecordingVoiceRecordEvent(true); + evt.setMeetingId(msg.meetingID); + evt.setTimestamp(TimestampGenerator.generateTimestamp); + evt.setBridge(msg.confNum); + evt.setRecordingTimestamp(msg.timestamp); + evt.setFilename(msg.recordingFile); + recorder.record(msg.meetingID, evt); + } + } + + def handleVoiceRecordingStopped(msg: VoiceRecordingStopped) { + if (msg.recorded) { + val evt = new StartRecordingVoiceRecordEvent(false); + evt.setMeetingId(msg.meetingID); + evt.setTimestamp(TimestampGenerator.generateTimestamp); + evt.setBridge(msg.confNum); + evt.setRecordingTimestamp(msg.timestamp); + evt.setFilename(msg.recordingFile); + recorder.record(msg.meetingID, evt); + } + } + + def handleUserVoiceMuted(msg: UserVoiceMuted) { + if (msg.recorded) { + val ev = new ParticipantMutedVoiceRecordEvent() + ev.setMeetingId(msg.meetingID); + ev.setTimestamp(TimestampGenerator.generateTimestamp); + ev.setBridge(msg.confNum); + ev.setParticipant(msg.user.voiceUser.userId); + ev.setMuted(msg.user.voiceUser.muted); + + recorder.record(msg.meetingID, ev); + } + } + + def handleUserVoiceTalking(msg: UserVoiceTalking) { + if (msg.recorded) { + val evt = new ParticipantTalkingVoiceRecordEvent(); + evt.setMeetingId(msg.meetingID); + evt.setTimestamp(TimestampGenerator.generateTimestamp); + evt.setBridge(msg.confNum); + evt.setParticipant(msg.user.userID); + evt.setTalking(msg.user.voiceUser.talking); + + recorder.record(msg.meetingID, evt); + } + } + + def handleUserJoinedVoice(msg: UserJoinedVoice) { + if (msg.recorded) { + val evt = new ParticipantJoinedVoiceRecordEvent(); + evt.setMeetingId(msg.meetingID); + evt.setTimestamp(TimestampGenerator.generateTimestamp); + evt.setBridge(msg.confNum); + evt.setParticipant(msg.user.voiceUser.userId); + evt.setCallerName(msg.user.voiceUser.callerName); + evt.setCallerNumber(msg.user.voiceUser.callerNum); + evt.setMuted(msg.user.voiceUser.muted); + evt.setTalking(msg.user.voiceUser.talking); + + recorder.record(msg.meetingID, evt) + } + } + + def handleUserLeftVoice(msg: UserLeftVoice) { + if (msg.recorded) { + val evt = new ParticipantLeftVoiceRecordEvent(); + evt.setMeetingId(msg.meetingID); + evt.setTimestamp(TimestampGenerator.generateTimestamp); + evt.setBridge(msg.confNum); + evt.setParticipant(msg.user.voiceUser.userId); + recorder.record(msg.meetingID, evt); + } + } + + def handleRecordingStatusChanged(msg: RecordingStatusChanged) { + if (msg.recorded) { + val evt = new RecordStatusRecordEvent(); + evt.setMeetingId(msg.meetingID); + evt.setTimestamp(TimestampGenerator.generateTimestamp); + evt.setUserId(msg.userId); + evt.setRecordingStatus(msg.recording.toString); + + recorder.record(msg.meetingID, evt); + } + } + + private def handleUserLeft(msg: UserLeft):Unit = { + if (msg.recorded) { + val ev = new ParticipantLeftRecordEvent(); + ev.setTimestamp(TimestampGenerator.generateTimestamp); + ev.setUserId(msg.user.userID); + ev.setMeetingId(msg.meetingID); + + recorder.record(msg.meetingID, ev); + } + + } + + private def handleUserRaisedHand(msg: UserRaisedHand) { + val status = UserStatusChange(msg.meetingID, msg.recorded, + msg.userID, "raiseHand", true:java.lang.Boolean) + handleUserStatusChange(status) + } + + private def handleUserLoweredHand(msg: UserLoweredHand) { + val status = UserStatusChange(msg.meetingID, msg.recorded, + msg.userID, "raiseHand", false:java.lang.Boolean) + handleUserStatusChange(status) + } + + private def handleUserSharedWebcam(msg: UserSharedWebcam) { + val status = UserStatusChange(msg.meetingID, msg.recorded, + msg.userID, "hasStream", "true,stream=" + msg.stream) + handleUserStatusChange(status) + } + + private def handleUserUnsharedWebcam(msg: UserUnsharedWebcam) { + val status = UserStatusChange(msg.meetingID, msg.recorded, + msg.userID, "hasStream", "false,stream=" + msg.stream) + handleUserStatusChange(status) + } + + private def handleUserStatusChange(msg: UserStatusChange):Unit = { + if (msg.recorded) { + val ev = new ParticipantStatusChangeRecordEvent(); + ev.setTimestamp(TimestampGenerator.generateTimestamp); + ev.setUserId(msg.userID); + ev.setMeetingId(msg.meetingID); + ev.setStatus(msg.status); + ev.setValue(msg.value.toString()); + + recorder.record(msg.meetingID, ev); + } + } + + private def handleAssignPresenter(msg:PresenterAssigned):Unit = { + if (msg.recorded) { + val event = new AssignPresenterRecordEvent(); + event.setMeetingId(msg.meetingID); + event.setTimestamp(TimestampGenerator.generateTimestamp); + event.setUserId(msg.presenter.presenterID); + event.setName(msg.presenter.presenterName); + event.setAssignedBy(msg.presenter.assignedBy); + + recorder.record(msg.meetingID, event); + } + + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala new file mode 100644 index 0000000000..85657a206b --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala @@ -0,0 +1,376 @@ +package org.bigbluebutton.core.apps.users.redis + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.messaging.MessagingConstants +import org.bigbluebutton.core.messaging.Util +import com.google.gson.Gson +import org.bigbluebutton.core.api.UserVO +import collection.JavaConverters._ +import scala.collection.JavaConversions._ + +object UsersMessageToJsonConverter { + private def userToMap(user: UserVO):java.util.Map[String, Any] = { + + val wuser = new scala.collection.mutable.HashMap[String, Any] + wuser += "userid" -> user.userID + wuser += "extern_userid" -> user.externUserID + wuser += "name" -> user.name + wuser += "role" -> user.role.toString() + wuser += "raise_hand" -> user.raiseHand + wuser += "presenter" -> user.presenter + wuser += "has_stream" -> user.hasStream + wuser += "locked" -> user.locked + wuser += "webcam_stream" -> user.webcamStream + wuser += "phone_user" -> user.phoneUser + wuser += "listenOnly" -> user.listenOnly + + val permissions = new scala.collection.mutable.HashMap[String, Any] + permissions.put("disableCam", user.permissions.disableCam) + permissions.put("disableMic", user.permissions.disableMic) + permissions.put("disablePrivChat", user.permissions.disablePrivChat) + permissions.put("disablePubChat", user.permissions.disablePubChat) + permissions.put("lockedLayout", user.permissions.lockedLayout) + + wuser.put("permissions", permissions) + + val vuser = new scala.collection.mutable.HashMap[String, Any] + vuser += "userid" -> user.voiceUser.userId + vuser += "web_userid" -> user.voiceUser.webUserId + vuser += "callername" -> user.voiceUser.callerName + vuser += "callernum" -> user.voiceUser.callerNum + vuser += "joined" -> user.voiceUser.joined + vuser += "locked" -> user.voiceUser.locked + vuser += "muted" -> user.voiceUser.muted + vuser += "talking" -> user.voiceUser.talking + + wuser.put("voiceUser", mapAsJavaMap(vuser)) + + mapAsJavaMap(wuser) + } + + private def registeredUserToMap(user: RegisteredUser):java.util.Map[String, Any] = { + val wuser = new scala.collection.mutable.HashMap[String, Any] + wuser += "userid" -> user.id + wuser += "extern_userid" -> user.externId + wuser += "name" -> user.name + wuser += "role" -> user.role.toString() + wuser += "authToken" -> user.authToken + + mapAsJavaMap(wuser) + } + + def disconnectAllUsersToJson(msg: DisconnectAllUsers):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = Util.buildHeader(MessageNames.DISCONNECT_ALL_USERS, msg.version, None) + Util.buildJson(header, payload) + } + + def disconnectUserToJson(msg: DisconnectUser):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = Util.buildHeader(MessageNames.DISCONNECT_USER, msg.version, None) + Util.buildJson(header, payload) + } + + def permissionsSettingInitializedToJson(msg: PermissionsSettingInitialized):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.LOCKED, msg.locked) + payload.put(Constants.SETTINGS, msg.settings.toString()) //#todo not tested + + val header = Util.buildHeader(MessageNames.PERMISSION_SETTING_INITIALIZED, msg.version, None) + Util.buildJson(header, payload) + } + + def newPermissionsSettingToJson(msg: NewPermissionsSetting):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put("disableCam", msg.settings.permissions.disableCam) + payload.put("disableMic", msg.settings.permissions.disableMic) + payload.put("disablePrivChat", msg.settings.permissions.disablePrivChat) + payload.put("disablePubChat", msg.settings.permissions.disablePubChat) + + val users = new java.util.ArrayList[java.util.Map[String, Any]] + msg.applyTo.foreach(uvo => { + users.add(userToMap(uvo)) + }) + + payload.put("users", users) + + val header = Util.buildHeader(MessageNames.NEW_PERMISSION_SETTINGS, msg.version, None) + Util.buildJson(header, payload) + } + + def userLockedToJson(msg: UserLocked):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.LOCKED, msg.lock) + + val header = Util.buildHeader(MessageNames.USER_LOCKED, msg.version, None) + Util.buildJson(header, payload) + } + + def usersLockedToJson(msg: UsersLocked):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.EXCEPT_USERS, msg.exceptUsers.toString()) + payload.put(Constants.LOCKED, msg.lock) + + val header = Util.buildHeader(MessageNames.USERS_LOCKED, msg.version, None) + Util.buildJson(header, payload) + } + + def getPermissionsSettingReplyToJson(msg: GetPermissionsSettingReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = Util.buildHeader(MessageNames.GET_PERMISSION_SETTINGS_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def isMeetingLockedReplyToJson(msg: IsMeetingLockedReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = Util.buildHeader(MessageNames.IS_MEETING_LOCKED_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def userRegisteredToJson(msg: UserRegistered):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER, registeredUserToMap(msg.user)) + payload.put(Constants.RECORDED, msg.recorded) + + val header = Util.buildHeader(MessageNames.USER_REGISTERED, msg.version, None) + Util.buildJson(header, payload) + } + + + def userRaisedHandToJson(msg: UserRaisedHand):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RAISE_HAND, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + + val header = Util.buildHeader(MessageNames.USER_RAISED_HAND, msg.version, None) + Util.buildJson(header, payload) + } + + def userLoweredHandToJson(msg: UserLoweredHand):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RAISE_HAND, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.LOWERED_BY, msg.loweredBy) + + val header = Util.buildHeader(MessageNames.USER_LOWERED_HAND, msg.version, None) + Util.buildJson(header, payload) + } + + def userStatusChangeToJson(msg: UserStatusChange):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.STATUS, msg.status) + payload.put(Constants.VALUE, msg.value.toString) + + val header = Util.buildHeader(MessageNames.USER_STATUS_CHANGED, msg.version, None) + Util.buildJson(header, payload) + } + + def userSharedWebcamToJson(msg: UserSharedWebcam):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.STREAM, msg.stream) + + val header = Util.buildHeader(MessageNames.USER_SHARED_WEBCAM, msg.version, None) + Util.buildJson(header, payload) + } + + def userUnsharedWebcamToJson(msg: UserUnsharedWebcam):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.STREAM, msg.stream) + + val header = Util.buildHeader(MessageNames.USER_UNSHARED_WEBCAM, msg.version, None) + Util.buildJson(header, payload) + } + + def getUsersReplyToJson(msg: GetUsersReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val users = new java.util.ArrayList[java.util.Map[String, Any]]; + msg.users.foreach(uvo => { + users.add(userToMap(uvo)) + }) + + payload.put(Constants.USERS, users) + + val header = Util.buildHeader(MessageNames.GET_USERS_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def userJoinedVoice(msg: UserJoinedVoice):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER, userToMap(msg.user)) + payload.put(Constants.VOICE_CONF, msg.confNum) + + val header = Util.buildHeader(MessageNames.USER_JOINED_VOICE, msg.version, None) + Util.buildJson(header, payload) + } + + def userVoiceMuted(msg: UserVoiceMuted):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER, userToMap(msg.user)) + payload.put(Constants.VOICE_CONF, msg.confNum) + + val header = Util.buildHeader(MessageNames.USER_VOICE_MUTED, msg.version, None) + Util.buildJson(header, payload) + } + + def userVoiceTalking(msg: UserVoiceTalking):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER, userToMap(msg.user)) + payload.put(Constants.VOICE_CONF, msg.confNum) + + val header = Util.buildHeader(MessageNames.USER_VOICE_TALKING, msg.version, None) + Util.buildJson(header, payload) + } + + def ejectVoiceUserToJson(msg: EjectVoiceUser):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = Util.buildHeader(MessageNames.EJECT_VOICE_USER, msg.version, None) + Util.buildJson(header, payload) + } + + def userLeftVoiceToJson(msg: UserLeftVoice):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER, userToMap(msg.user)) + payload.put(Constants.VOICE_CONF, msg.confNum) + + val header = Util.buildHeader(MessageNames.USER_LEFT_VOICE, msg.version, None) + Util.buildJson(header, payload) + } + + def isMeetingMutedReplyToJson(msg: IsMeetingMutedReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.MUTED, msg.meetingMuted) + + val header = Util.buildHeader(MessageNames.IS_MEETING_MUTED_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def recordingStatusChangedToJson(msg: RecordingStatusChanged):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.RECORDING, msg.recording) + + val header = Util.buildHeader(MessageNames.RECORDING_STATUS_CHANGED, msg.version, None) + Util.buildJson(header, payload) + } + + def getRecordingStatusReplyToJson(msg: GetRecordingStatusReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.RECORDING, msg.recording) + + val header = Util.buildHeader(MessageNames.GET_RECORDING_STATUS_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def validateAuthTokenReplyToJson(msg: ValidateAuthTokenReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.REPLY_TO, msg.correlationId) + payload.put(Constants.VALID, msg.valid.toString) + payload.put(Constants.USER_ID, msg.requesterId) + payload.put(Constants.AUTH_TOKEN, msg.token) + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = Util.buildHeader(MessageNames.VALIDATE_AUTH_TOKEN_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def userJoinedToJson(msg: UserJoined):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put("user", userToMap(msg.user)) + + val header = Util.buildHeader(MessageNames.USER_JOINED, msg.version, None) + Util.buildJson(header, payload) + } + + + def userLeftToJson(msg: UserLeft):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put("user", userToMap(msg.user)) + + val header = Util.buildHeader(MessageNames.USER_LEFT, msg.version, None) + Util.buildJson(header, payload) + } + + def presenterAssignedToJson(msg: PresenterAssigned):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.NEW_PRESENTER_ID, msg.presenter.presenterID); + payload.put(Constants.NEW_PRESENTER_NAME, msg.presenter.presenterName); + payload.put(Constants.ASSIGNED_BY, msg.presenter.assignedBy); + payload.put(Constants.RECORDED, msg.recorded) + + val header = Util.buildHeader(MessageNames.PRESENTER_ASSIGNED, msg.version, None) + Util.buildJson(header, payload) + } + + def endAndKickAllToJson(msg: EndAndKickAll):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + + val header = Util.buildHeader(MessageNames.END_AND_KICK_ALL, msg.version, None) + Util.buildJson(header, payload) + } + + def userListeningOnlyToJson(msg: UserListeningOnly):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userID) + payload.put(Constants.LISTEN_ONLY, msg.listenOnly) + + val header = Util.buildHeader(MessageNames.USER_LISTEN_ONLY, msg.version, None) + Util.buildJson(header, payload) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala new file mode 100755 index 0000000000..58eb537b0a --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala @@ -0,0 +1,30 @@ +package org.bigbluebutton.core.apps.voice + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.core.MeetingActor + +trait VoiceApp { + this : MeetingActor => + + val outGW: MessageOutGateway + + def handleMuteMeetingRequest(msg: MuteMeetingRequest) { + + } + + def handleIsMeetingMutedRequest(msg: IsMeetingMutedRequest) { + + } + + def handleMuteUserRequest(msg: MuteUserRequest) { + + } + + def handleLockUserRequest(msg: LockUserRequest) { + + } + + def handleEjectUserRequest(msg: EjectUserRequest) { + + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceInGateway.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceInGateway.scala new file mode 100755 index 0000000000..5d0324e3d4 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceInGateway.scala @@ -0,0 +1,60 @@ +package org.bigbluebutton.core.apps.voice + +import org.bigbluebutton.core.BigBlueButtonGateway +import org.bigbluebutton.core.api._ + +class VoiceInGateway(bbbGW: BigBlueButtonGateway) { + def muteAllUsers(meetingID: String, requesterID: String, mute: Boolean) { + bbbGW.accept(new MuteMeetingRequest(meetingID, requesterID, mute)) + } + + def isMeetingMuted(meetingID: String, requesterID: String) { + bbbGW.accept(new IsMeetingMutedRequest(meetingID, requesterID)) + } + + def muteUser(meetingID: String, requesterID: String, userID: String, mute: Boolean) { + bbbGW.accept(new MuteUserRequest(meetingID, requesterID, userID, mute)) + } + + def lockUser(meetingID: String, requesterID: String, userID: String, lock: Boolean) { + bbbGW.accept(new LockUserRequest(meetingID, requesterID, userID, lock)) + } + + def ejectUser(meetingID: String, requesterID: String, userID: String) { + bbbGW.accept(new EjectUserRequest(meetingID, requesterID, userID)) + } + + def voiceUserJoined(meetingId: String, userId: String, webUserId: String, + conference: String, callerIdNum: String, + callerIdName: String, + muted: Boolean, talking: Boolean) { + println("VoiceInGateway: Got voiceUserJoined message for meeting [" + meetingId + "] user[" + callerIdName + "]") + val voiceUser = new VoiceUser(userId, webUserId, + callerIdName, callerIdNum, + true, false, muted, talking) + bbbGW.accept(new VoiceUserJoined(meetingId, voiceUser)) + } + + def voiceUserLeft(meetingId: String, userId: String) { + println("VoiceInGateway: Got voiceUserLeft message for meeting [" + meetingId + "] user[" + userId + "]") + bbbGW.accept(new VoiceUserLeft(meetingId, userId)) + } + + def voiceUserLocked(meetingId: String, userId: String, locked: Boolean) { + bbbGW.accept(new VoiceUserLocked(meetingId, userId, locked)) + } + + def voiceUserMuted(meetingId: String, userId: String, muted: Boolean) { + bbbGW.accept(new VoiceUserMuted(meetingId, userId, muted)) + } + + def voiceUserTalking(meetingId: String, userId: String, talking: Boolean) { + bbbGW.accept(new VoiceUserTalking(meetingId, userId, talking)) + } + + def voiceRecording(meetingId: String, recordingFile: String, + timestamp: String, recording: java.lang.Boolean) { + bbbGW.accept(new VoiceRecording(meetingId, recordingFile, + timestamp, recording)) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala new file mode 100755 index 0000000000..30f461e8f9 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala @@ -0,0 +1,93 @@ +package org.bigbluebutton.core.apps.whiteboard + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.whiteboard.WhiteboardKeyUtil +import org.bigbluebutton.core.MeetingActor +import org.bigbluebutton.core.apps.whiteboard.vo._ + +case class Whiteboard(id: String, shapes:Seq[AnnotationVO]) + +trait WhiteboardApp { + this : MeetingActor => + + val outGW: MessageOutGateway + + private val wbModel = new WhiteboardModel + + def handleSendWhiteboardAnnotationRequest(msg: SendWhiteboardAnnotationRequest) { + val status = msg.annotation.status + val shapeType = msg.annotation.shapeType + val wbId = msg.annotation.wbId + val shape = msg.annotation + + println("Received whiteboard shape. status=[" + status + "], shapeType=[" + shapeType + "]") + + if (WhiteboardKeyUtil.TEXT_CREATED_STATUS == status) { + println("Received textcreated status") + wbModel.addAnnotation(wbId, shape) + } else if ((WhiteboardKeyUtil.PENCIL_TYPE == shapeType) + && (WhiteboardKeyUtil.DRAW_START_STATUS == status)) { + println("Received pencil draw start status") + wbModel.addAnnotation(wbId, shape) + } else if ((WhiteboardKeyUtil.DRAW_END_STATUS == status) + && ((WhiteboardKeyUtil.RECTANGLE_TYPE == shapeType) + || (WhiteboardKeyUtil.ELLIPSE_TYPE == shapeType) + || (WhiteboardKeyUtil.TRIANGLE_TYPE == shapeType) + || (WhiteboardKeyUtil.LINE_TYPE == shapeType))) { + println("Received [" + shapeType +"] draw end status") + wbModel.addAnnotation(wbId, shape) + } else if (WhiteboardKeyUtil.TEXT_TYPE == shapeType) { + println("Received [" + shapeType +"] modify text status") + wbModel.modifyText(wbId, shape) + } else { + println("Received UNKNOWN whiteboard shape!!!!. status=[" + status + "], shapeType=[" + shapeType + "]") + } + + wbModel.getWhiteboard(wbId) foreach {wb => + println("WhiteboardApp::handleSendWhiteboardAnnotationRequest - num shapes [" + wb.shapes.length + "]") + outGW.send(new SendWhiteboardAnnotationEvent(meetingID, recorded, + msg.requesterID, wbId, msg.annotation)) + } + + } + + def handleGetWhiteboardShapesRequest(msg: GetWhiteboardShapesRequest) { + println("WB: Received page history [" + msg.whiteboardId + "]") + wbModel.history(msg.whiteboardId) foreach {wb => + outGW.send(new GetWhiteboardShapesReply(meetingID, recorded, + msg.requesterID, wb.id, wb.shapes.toArray, msg.replyTo)) + } + } + + def handleClearWhiteboardRequest(msg: ClearWhiteboardRequest) { + println("WB: Received clear whiteboard") + wbModel.clearWhiteboard(msg.whiteboardId) + wbModel.getWhiteboard(msg.whiteboardId) foreach {wb => + outGW.send(new ClearWhiteboardEvent(meetingID, recorded, + msg.requesterID, wb.id)) + } + } + + def handleUndoWhiteboardRequest(msg: UndoWhiteboardRequest) { + println("WB: Received undo whiteboard") + + wbModel.getWhiteboard(msg.whiteboardId) foreach {wb => + wbModel.undoWhiteboard(msg.whiteboardId) foreach {last => + outGW.send(new UndoWhiteboardEvent(meetingID, recorded, + msg.requesterID, wb.id, last.id)) + } + } + } + + def handleEnableWhiteboardRequest(msg: EnableWhiteboardRequest) { + wbModel.enableWhiteboard(msg.enable) + outGW.send(new WhiteboardEnabledEvent(meetingID, recorded, + msg.requesterID, msg.enable)) + } + + def handleIsWhiteboardEnabledRequest(msg: IsWhiteboardEnabledRequest) { + val enabled = wbModel.isWhiteboardEnabled() + outGW.send(new IsWhiteboardEnabledReply(meetingID, recorded, + msg.requesterID, enabled, msg.replyTo)) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardInGateway.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardInGateway.scala new file mode 100755 index 0000000000..e9619bdff2 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardInGateway.scala @@ -0,0 +1,54 @@ +package org.bigbluebutton.core.apps.whiteboard + +import org.bigbluebutton.core.BigBlueButtonGateway +import org.bigbluebutton.core.api._ +import org.bigbluebutton.core.apps.whiteboard.vo.AnnotationVO + +class WhiteboardInGateway(bbbGW: BigBlueButtonGateway) { + + private def buildAnnotation(annotation: Map[String, Object]):Option[AnnotationVO] = { + var shape:Option[AnnotationVO] = None + + val id = annotation.getOrElse("id", null).asInstanceOf[String] + val shapeType = annotation.getOrElse("type", null).asInstanceOf[String] + val status = annotation.getOrElse("status", null).asInstanceOf[String] + val wbId = annotation.getOrElse("whiteboardId", null).asInstanceOf[String] + println("** GOT ANNOTATION status[" + status + "] shape=[" + shapeType + "]"); + + if (id != null && shapeType != null && status != null && wbId != null) { + shape = Some(new AnnotationVO(id, status, shapeType, annotation.toMap, wbId)) + } + + shape + } + + def sendWhiteboardAnnotation(meetingID: String, requesterID: String, annotation: Map[String, Object]) { + buildAnnotation(annotation) match { + case Some(shape) => { + bbbGW.accept(new SendWhiteboardAnnotationRequest(meetingID, requesterID, shape)) + } + case None => // do nothing + } + } + + def requestWhiteboardAnnotationHistory(meetingID: String, requesterID: String, whiteboardId: String, replyTo: String) { + bbbGW.accept(new GetWhiteboardShapesRequest(meetingID, requesterID, whiteboardId, replyTo)) + } + + def clearWhiteboard(meetingID: String, requesterID: String, whiteboardId: String) { + bbbGW.accept(new ClearWhiteboardRequest(meetingID, requesterID, whiteboardId)) + } + + def undoWhiteboard(meetingID: String, requesterID: String, whiteboardId: String) { + bbbGW.accept(new UndoWhiteboardRequest(meetingID, requesterID, whiteboardId)) + } + + def enableWhiteboard(meetingID: String, requesterID: String, enable: Boolean) { + bbbGW.accept(new EnableWhiteboardRequest(meetingID, requesterID, enable)) + } + + def isWhiteboardEnabled(meetingID: String, requesterID: String, replyTo: String) { + bbbGW.accept(new IsWhiteboardEnabledRequest(meetingID, requesterID, replyTo)) + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardModel.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardModel.scala new file mode 100755 index 0000000000..b4273f08f7 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardModel.scala @@ -0,0 +1,84 @@ +package org.bigbluebutton.core.apps.whiteboard + +import org.bigbluebutton.core.apps.whiteboard.vo.AnnotationVO +import scala.collection.mutable.ArrayBuffer + +class WhiteboardModel { + private var _whiteboards = new scala.collection.immutable.HashMap[String, Whiteboard]() + + private var _enabled = true + + private def saveWhiteboard(wb: Whiteboard) { + _whiteboards += wb.id -> wb + } + + def getWhiteboard(id: String):Option[Whiteboard] = { + _whiteboards.values.find(wb => wb.id == id) + } + + + def addAnnotationToShape(wb: Whiteboard, shape: AnnotationVO) = { + println("Adding shape to wb [" + wb.id + "]. Before numShapes=[" + wb.shapes.length + "].") + val newWb = wb.copy(shapes=(wb.shapes :+ shape)) + println("Adding shape to page [" + wb.id + "]. After numShapes=[" + newWb.shapes.length + "].") + saveWhiteboard(newWb) + } + + def addAnnotation(wbId:String, shape: AnnotationVO) { + getWhiteboard(wbId) match { + case Some(wb) => + addAnnotationToShape(wb, shape) + case None => { + val vec = scala.collection.immutable.Vector.empty + val wb = new Whiteboard(wbId, vec :+ shape) + saveWhiteboard(wb) + } + } + } + + private def modifyTextInPage(wb: Whiteboard, shape: AnnotationVO) = { + val removedLastText = wb.shapes.dropRight(1) + val addedNewText = removedLastText :+ shape + val newWb = wb.copy(shapes=addedNewText) + saveWhiteboard(newWb) + } + + def modifyText(wbId:String, shape: AnnotationVO) { + getWhiteboard(wbId) foreach { wb => + modifyTextInPage(wb, shape) + } + } + + def history(wbId:String):Option[Whiteboard] = { + getWhiteboard(wbId) + } + + def clearWhiteboard(wbId:String) { + getWhiteboard(wbId) foreach { wb => + val clearedShapes = wb.shapes.drop(wb.shapes.length) + val newWb = wb.copy(shapes= clearedShapes) + saveWhiteboard(newWb) + } + } + + def undoWhiteboard(wbId:String):Option[AnnotationVO] = { + var last:Option[AnnotationVO] = None + getWhiteboard(wbId) foreach { wb => + if (!wb.shapes.isEmpty) { + last = Some(wb.shapes.last) + val remaining = wb.shapes.dropRight(1) + val newWb = wb.copy(shapes=remaining) + saveWhiteboard(newWb) + } + } + last + } + + def enableWhiteboard(enable: Boolean) { + _enabled = enable + } + + def isWhiteboardEnabled():Boolean = { + _enabled + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/red5/WhiteboardClientMessageSender.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/red5/WhiteboardClientMessageSender.scala new file mode 100755 index 0000000000..07445ecae6 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/red5/WhiteboardClientMessageSender.scala @@ -0,0 +1,130 @@ +package org.bigbluebutton.core.apps.whiteboard.red5 + +import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.meeting.messaging.red5.BroadcastClientMessage +import org.bigbluebutton.conference.meeting.messaging.red5.DirectClientMessage +import scala.collection.JavaConversions._ +import com.google.gson.Gson +import java.util.ArrayList + +class WhiteboardClientMessageSender(service: ConnectionInvokerService) extends OutMessageListener2 { + def handleMessage(msg: IOutMessage) { + msg match { + case msg: GetWhiteboardShapesReply => handleGetWhiteboardShapesReply(msg) + case msg: SendWhiteboardAnnotationEvent => handleSendWhiteboardAnnotationEvent(msg) + case msg: ClearWhiteboardEvent => handleClearWhiteboardEvent(msg) + case msg: UndoWhiteboardEvent => handleUndoWhiteboardEvent(msg) + case msg: WhiteboardEnabledEvent => handleWhiteboardEnabledEvent(msg) + case msg: IsWhiteboardEnabledReply => handleIsWhiteboardEnabledReply(msg) + case _ => // do nothing + } + } + + private def handleWhiteboardEnabledEvent(msg: WhiteboardEnabledEvent) { + val args = new java.util.HashMap[String, Object]() + args.put("enabled", msg.enable:java.lang.Boolean) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("WhiteboardClientMessageSender - handleWhiteboardEnabledEvent \n" + message.get("msg") + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "WhiteboardEnableWhiteboardCommand", message) + service.sendMessage(m) + } + + private def handleIsWhiteboardEnabledReply(msg: IsWhiteboardEnabledReply) { + val args = new java.util.HashMap[String, Object]() + args.put("enabled", msg.enabled:java.lang.Boolean) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("WhiteboardClientMessageSender - handleIsWhiteboardEnabledReply \n" + message.get("msg") + "\n") + + val m = new DirectClientMessage(msg.meetingID, msg.requesterID, "WhiteboardIsWhiteboardEnabledReply", message) + service.sendMessage(m) + } + + private def handleGetWhiteboardShapesReply(msg: GetWhiteboardShapesReply) { + val args = new java.util.HashMap[String, Object]() + args.put("count", msg.shapes.length:java.lang.Integer) + args.put("whiteboardId", msg.whiteboardId) + + val annotations = new ArrayList[java.util.HashMap[String, Object]] + msg.shapes.foreach {shape => + val annotation = new java.util.HashMap[String, Object](); + annotation.put("id", shape.id) + annotation.put("status", shape.status) + annotation.put("type", shape.shapeType) + annotation.put("shapes", mapAsJavaMap(shape.shape)) + + annotations.add(annotation); + } + + args.put("annotations", annotations) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("WhiteboardClientMessageSender - handleSendWhiteboardAnnotationHistoryReply \n" + message.get("msg") + "\n") + + val m = new DirectClientMessage(msg.meetingID, msg.requesterID, "WhiteboardRequestAnnotationHistoryReply", message) + service.sendMessage(m) + } + + private def handleSendWhiteboardAnnotationEvent(msg: SendWhiteboardAnnotationEvent) { + val args = new java.util.HashMap[String, Object]() + args.put("whiteboardId", msg.whiteboardId) + + val shape = new java.util.HashMap[String, Object]() + shape.put("id", msg.shape.id) + shape.put("type", msg.shape.shapeType) + shape.put("status", msg.shape.status) + shape.put("shape", mapAsJavaMap(msg.shape.shape)) + + args.put("shape", shape) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("WhiteboardClientMessageSender - handleSendWhiteboardAnnotationEvent \n" + message.get("msg") + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "WhiteboardNewAnnotationCommand", message) + service.sendMessage(m) + } + + private def handleClearWhiteboardEvent(msg: ClearWhiteboardEvent) { + val args = new java.util.HashMap[String, Object]() + args.put("whiteboardId", msg.whiteboardId) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("WhiteboardClientMessageSender - handleClearWhiteboardEvent \n" + message.get("msg") + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "WhiteboardClearCommand", message); + service.sendMessage(m); + } + + private def handleUndoWhiteboardEvent(msg: UndoWhiteboardEvent) { + val args = new java.util.HashMap[String, Object]() + args.put("whiteboardId", msg.whiteboardId) + args.put("shapeId", msg.shapeId) + + val message = new java.util.HashMap[String, Object]() + val gson = new Gson(); + message.put("msg", gson.toJson(args)) + + println("WhiteboardClientMessageSender - handleUndoWhiteboardEvent \n" + message.get("msg") + "\n") + + val m = new BroadcastClientMessage(msg.meetingID, "WhiteboardUndoCommand", message); + service.sendMessage(m); + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardEventRedisPublisher.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardEventRedisPublisher.scala new file mode 100755 index 0000000000..185d74f5ed --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardEventRedisPublisher.scala @@ -0,0 +1,56 @@ +package org.bigbluebutton.core.apps.whiteboard.redis + +import org.bigbluebutton.core.api._ +import scala.collection.JavaConversions._ +import org.bigbluebutton.conference.service.whiteboard.WhiteboardKeyUtil +import scala.collection.immutable.StringOps +import org.bigbluebutton.conference.service.messaging.redis.MessageSender +import org.bigbluebutton.conference.service.messaging.MessagingConstants + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +class WhiteboardEventRedisPublisher(service: MessageSender) extends OutMessageListener2 { + def handleMessage(msg: IOutMessage) { + msg match { + case msg: GetWhiteboardShapesReply => handleGetWhiteboardShapesReply(msg) + case msg: SendWhiteboardAnnotationEvent => handleSendWhiteboardAnnotationEvent(msg) + case msg: ClearWhiteboardEvent => handleClearWhiteboardEvent(msg) + case msg: UndoWhiteboardEvent => handleUndoWhiteboardEvent(msg) + case msg: WhiteboardEnabledEvent => handleWhiteboardEnabledEvent(msg) + case msg: IsWhiteboardEnabledReply => handleIsWhiteboardEnabledReply(msg) + case _ => //println("Unhandled message in UsersClientMessageSender") + } + } + + private def handleGetWhiteboardShapesReply(msg: GetWhiteboardShapesReply) { + val json = WhiteboardMessageToJsonConverter.getWhiteboardShapesReplyToJson(msg) + service.send(MessagingConstants.FROM_WHITEBOARD_CHANNEL, json) + } + + private def handleSendWhiteboardAnnotationEvent(msg: SendWhiteboardAnnotationEvent) { + val json = WhiteboardMessageToJsonConverter.sendWhiteboardAnnotationEventToJson(msg) + service.send(MessagingConstants.FROM_WHITEBOARD_CHANNEL, json) + } + + private def handleClearWhiteboardEvent(msg: ClearWhiteboardEvent) { + val json = WhiteboardMessageToJsonConverter.clearWhiteboardEventToJson(msg) + service.send(MessagingConstants.FROM_WHITEBOARD_CHANNEL, json) + } + + private def handleUndoWhiteboardEvent(msg: UndoWhiteboardEvent) { + val json = WhiteboardMessageToJsonConverter.undoWhiteboardEventToJson(msg) + service.send(MessagingConstants.FROM_WHITEBOARD_CHANNEL, json) + } + + private def handleWhiteboardEnabledEvent(msg: WhiteboardEnabledEvent) { + val json = WhiteboardMessageToJsonConverter.whiteboardEnabledEventToJson(msg) + service.send(MessagingConstants.FROM_WHITEBOARD_CHANNEL, json) + } + + private def handleIsWhiteboardEnabledReply(msg: IsWhiteboardEnabledReply) { + val json = WhiteboardMessageToJsonConverter.isWhiteboardEnabledReplyToJson(msg) + service.send(MessagingConstants.FROM_WHITEBOARD_CHANNEL, json) + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardEventRedisRecorder.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardEventRedisRecorder.scala new file mode 100755 index 0000000000..e63d8fd5ba --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardEventRedisRecorder.scala @@ -0,0 +1,93 @@ +package org.bigbluebutton.core.apps.whiteboard.redis + +import org.bigbluebutton.conference.service.recorder.RecorderApplication +import org.bigbluebutton.core.api._ +import org.bigbluebutton.conference.service.whiteboard.redis.AddShapeWhiteboardRecordEvent +import scala.collection.JavaConversions._ +import org.bigbluebutton.conference.service.whiteboard.WhiteboardKeyUtil +import org.bigbluebutton.conference.service.whiteboard.redis.AddTextWhiteboardRecordEvent +import org.bigbluebutton.conference.service.whiteboard.redis.ClearPageWhiteboardRecordEvent +import org.bigbluebutton.conference.service.whiteboard.redis.UndoShapeWhiteboardRecordEvent +import org.bigbluebutton.conference.service.whiteboard.redis.ModifyTextWhiteboardRecordEvent +import scala.collection.immutable.StringOps + + +class WhiteboardEventRedisRecorder(recorder: RecorderApplication) extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: SendWhiteboardAnnotationEvent => handleSendWhiteboardAnnotationEvent(msg) + case msg: ClearWhiteboardEvent => handleClearWhiteboardEvent(msg) + case msg: UndoWhiteboardEvent => handleUndoWhiteboardEvent(msg) + case _ => //println("Unhandled message in UsersClientMessageSender") + } + } + + private def getPresentationId(whiteboardId:String):String = { + // Need to split the whiteboard id into presenation id and page num as the old + // recording expects them + val strId = new StringOps(whiteboardId) + val ids = strId.split('/') + var presId:String = "" + if (ids.length == 2) { + presId = ids(0) + } + + presId + } + + private def getPageNum(whiteboardId:String):String = { + val strId = new StringOps(whiteboardId) + val ids = strId.split('/') + var pageNum = "0" + if (ids.length == 2) { + pageNum = ids(1) + } + pageNum + } + + private def handleSendWhiteboardAnnotationEvent(msg: SendWhiteboardAnnotationEvent) { + if ((msg.shape.shapeType == WhiteboardKeyUtil.TEXT_TYPE) && (msg.shape.status != WhiteboardKeyUtil.TEXT_CREATED_STATUS)) { + + val event = new ModifyTextWhiteboardRecordEvent() + event.setMeetingId(msg.meetingID) + event.setTimestamp(System.currentTimeMillis()) + event.setPresentation(getPresentationId(msg.whiteboardId)) + event.setPageNumber(getPageNum(msg.whiteboardId)) + event.setWhiteboardId(msg.whiteboardId) + event.addAnnotation(mapAsJavaMap(msg.shape.shape)) + recorder.record(msg.meetingID, event) + } else { + val event = new AddShapeWhiteboardRecordEvent() + event.setMeetingId(msg.meetingID) + event.setTimestamp(System.currentTimeMillis()) + event.setPresentation(getPresentationId(msg.whiteboardId)) + event.setPageNumber(getPageNum(msg.whiteboardId)) + event.setWhiteboardId(msg.whiteboardId); + event.addAnnotation(mapAsJavaMap(msg.shape.shape)) + recorder.record(msg.meetingID, event) + } + } + + private def handleClearWhiteboardEvent(msg: ClearWhiteboardEvent) { + val event = new ClearPageWhiteboardRecordEvent() + event.setMeetingId(msg.meetingID) + event.setTimestamp(System.currentTimeMillis()) + event.setPresentation(getPresentationId(msg.whiteboardId)) + event.setPageNumber(getPageNum(msg.whiteboardId)) + event.setWhiteboardId(msg.whiteboardId) + recorder.record(msg.meetingID, event) + } + + private def handleUndoWhiteboardEvent(msg: UndoWhiteboardEvent) { + val event = new UndoShapeWhiteboardRecordEvent() + event.setMeetingId(msg.meetingID) + event.setTimestamp(System.currentTimeMillis()) + event.setPresentation(getPresentationId(msg.whiteboardId)) + event.setPageNumber(getPageNum(msg.whiteboardId)) + event.setWhiteboardId(msg.whiteboardId) + event.setShapeId(msg.shapeId); + recorder.record(msg.meetingID, event) + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardMessageToJsonConverter.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardMessageToJsonConverter.scala new file mode 100755 index 0000000000..cbdd521e52 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/redis/WhiteboardMessageToJsonConverter.scala @@ -0,0 +1,94 @@ +package org.bigbluebutton.core.apps.whiteboard.redis + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.core.messaging.Util +import org.bigbluebutton.core.apps.whiteboard.vo.AnnotationVO +import collection.JavaConverters._ +import scala.collection.JavaConversions._ + +object WhiteboardMessageToJsonConverter { + private def shapeToMap(shape: AnnotationVO):java.util.Map[String, Any] = { + val res = new scala.collection.mutable.HashMap[String, Any] + res += "id" -> shape.id + res += "status" -> shape.status + res += "shape_type" -> shape.shapeType + res += "wb_id" -> shape.wbId + + val shapeMap = new scala.collection.mutable.HashMap[String, Any]() + for ((key, value) <- shape.shape) { + shapeMap += key -> value + } + res += "shape" -> mapAsJavaMap(shapeMap) + + mapAsJavaMap(res) + } + + def getWhiteboardShapesReplyToJson(msg: GetWhiteboardShapesReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.WHITEBOARD_ID, msg.whiteboardId) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val shapes = new java.util.ArrayList[java.util.Map[String, Any]]() + msg.shapes.foreach {shape => + shapes.add(shapeToMap(shape)) + } + + payload.put(Constants.SHAPES, shapes) + + val header = Util.buildHeader(MessageNames.GET_WHITEBOARD_SHAPES_REPLY, msg.version, Some(msg.replyTo)) + Util.buildJson(header, payload) + } + + def sendWhiteboardAnnotationEventToJson(msg: SendWhiteboardAnnotationEvent):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.WHITEBOARD_ID, msg.whiteboardId) + payload.put(Constants.SHAPE, shapeToMap(msg.shape)) + + val header = Util.buildHeader(MessageNames.SEND_WHITEBOARD_SHAPE, msg.version, None) + Util.buildJson(header, payload) + } + + def clearWhiteboardEventToJson(msg: ClearWhiteboardEvent):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.WHITEBOARD_ID, msg.whiteboardId) + + val header = Util.buildHeader(MessageNames.WHITEBOARD_CLEARED, msg.version, None) + Util.buildJson(header, payload) + } + + def undoWhiteboardEventToJson(msg: UndoWhiteboardEvent):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.WHITEBOARD_ID, msg.whiteboardId) + payload.put(Constants.SHAPE_ID, msg.shapeId) + + val header = Util.buildHeader(MessageNames.UNDO_WHITEBOARD, msg.version, None) + Util.buildJson(header, payload) + } + + def whiteboardEnabledEventToJson(msg: WhiteboardEnabledEvent):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.ENABLE, msg.enable) + + val header = Util.buildHeader(MessageNames.WHITEBOARD_ENABLED, msg.version, None) + Util.buildJson(header, payload) + } + + def isWhiteboardEnabledReplyToJson(msg: IsWhiteboardEnabledReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + payload.put(Constants.ENABLE, msg.enabled) + + val header = Util.buildHeader(MessageNames.IS_WHITEBOARD_ENABLED_REPLY, msg.version, Some(msg.replyTo)) + Util.buildJson(header, payload) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/vo/ValueObjects.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/vo/ValueObjects.scala new file mode 100755 index 0000000000..81711b8f5c --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/vo/ValueObjects.scala @@ -0,0 +1,3 @@ +package org.bigbluebutton.core.apps.whiteboard.vo + +case class AnnotationVO(id: String, status: String, shapeType: String, shape: scala.collection.immutable.Map[String, Object], wbId:String) \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/meeting/MeetingEventRedisPublisher.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/meeting/MeetingEventRedisPublisher.scala new file mode 100755 index 0000000000..3eb3141440 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/meeting/MeetingEventRedisPublisher.scala @@ -0,0 +1,88 @@ +package org.bigbluebutton.core.meeting + +import org.bigbluebutton.conference.service.messaging.redis.MessageSender +import org.bigbluebutton.core.api._ +import scala.collection.immutable.HashMap +import com.google.gson.Gson +import scala.collection.JavaConverters._ +import org.bigbluebutton.conference.service.messaging.MessagingConstants + +class MeetingEventRedisPublisher(service: MessageSender) extends OutMessageListener2 { + + private val KEEP_ALIVE_REPLY = "KEEP_ALIVE_REPLY" + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: MeetingCreated => handleMeetingCreated(msg) + case msg: VoiceRecordingStarted => handleVoiceRecordingStarted(msg) + case msg: VoiceRecordingStopped => handleVoiceRecordingStopped(msg) + case msg: RecordingStatusChanged => handleRecordingStatusChanged(msg) + case msg: GetRecordingStatusReply => handleGetRecordingStatusReply(msg) + case msg: MeetingEnded => handleMeetingEnded(msg) + case msg: MeetingHasEnded => handleMeetingHasEnded(msg) + case msg: MeetingDestroyed => handleMeetingDestroyed(msg) + case msg: KeepAliveMessageReply => handleKeepAliveMessageReply(msg) + case msg: StartRecording => handleStartRecording(msg) + case msg: StopRecording => handleStopRecording(msg) + case _ => //println("Unhandled message in MeetingEventRedisPublisher") + } + } + + private def handleMeetingDestroyed(msg: MeetingDestroyed) { + val json = MeetingMessageToJsonConverter.meetingDestroyedToJson(msg) + System.out.println("****\n" + json) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleKeepAliveMessageReply(msg: KeepAliveMessageReply) { + val json = MeetingMessageToJsonConverter.keepAliveMessageReplyToJson(msg) + service.send(MessagingConstants.FROM_SYSTEM_CHANNEL, json) + } + + private def handleMeetingCreated(msg:MeetingCreated) { + val json = MeetingMessageToJsonConverter.meetingCreatedToJson(msg) + System.out.println("****\n" + json) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleMeetingEnded(msg:MeetingEnded){ + val json = MeetingMessageToJsonConverter.meetingEndedToJson(msg) + System.out.println("****\n" + json) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleStartRecording(msg: StartRecording) { + val json = MeetingMessageToJsonConverter.startRecordingToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleStopRecording(msg: StopRecording) { + val json = MeetingMessageToJsonConverter.stopRecordingToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleVoiceRecordingStarted(msg: VoiceRecordingStarted) { + val json = MeetingMessageToJsonConverter.voiceRecordingStartedToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleVoiceRecordingStopped(msg: VoiceRecordingStopped) { + val json = MeetingMessageToJsonConverter.voiceRecordingStoppedToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleRecordingStatusChanged(msg: RecordingStatusChanged) { + val json = MeetingMessageToJsonConverter.recordingStatusChangedToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleGetRecordingStatusReply(msg: GetRecordingStatusReply) { + val json = MeetingMessageToJsonConverter.getRecordingStatusReplyToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } + + private def handleMeetingHasEnded(msg: MeetingHasEnded) { + val json = MeetingMessageToJsonConverter.meetingHasEndedToJson(msg) + service.send(MessagingConstants.FROM_MEETING_CHANNEL, json) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/meeting/MeetingMessageToJsonConverter.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/meeting/MeetingMessageToJsonConverter.scala new file mode 100755 index 0000000000..fe3ea1cdff --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/meeting/MeetingMessageToJsonConverter.scala @@ -0,0 +1,116 @@ +package org.bigbluebutton.core.meeting + +import org.bigbluebutton.core.messaging.Util +import org.bigbluebutton.core.api._ +import com.google.gson.Gson +import scala.collection.JavaConverters._ + +object MeetingMessageToJsonConverter { + def meetingDestroyedToJson(msg: MeetingDestroyed):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = Util.buildHeader(MessageNames.MEETING_DESTROYED_EVENT, msg.version, None) + Util.buildJson(header, payload) + } + + def keepAliveMessageReplyToJson(msg: KeepAliveMessageReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.KEEP_ALIVE_ID, msg.aliveID) + + val header = Util.buildHeader(MessageNames.KEEP_ALIVE_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def meetingCreatedToJson(msg:MeetingCreated):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = Util.buildHeader(MessageNames.MEETING_CREATED, msg.version, None) + Util.buildJson(header, payload) + } + + def meetingEndedToJson(msg:MeetingEnded):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + + val header = Util.buildHeader(MessageNames.MEETING_ENDED, msg.version, None) + Util.buildJson(header, payload) + } + + def voiceRecordingStartedToJson(msg: VoiceRecordingStarted):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.RECORDING_FILE, msg.recordingFile) + payload.put(Constants.VOICE_CONF, msg.confNum) + payload.put(Constants.TIMESTAMP, msg.timestamp) + + val header = Util.buildHeader(MessageNames.VOICE_RECORDING_STARTED, msg.version, None) + Util.buildJson(header, payload) + } + + def voiceRecordingStoppedToJson(msg: VoiceRecordingStopped):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.RECORDING_FILE, msg.recordingFile) + payload.put(Constants.VOICE_CONF, msg.confNum) + payload.put(Constants.TIMESTAMP, msg.timestamp) + + val header = Util.buildHeader(MessageNames.VOICE_RECORDING_STOPPED, msg.version, None) + Util.buildJson(header, payload) + } + + def recordingStatusChangedToJson(msg: RecordingStatusChanged):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.RECORDING, msg.recording) + + val header = Util.buildHeader(MessageNames.RECORDING_STATUS_CHANGED, msg.version, None) + Util.buildJson(header, payload) + } + + def getRecordingStatusReplyToJson(msg: GetRecordingStatusReply):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.USER_ID, msg.userId) + payload.put(Constants.RECORDING, msg.recording) + + val header = Util.buildHeader(MessageNames.GET_RECORDING_STATUS_REPLY, msg.version, None) + Util.buildJson(header, payload) + } + + def meetingHasEndedToJson(msg: MeetingHasEnded):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.USER_ID, msg.userId) + + val header = Util.buildHeader(MessageNames.MEETING_ENDED, msg.version, None) + Util.buildJson(header, payload) + } + + def startRecordingToJson(msg: StartRecording):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = Util.buildHeader(MessageNames.START_RECORDING, msg.version, None) + Util.buildJson(header, payload) + } + + def stopRecordingToJson(msg: StopRecording):String = { + val payload = new java.util.HashMap[String, Any]() + payload.put(Constants.MEETING_ID, msg.meetingID) + payload.put(Constants.RECORDED, msg.recorded) + payload.put(Constants.REQUESTER_ID, msg.requesterID) + + val header = Util.buildHeader(MessageNames.STOP_RECORDING, msg.version, None) + Util.buildJson(header, payload) + } + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/messaging/Util.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/messaging/Util.scala new file mode 100755 index 0000000000..bcb73b9777 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/messaging/Util.scala @@ -0,0 +1,32 @@ +package org.bigbluebutton.core.messaging + +import org.bigbluebutton.core.api._ +import com.google.gson.Gson + +object Util { + + val VERSION = "version" + + def buildHeader(name: String, version: String, + replyTo:Option[String]):java.util.HashMap[String, Any] = { + val header = new java.util.HashMap[String, Any]() + header.put(Constants.NAME, name) + header.put(VERSION, version) + header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp) + replyTo.foreach(rep => header.put(Constants.REPLY_TO, rep)) + + header + } + + + def buildJson(header: java.util.HashMap[String, Any], + payload: java.util.HashMap[String, Any]): String = { + + val message = new java.util.HashMap[String, java.util.HashMap[String, Any]]() + message.put(Constants.HEADER, header) + message.put(Constants.PAYLOAD, payload) + + val gson = new Gson() + gson.toJson(message) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/models/Values.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/models/Values.scala new file mode 100755 index 0000000000..02a3fa94a1 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/models/Values.scala @@ -0,0 +1,23 @@ +package org.bigbluebutton.core.models + +import org.bigbluebutton.core.api.Role._ + +case class Status(isPresenter: Boolean = false, handRaised: Boolean = false) + +case class CallerId(num: String="", name: String="") + +case class Voice( + hasJoined: Boolean = false, + id: String = "", + callerId: CallerId = CallerId(), + muted: Boolean = false, + talking: Boolean = false, + locked: Boolean = false) + +case class UserV( + id: String, + extId: String, + name: String, + role: Role = VIEWER, + status: Status = Status(), + voice: Voice = Voice()) \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/util/RandomStringGenerator.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/util/RandomStringGenerator.scala new file mode 100755 index 0000000000..08fede1efa --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/util/RandomStringGenerator.scala @@ -0,0 +1,17 @@ +package org.bigbluebutton.core.util + +object RandomStringGenerator { +// From: http://www.bindschaedler.com/2012/04/07/elegant-random-string-generation-in-scala/ + + // Random generator + val random = new scala.util.Random + + // Generate a random string of length n from the given alphabet + def randomString(alphabet: String)(n: Int): String = + Stream.continually(random.nextInt(alphabet.size)).map(alphabet).take(n).mkString + + // Generate a random alphabnumeric string of length n + def randomAlphanumericString(n: Int) = + randomString("abcdefghijklmnopqrstuvwxyz0123456789")(n) +} + diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/voice/VoiceConferenceActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/voice/VoiceConferenceActor.scala new file mode 100755 index 0000000000..b3c04fb34f --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/voice/VoiceConferenceActor.scala @@ -0,0 +1,16 @@ +package org.bigbluebutton.core.voice + +import scala.actors.Actor +import scala.actors.Actor._ + +case class MuteAllUsers(meetingId: String, except: Option[Seq[String]]) +case class MuteUser(meetingId: String, userId: String) +case class UnmuteUser(meetingId: String, userId: String) +case class EjectVoiceUser(meetingId: String, userId: String) + + +class VoiceConferenceActor(val meetingId: String, + val voiceConf: String) { //extends Actor { + + +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/voice/VoiceConferenceService.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/voice/VoiceConferenceService.scala new file mode 100755 index 0000000000..51c4c3100d --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/voice/VoiceConferenceService.scala @@ -0,0 +1,19 @@ +package org.bigbluebutton.core.voice + +import org.bigbluebutton.core.api._ +import org.bigbluebutton.freeswitch.FreeswitchManagerProxy + +class VoiceConferenceService(fsproxy: FreeswitchManagerProxy, + bbbInGW: IBigBlueButtonInGW) + extends OutMessageListener2 { + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: MeetingCreated => handleMeetingCreated(msg) + } + } + + private def handleMeetingCreated(msg: MeetingCreated) { + + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConference.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConference.scala new file mode 100755 index 0000000000..f638f3dd81 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConference.scala @@ -0,0 +1,33 @@ +package org.bigbluebutton.freeswitch + +import org.bigbluebutton.core.api.UserVO + +class FreeswitchConference(val conferenceNum: String, + val meetingId: String, + val recorded: Boolean) { + + private var users = new scala.collection.immutable.HashMap[String, UserVO] + + def addUser(user: UserVO) { + users += user.userID -> user + } + + def removeUser(user: UserVO) { + users -= user.userID + } + + def getWebUser(webUserId: String):Option[UserVO] = { + users.values find (u => (u.userID == webUserId)) + } + + def getVoiceUser(voiceUserId: String):Option[UserVO] = { + users.values find (u => u.voiceUser.userId == voiceUserId) + } + + def numUsersInVoiceConference:Int = { + val joinedUsers = users.values filter (u => u.voiceUser.joined) + joinedUsers.size + } + + def numUsers = users.size +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala new file mode 100755 index 0000000000..e4b83245d2 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala @@ -0,0 +1,219 @@ +package org.bigbluebutton.freeswitch + +import scala.actors.Actor +import scala.actors.Actor._ +import org.bigbluebutton.core.api._ + +case class FsVoiceUserJoined(userId: String, webUserId: String, + conference: String, callerIdNum: String, + callerIdName: String, muted: Boolean, + speaking: Boolean) + +case class FsVoiceUserLeft(userId: String, conference: String) +case class FsVoiceUserLocked(userId: String, conference: String, locked: Boolean) +case class FsVoiceUserMuted(userId: String, conference: String, muted: Boolean) +case class FsVoiceUserTalking(userId: String, conference: String, talking: Boolean) +case class FsRecording(conference: String, recordingFile: String, + timestamp: String, recording: Boolean) + +class FreeswitchConferenceActor(fsproxy: FreeswitchManagerProxy, bbbInGW: IBigBlueButtonInGW) extends Actor { + + private var confs = new scala.collection.immutable.HashMap[String, FreeswitchConference] + + def act() = { + loop { + react { + case msg: MeetingCreated => handleMeetingCreated(msg) + case msg: MeetingEnded => handleMeetingEnded(msg) + case msg: UserJoined => handleUserJoined(msg) + case msg: UserLeft => handleUserLeft(msg) + case msg: MuteVoiceUser => handleMuteVoiceUser(msg) + case msg: EjectVoiceUser => handleEjectVoiceUser(msg) + case msg: StartRecording => handleStartRecording(msg) + case msg: StopRecording => handleStopRecording(msg) + case msg: FsRecording => handleFsRecording(msg) + case msg: FsVoiceUserJoined => handleFsVoiceUserJoined(msg) + case msg: FsVoiceUserLeft => handleFsVoiceUserLeft(msg) + case msg: FsVoiceUserLocked => handleFsVoiceUserLocked(msg) + case msg: FsVoiceUserMuted => handleFsVoiceUserMuted(msg) + case msg: FsVoiceUserTalking => handleFsVoiceUserTalking(msg) + case msg: UserJoinedVoice => handleUserJoinedVoice(msg) + case msg: UserLeftVoice => handleUserLeftVoice(msg) + case _ => // do nothing + } + } + } + + private def handleMeetingCreated(msg: MeetingCreated) { + if (! confs.contains(msg.meetingID)) { + println("FSConference rx meeting created for meeting id[" + msg.meetingID + "]") + val fsconf = new FreeswitchConference(msg.voiceBridge, + msg.meetingID, + msg.recorded) + confs += fsconf.meetingId -> fsconf + } + + fsproxy.getUsers(msg.voiceBridge) + } + + private def handleMeetingEnded(msg: MeetingEnded) { + val fsconf = confs.values find (c => c.meetingId == msg.meetingID) + + fsconf foreach (fc => { + fsproxy.ejectUsers(fc.conferenceNum) + confs -= fc.meetingId + }) + } + + private def handleUserJoinedVoice(msg: UserJoinedVoice) { + val fsconf = confs.values find (c => c.meetingId == msg.meetingID) + + fsconf foreach {fc => + println("Web user has joined voice. mid[" + fc.meetingId + "] wid=[" + msg.user.userID + "], vid=[" + msg.user.voiceUser.userId + "]") + fc.addUser(msg.user) + if (fc.numUsersInVoiceConference == 1 && fc.recorded) { + println("Meeting is recorded. Tell FreeSWITCH to start recording.") + fsproxy.startRecording(fc.conferenceNum, fc.meetingId) + } + } + } + + private def handleUserLeftVoice(msg: UserLeftVoice) { + val fsconf = confs.values find (c => c.meetingId == msg.meetingID) + + println("FreeswitchConferenceActor - handleUserLeftVoice mid=[" + msg.meetingID + "]") + + fsconf foreach {fc => + fc.addUser(msg.user) + println("Web user has left voice. mid[" + fc.meetingId + "] wid=[" + msg.user.userID + "], vid=[" + msg.user.voiceUser.userId + "]") + if (fc.numUsersInVoiceConference == 0 && fc.recorded) { + println("Meeting is recorded. No more users in voice conference. Tell FreeSWITCH to stop recording.") + fsproxy.stopRecording(fc.conferenceNum) + } + } + } + + private def handleUserJoined(msg: UserJoined) { + val fsconf = confs.values find (c => c.meetingId == msg.meetingID) + + fsconf foreach (fc => { + println("Web user id joining meeting id[" + fc.meetingId + "] wid=[" + msg.user.userID + "]") + fc.addUser(msg.user) + }) + } + + private def handleUserLeft(msg: UserLeft) { + val fsconf = confs.values find (c => c.meetingId == msg.meetingID) + + fsconf foreach (fc => { + fc.removeUser(msg.user) + }) + } + + private def handleMuteVoiceUser(msg: MuteVoiceUser) { + val fsconf = confs.values find (c => c.meetingId == msg.meetingID) + println("Mute user request for wid[" + msg.userId + "] mute=[" + msg.mute + "]") + fsconf foreach (fc => { + val user = fc.getWebUser(msg.userId) + user foreach (u => { + println("Muting user wid[" + msg.userId + "] mute=[" + msg.mute + "]") + fsproxy.muteUser(fc.conferenceNum, u.voiceUser.userId, msg.mute) + }) + }) + } + + private def handleEjectVoiceUser(msg: EjectVoiceUser) { + val fsconf = confs.values find (c => c.meetingId == msg.meetingID) + + fsconf foreach (fc => { + val user = fc.getWebUser(msg.userId) + user foreach (u => { + fsproxy.ejectUser(fc.conferenceNum, u.voiceUser.userId) + }) + }) + } + + private def handleStartRecording(msg: StartRecording) { + + } + + private def handleStopRecording(msg: StopRecording) { + + } + + private def handleFsRecording(msg: FsRecording) { + val fsconf = confs.values find (c => c.conferenceNum == msg.conference) + fsconf foreach {fc => + bbbInGW.voiceRecording(fc.meetingId, msg.recordingFile, msg.timestamp, msg.recording) + } + } + + private def sendNonWebUserJoined(meetingId: String, webUserId: String, + msg: FsVoiceUserJoined) { + println("FreeswitchConferenceActor:: Sending FsVoiceUserJoined for conference [" + + msg.conference + "] user=[" + msg.callerIdName + "] userid=[" + webUserId + "]") + bbbInGW.voiceUserJoined(meetingId, msg.userId, + webUserId, msg.conference, msg.callerIdNum, msg.callerIdName, + msg.muted, msg.speaking) + } + + private def handleFsVoiceUserJoined(msg: FsVoiceUserJoined) { + println("FreeswitchConferenceActor:: Received FsVoiceUserJoined for conference [" + + msg.conference + "] user=[" + msg.callerIdName + "] wid=[" + msg.webUserId + "]") + val fsconf = confs.values find (c => c.conferenceNum == msg.conference) + + fsconf foreach (fc => { + fc.getWebUser(msg.webUserId) match { + case Some(user) => { + println("FreeswitchConferenceActor:: Found webuser for this user for conference [" + + msg.conference + "] user=[" + msg.callerIdName + "] wid=[" + msg.webUserId + "]") + sendNonWebUserJoined(fc.meetingId, user.voiceUser.webUserId, msg) + } + case None => { + println("FreeswitchConferenceActor:: Did not find webuser for this user for conference [" + + msg.conference + "] user=[" + msg.callerIdName + "] wid=[" + msg.webUserId + "]") + sendNonWebUserJoined(fc.meetingId, msg.userId, msg) + } + } + }) + } + + private def handleFsVoiceUserLeft(msg: FsVoiceUserLeft) { + val fsconf = confs.values find (c => c.conferenceNum == msg.conference) + + fsconf foreach (fc => { + val user = fc.getVoiceUser(msg.userId) + user foreach (u => bbbInGW.voiceUserLeft(fc.meetingId, u.userID)) + }) + } + + private def handleFsVoiceUserLocked(msg: FsVoiceUserLocked) { + val fsconf = confs.values find (c => c.conferenceNum == msg.conference) + + fsconf foreach (fc => { + val user = fc.getVoiceUser(msg.userId) + user foreach (u => bbbInGW.voiceUserLocked(fc.meetingId, u.userID, msg.locked)) + }) + } + + private def handleFsVoiceUserMuted(msg: FsVoiceUserMuted) { + val fsconf = confs.values find (c => c.conferenceNum == msg.conference) + + println("Rx voice user muted for cnum=[" + msg.conference + "] vid[" + msg.userId + "] mute=[" + msg.muted + "]") + fsconf foreach (fc => { + val user = fc.getVoiceUser(msg.userId) + println("Rx voice user muted for mid=[" + fc.meetingId + "] vid[" + msg.userId + "] mute=[" + msg.muted + "]") + user foreach (u => bbbInGW.voiceUserMuted(fc.meetingId, u.userID, msg.muted)) + }) + } + + private def handleFsVoiceUserTalking(msg: FsVoiceUserTalking) { + val fsconf = confs.values find (c => c.conferenceNum == msg.conference) + + fsconf foreach (fc => { + val user = fc.getVoiceUser(msg.userId) + println("Rx voice user talking for vid[" + msg.userId + "] mute=[" + msg.talking + "]") + user foreach (u => bbbInGW.voiceUserTalking(fc.meetingId, u.userID, msg.talking)) + }) + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceService.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceService.scala new file mode 100755 index 0000000000..354b8c6f49 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceService.scala @@ -0,0 +1,103 @@ +package org.bigbluebutton.freeswitch + +import org.bigbluebutton.webconference.voice.IVoiceConferenceService +import org.bigbluebutton.core.api._ +import org.bigbluebutton.webconference.voice.FreeswitchConferenceEventListener + +class FreeswitchConferenceService(fsproxy: FreeswitchManagerProxy, + fsListener: FreeswitchConferenceEventListener) + extends IVoiceConferenceService + with OutMessageListener2 { + + fsListener.setVoiceConferenceService(this) + + var bbbInGW: IBigBlueButtonInGW = _ + var fsActor: FreeswitchConferenceActor = _ + + def setIBigBlueButtonInGW(inGW: IBigBlueButtonInGW) { + bbbInGW = inGW + fsActor = new FreeswitchConferenceActor(fsproxy, bbbInGW) + fsActor.start + } + + def handleMessage(msg: IOutMessage) { + msg match { + case msg: MeetingCreated => handleMeetingCreated(msg) + case msg: UserJoined => handleUserJoined(msg) + case msg: UserLeft => handleUserLeft(msg) + case msg: MuteVoiceUser => handleMuteVoiceUser(msg) + case msg: EjectVoiceUser => handleEjectVoiceUser(msg) + case msg: UserJoinedVoice => handleUserJoinedVoice(msg) + case msg: UserLeftVoice => handleUserLeftVoice(msg) + case _ => // do nothing + } + } + + private def handleUserLeftVoice(msg: UserLeftVoice) { + fsActor ! msg + } + + private def handleUserJoinedVoice(msg: UserJoinedVoice) { + fsActor ! msg + } + + private def handleMuteVoiceUser(msg: MuteVoiceUser) { + fsActor ! msg + } + + private def handleEjectVoiceUser(msg: EjectVoiceUser) { + fsActor ! msg + } + + private def handleUserLeft(msg: UserLeft) { + fsActor ! msg + } + + private def handleUserJoined(msg: UserJoined) { + fsActor ! msg + } + + private def handleMeetingCreated(msg: MeetingCreated) { + fsActor ! msg + } + + def voiceStartedRecording(conference: String, recordingFile: String, + timestamp: String, recording: java.lang.Boolean) { + val fsRec = new FsRecording(conference, recordingFile, timestamp, recording) + fsActor ! fsRec + } + + def voiceUserJoined(userId: String, webUserId: String, conference: String, + callerIdNum: String, callerIdName: String, + muted: java.lang.Boolean, talking: java.lang.Boolean) { + println("******** FreeswitchConferenceService received voiceUserJoined vui=[" + userId + "] wui=[" + webUserId + "]") + val vuj = new FsVoiceUserJoined(userId, webUserId, + conference, callerIdNum, + callerIdName, muted, + talking) + fsActor ! vuj + } + + def voiceUserLeft(userId: String, conference: String) { + println("******** FreeswitchConferenceService received voiceUserLeft vui=[" + userId + "] conference=[" + conference + "]") + val vul = new FsVoiceUserLeft(userId, conference) + fsActor ! vul + } + + def voiceUserLocked(userId: String, conference: String, locked: java.lang.Boolean) { + val vul = new FsVoiceUserLocked(userId, conference, locked) + fsActor ! vul + } + + def voiceUserMuted(userId: String, conference: String, muted: java.lang.Boolean) { + println("******** FreeswitchConferenceService received voiceUserMuted vui=[" + userId + "] muted=[" + muted + "]") + val vum = new FsVoiceUserMuted(userId, conference, muted) + fsActor ! vum + } + + def voiceUserTalking(userId: String, conference: String, talking: java.lang.Boolean) { + println("******** FreeswitchConferenceService received voiceUserTalking vui=[" + userId + "] talking=[" + talking + "]") + val vut = new FsVoiceUserTalking(userId, conference, talking) + fsActor ! vut + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchManagerProxy.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchManagerProxy.scala new file mode 100755 index 0000000000..a5d5434b30 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchManagerProxy.scala @@ -0,0 +1,32 @@ +package org.bigbluebutton.freeswitch + +import org.bigbluebutton.webconference.voice.freeswitch.FreeswitchApplication + +class FreeswitchManagerProxy(fsApp: FreeswitchApplication) { + + def getUsers(conference: String) { + fsApp.populateRoom(conference) + } + + def ejectUsers(conference: String) { + fsApp.ejectAll(conference) + } + + def muteUser(conference: String, userId: String, mute: Boolean) { + println("Forwarding mute request to fsApp") + fsApp.mute(conference, userId, mute) + } + + def ejectUser(conference: String, userId: String ) { + println("Forwarding eject user request to fsApp") + fsApp.eject(conference, userId) + } + + def startRecording(conference: String, meetingId: String) { + fsApp.record(conference, meetingId) + } + + def stopRecording(conference: String) { + + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FsInGwWrapper.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FsInGwWrapper.scala new file mode 100755 index 0000000000..011be11c57 --- /dev/null +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FsInGwWrapper.scala @@ -0,0 +1,12 @@ +package org.bigbluebutton.freeswitch + +import org.bigbluebutton.core.api.IBigBlueButtonInGW + +/** + * Workaround to get away from circular dependency injection. + */ +class FsInGwWrapper(inGW: IBigBlueButtonInGW, + fsConfService: FreeswitchConferenceService) { + + fsConfService.setIBigBlueButtonInGW(inGW) +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/webconf/Meeting.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/webconf/Meeting.scala deleted file mode 100755 index 61ba8d7892..0000000000 --- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/webconf/Meeting.scala +++ /dev/null @@ -1,28 +0,0 @@ -package org.bigbluebutton.webconf - -import scala.actors.Actor -import scala.actors.Actor._ -import scala.collection.immutable.HashMap - -case class UserJoin(id: String, name: String) -case class UserLeft(id: String) - - -class Meeting extends Actor { - - private val users = new HashMap[String, User] - - def act() = { - loop { - react { - case userJoin: UserJoin => { - handleUserJoin(userJoin) - } - } - } - } - - private def handleUserJoin(user: UserJoin) { - - } -} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/webconf/User.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/webconf/User.scala deleted file mode 100755 index d4c2fb62ad..0000000000 --- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/webconf/User.scala +++ /dev/null @@ -1,5 +0,0 @@ -package org.bigbluebutton.webconf - -class User { - -} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-chat.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-chat.xml new file mode 100755 index 0000000000..ef1d82c2d6 --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-chat.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-layout.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-layout.xml new file mode 100755 index 0000000000..6bc7886c3d --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-layout.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-poll.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-poll.xml new file mode 100755 index 0000000000..d0c7905e28 --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-poll.xml @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml new file mode 100755 index 0000000000..112a4a2da5 --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-users.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-users.xml new file mode 100755 index 0000000000..a3eb650373 --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-users.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-whiteboard.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-whiteboard.xml new file mode 100755 index 0000000000..adcfb71c3a --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-whiteboard.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml deleted file mode 100755 index f52ba29a53..0000000000 --- a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml new file mode 100755 index 0000000000..36432b3644 --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-pool.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-pool.xml new file mode 100755 index 0000000000..4c20c42638 --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-pool.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-recorder.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-recorder.xml new file mode 100755 index 0000000000..013b01ae58 --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-recorder.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml index 75b1655dc0..00ebbc7310 100755 --- a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml @@ -25,28 +25,14 @@ with BigBlueButton; if not, see . http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - - - - - - - - - - - - - - - + - + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml index 016f0f18db..4f471fc51b 100755 --- a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml @@ -24,21 +24,36 @@ with BigBlueButton; if not, see . xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - - - + + + + + - + - - - + + + - - + + + + + + + + + + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties b/bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties index c80f9def4f..0bf6c9db0c 100755 --- a/bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties @@ -25,6 +25,7 @@ freeswitch.esl.password=ClueCon redis.host=127.0.0.1 redis.port=6379 +redis.pass= icecast.protocol=shout icecast.streamExt=mp3 @@ -32,4 +33,4 @@ icecast.host=127.0.0.1 icecast.port=8000 icecast.username=source icecast.password=hackme -icecast.broadcast=false +icecast.broadcast=true diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/configgy-logger.conf b/bigbluebutton-apps/src/main/webapp/WEB-INF/configgy-logger.conf new file mode 100755 index 0000000000..53fcebf01d --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/configgy-logger.conf @@ -0,0 +1,21 @@ +log { + filename = "/usr/share/red5/log/bigbluebutton-scala.log" + roll = "daily" + level = "info" + use_full_package_names = on + + silence_net_sf_cache { + node = "net.sf.ehcache" + level = "error" + } + + silence_sun_rmi { + node = "sun.rmi" + level = "error" + } + + silence_org_apache { + node = "org.apache" + level = "error" + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml old mode 100755 new mode 100644 index bc125347bd..d9f3ce6fa7 --- a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml @@ -21,8 +21,11 @@ with BigBlueButton; if not, see . + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/lang + http://www.springframework.org/schema/lang/spring-lang-2.0.xsd"> @@ -59,11 +62,156 @@ with BigBlueButton; if not, see . + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/spring/applicationContext-redis.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/spring/applicationContext-redis.xml new file mode 100755 index 0000000000..ebc657b8c6 --- /dev/null +++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/spring/applicationContext-redis.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/bigbluebutton-apps/src/test/resources/testng.xml b/bigbluebutton-apps/src/test/resources/testng.xml index c48045d804..50871bac69 100755 --- a/bigbluebutton-apps/src/test/resources/testng.xml +++ b/bigbluebutton-apps/src/test/resources/testng.xml @@ -1,18 +1,18 @@ - + - - - - - + + + + diff --git a/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollMessageConverterTest.scala b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollMessageConverterTest.scala new file mode 100755 index 0000000000..30f510b376 --- /dev/null +++ b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollMessageConverterTest.scala @@ -0,0 +1,90 @@ +package org.bigbluebutton.core.apps.poll + +import org.testng.annotations.BeforeClass +import org.testng.annotations.Test +import com.google.gson.Gson +import com.google.gson.JsonParser +import org.bigbluebutton.core.apps.poll.messages.R +import org.bigbluebutton.core.util.RandomStringGenerator._ +import scala.collection.mutable.ArrayBuffer +import org.bigbluebutton.core.apps.poll.messages.Q +import org.bigbluebutton.core.apps.poll.messages.P + +class PollMessageConverterTest { + + var samplePoll: P = null + + @BeforeClass + def setUp() { + val resps = new ArrayBuffer[R]() + resps += new R("0", "Answer 1") + resps += new R("1", "Answer 2") + resps += new R("2", "Answer 3") + + val questions = new ArrayBuffer[Q]() + questions += new Q("qID", "MULTI_CHOICE", "What is my name?", resps.toArray) + + samplePoll = new P("pollID", "My Sample Poll", questions.toArray) + } + + @Test(groups = Array[String]( "unit" )) + def convertCreatePollMessageTest(){ + val msg = "{\"title\":\"My sample poll\",\"questions\":[{\"questionType\":\"MULTI_CHOICE\",\"responses\":[\"Answer 1\",\"Answer 2\",\"Answer 3\"],\"question\":\"What is my name?\"}]}"; + + val cut = new PollMessageConverter + val pvp = cut.convertCreatePollMessage(msg) + val gson = new Gson() + + assert(pvp.title.equals("My sample poll"), "Title not the same.") + assert(pvp.questions.length == 1, "Number of questions is wrong. Must be [" + pvp.questions.length + "]") + assert(pvp.questions(0).question.equals("What is my name?"), "First questions is [" + pvp.questions(0).question + "]") + } + + @Test(groups = Array[String]( "unit" )) + def convertUpdatePollMessageTest(){ + val gson = new Gson() + val cut = new PollMessageConverter + val pvp = cut.convertUpdatePollMessage(gson.toJson(samplePoll)) + + assert(pvp.title.equals(samplePoll.title), "Title not the same.") + assert(pvp.questions.length == samplePoll.questions.length, "Number of questions is wrong. Must be [" + pvp.questions.length + "]") + assert(pvp.questions(0).question.equals("What is my name?"), "First questions is [" + pvp.questions(0).question + "]") + } + + @Test(groups = Array[String]( "unit" )) + def convertTakePollMessageTest() { + // msg = "{"id":"pollID-102","questions":[{"questionID":"q1","responses":["0","1"]}]}" + val r1 = new QuestionResponsesVO("q1", Array("1", "2", "3")) + + val pollResponse = new java.util.HashMap[String, Object]() + pollResponse.put("pollID", "pollID") + pollResponse.put("questions", Array(r1)) + + val gson = new Gson() + val cut = new PollMessageConverter + val pvp = cut.convertTakePollMessage(gson.toJson(pollResponse)) + + assert(pvp.responses.length == 1, "Number of responses is 1") + } + + @Test(groups = Array[String]( "unit" )) + def convertPreCreatedPollMessageTest() { + // {"title":"Canada\u0027s Capital","answers":"[\"Ottawa\",\"Montreal\",\"Vancouver\"]","meetingId":"1419393e41e5ce83c04efd35946b64c1ddcbcee7-1373482430620","question":" What is Canada\u0027s Capital","messageId":"SendPollsEvent"} + + val r1 = new java.util.HashMap[String, Object]() + + val pollJSON = new java.util.HashMap[String, Object]() + pollJSON.put("title", "Canada\u0027s Capital") + pollJSON.put("questionType", "MULTI_CHOICE") + pollJSON.put("question", "What is Canada\u0027s Capital?") + pollJSON.put("answers", Array("Ottawa", "Montreal", "Vancouver")) + + val gson = new Gson() + val cut = new PollMessageConverter + val pvp = cut.convertPreCreatedPollMessage(gson.toJson(pollJSON)) + + assert(pvp.questions.length == 1, "Number of responses is 1") + assert(pvp.questions(0).question.equals("What is Canada's Capital?"), "First questions is [" + pvp.questions(0).question + "]") + assert(pvp.questions(0).responses.length == 3, "Num responses should be 3") + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollModelTests.scala b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollModelTests.scala new file mode 100755 index 0000000000..cd82f4b6a8 --- /dev/null +++ b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollModelTests.scala @@ -0,0 +1,120 @@ +package org.bigbluebutton.core.apps.poll + +import org.testng.annotations.BeforeClass +import org.testng.annotations.Test +import org.testng.annotations.BeforeMethod + + +class PollModelTests { + val r1 = new ResponseVO("0", "Answer 1") + val r2 = new ResponseVO("1", "Answer 2") + val r3 = new ResponseVO("2", "Answer 3") + val r4 = new ResponseVO("3", "Answer 4") + + var q = new QuestionVO("q1", true, "What is my name?", Array(r1, r2, r3)) + val pvo = new PollVO("pollID", "sample poll", Array(q)) + + @BeforeMethod + def setUp() { + + } + + @Test(groups = Array[String]( "unit" )) + def createPollTest(){ + + val model = new PollModel + model.createPoll(pvo) + + assert(model.numPolls == 1, "Number of polls should be 1") + assert(model.hasPoll("pollID"), "No poll with id=pollID") + } + + @Test(groups = Array[String]( "unit" )) + def updatePollTest(){ + + val model = new PollModel + model.createPoll(pvo) + + assert(model.numPolls == 1, "Number of polls should be 1") + assert(model.hasPoll("pollID"), "No poll with id=pollID") + + var q = new QuestionVO("q1", true, "What is my name?", Array(r1, r2, r3, r4)) + val newpvo = new PollVO("pollID", "modified sample poll", Array(q)) + + model.updatePoll(newpvo) + + assert(model.numPolls == 1, "Number of polls should be 1") + assert(model.hasPoll("pollID"), "No poll with id=pollID") + model.getPoll("pollID") match { + case Some(spvo) => { + assert(spvo.questions(0).responses.length == 4, "Number of questions doesn't match.") + } + case None => + } + } + + @Test(groups = Array[String]( "unit" )) + def getPollsTest(){ + + val model = new PollModel + model.createPoll(pvo) + + assert(model.numPolls == 1, "Number of polls should be 1") + assert(model.hasPoll("pollID"), "No poll with id=pollID") + + var q = new QuestionVO("q1", true, "What is my name?", Array(r1, r2, r3, r4)) + val newpvo = new PollVO("pollID-2", "modified sample poll", Array(q)) + + model.createPoll(newpvo) + + assert(model.numPolls == 2, "Number of polls should be 2") + assert(model.hasPoll("pollID-2"), "No poll with id=pollID") + val polls = model.getPolls + assert(polls.length == 2, "Number of polls should be 2") + + } + + @Test(groups = Array[String]( "unit" )) + def removePollsTest(){ + + val model = new PollModel + model.createPoll(pvo) + + assert(model.numPolls == 1, "Number of polls should be 1") + assert(model.hasPoll("pollID"), "No poll with id=pollID") + + var q = new QuestionVO("q1", true, "What is my name?", Array(r1, r2, r3, r4)) + val newpvo = new PollVO("pollID-2", "modified sample poll", Array(q)) + + model.createPoll(newpvo) + + assert(model.numPolls == 2, "Number of polls should be 2") + assert(model.hasPoll("pollID-2"), "No poll with id=pollID") + model.removePoll("pollID-2") + assert(model.numPolls == 1, "Number of polls should be 1") + assert(model.hasPoll("pollID"), "No poll with id=pollID") + assert(model.hasPoll("pollID-2") == false, "pollID-2 shouldn't exist") + } + + @Test(groups = Array[String]( "unit" )) + def respondPollsTest(){ + + val model = new PollModel + model.createPoll(pvo) + + assert(model.numPolls == 1, "Number of polls should be 1") + assert(model.hasPoll("pollID"), "No poll with id=pollID") + + model.respondToQuestion("pollID", "q1", "1", new Responder("user1", "Juan Tamad")) + model.respondToQuestion("pollID", "q1", "0", new Responder("user2", "Asyong Aksaya")) + + model.getPoll("pollID") match { + case Some(spvo) => { + assert(spvo.questions(0).responses(1).responders.length == 1, "Question has responders") + assert(spvo.questions(0).responses(0).responders.length == 1, "Question has responders") + } + case None => + } + + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollTestHelper.scala b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollTestHelper.scala new file mode 100755 index 0000000000..f39318eb27 --- /dev/null +++ b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollTestHelper.scala @@ -0,0 +1,3 @@ +package org.bigbluebutton.core.apps.poll + + diff --git a/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollTests.scala b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollTests.scala new file mode 100755 index 0000000000..04a0b34576 --- /dev/null +++ b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/poll/PollTests.scala @@ -0,0 +1,24 @@ +package org.bigbluebutton.core.apps.poll + +import org.testng.annotations.BeforeClass +import org.testng.annotations.Test + +class PollTests { + var samplePoll:Poll = null + + @BeforeClass + def setUp() { + val r1 = new Response("0", "Answer 1") + val r2 = new Response("1", "Answer 2") + val r3 = new Response("2", "Answer 3") + + val q = new Question("1", true, "What is my name?", Array(r1, r2, r3)) + + samplePoll = new Poll("pollID", "Sample Poll", Array(q)) + } + + @Test(groups = Array[String]( "unit" )) + def createPollTest(){ + + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/users/UsersModelTests.scala b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/users/UsersModelTests.scala new file mode 100755 index 0000000000..26830f3819 --- /dev/null +++ b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/users/UsersModelTests.scala @@ -0,0 +1,24 @@ +package org.bigbluebutton.core.apps.users + +import org.testng.annotations.BeforeClass +import org.testng.annotations.Test +import org.bigbluebutton.core.api.Role._ + +class UsersModelTests { + val model = new UsersModel + + @BeforeClass + def setUp() { + model.addUser("1", "ext1", "Juan Tamad", MODERATOR) + } + + @Test(groups = Array[String]( "unit" )) + def addUserTest(){ + assert(model.numUsers == 1, "Number of users should be 1") + val user = model.getUser("1") + assert(user != null, "Should have a user") + assert(model.isModerator("1") == true, "User should be moderator") + val users = model.getUsers + assert(users.length == 1, "Number of users should be 1") + } +} \ No newline at end of file diff --git a/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/users/UsersTest.scala b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/users/UsersTest.scala new file mode 100755 index 0000000000..bfd0709b25 --- /dev/null +++ b/bigbluebutton-apps/src/test/scala/org/bigbluebutton/core/apps/users/UsersTest.scala @@ -0,0 +1,203 @@ +package org.bigbluebutton.core.apps.users + +import org.testng.annotations.BeforeClass +import org.testng.annotations.Test +import org.testng.Assert +import org.bigbluebutton.core.models.{UserV, Status, CallerId, Voice} +import org.bigbluebutton.core.api.Role._ + +class UsersTest { + + @BeforeClass + def setUp() {} + + @Test(groups = Array[String]("unit")) + def addUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + assert(users.count == 1, "Number of users should be 1") + } + + @Test(groups = Array[String]("unit")) + def removeUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + assert(users.count == 1, "Number of users should be 1") + } + + @Test(groups = Array[String]("unit")) + def getUserWithUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.get("1") match { + case Some(u) => Assert.assertTrue(u.id == "1", "Found the user.") + case None => Assert.fail("There should have been a user.") + } + } + + @Test(groups = Array[String]("unit")) + def getUserWithNoUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.get("2") match { + case Some(u) => Assert.fail("There shouldn't be any user.") + case None => // passed + } + } + + @Test(groups = Array[String]("unit")) + def allUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.add(UserV("2", "ext2", "Asyong Aksaya", VIEWER)) + assert(users.count == 2, "Number of users should be 2") + val u = users.all + assert(u.size == 2, "Number of users should be 2") + } + + @Test(groups = Array[String]("unit")) + def allUserCheckIfReturningCorrectValueTest() { + val users = new Users + users.add(UserV("2", "ext2", "Asyong Aksaya", VIEWER)) + assert(users.count == 1, "Number of users should be 2") + val u = users.all + assert(u.size == 1, "Number of users should be 2") + assert(u(0).extId == "ext2", "Failed to return correct external id") + } + + @Test(groups = Array[String]("unit")) + def getPresenterHasPresenterTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR, status = Status(isPresenter=true))) + users.add(UserV("2", "ext2", "Asyong Aksaya", VIEWER)) + assert(users.count == 2, "Number of users should be 2") + users.getPresenter() match { + case Some(u) => Assert.assertTrue(u.id == "1", "Got a wrong presenter") + case None => Assert.fail("Should have returned a presenter.") + } + } + + @Test(groups = Array[String]("unit")) + def getPresenterNoPresenterTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.add(UserV("2", "ext2", "Asyong Aksaya", VIEWER)) + assert(users.count == 2, "Number of users should be 2") + users.getPresenter() match { + case Some(u) => Assert.fail("Should have returned no presenter.") + case None => // passed + } + } + + @Test(groups = Array[String]("unit")) + def makeEveryoneNotPresenterTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR, status = Status(isPresenter=true))) + users.add(UserV("2", "ext2", "Asyong Aksaya", VIEWER)) + assert(users.count == 2, "Number of users should be 2") + users.makeEveryoneNotPresenter() + users.getPresenter() match { + case Some(u) => Assert.fail("Should have returned no presenter.") + case None => // passed + } + } + + @Test(groups = Array[String]("unit")) + def makeUserPresenterTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.add(UserV("2", "ext2", "Asyong Aksaya", VIEWER)) + assert(users.count == 2, "Number of users should be 2") + users.makePresenter("1") match { + case Some(u) => Assert.assertTrue(u.id == "1", "Got a wrong presenter") + case None => Assert.fail("Should have returned a presenter.") + } + } + + @Test(groups = Array[String]("unit")) + def moderatorCountSuccessTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.add(UserV("2", "ext2", "Asyong Aksaya", VIEWER)) + assert(users.count == 2, "Number of users should be 2") + val numModerators = users.moderatorCount + assert(numModerators == 1, "There should only be one moderator") + } + + @Test(groups = Array[String]("unit")) + def moderatorCountFailTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.add(UserV("2", "ext2", "Asyong Aksaya", MODERATOR)) + assert(users.count == 2, "Number of users should be 2") + val numModerators = users.moderatorCount + Assert.assertFalse(numModerators == 1, "There should only be one moderator") + } + + @Test(groups = Array[String]("unit")) + def getVoiceUserHasUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR, voice=Voice(id="v1"))) + users.add(UserV("2", "ext2", "Asyong Aksaya", MODERATOR, voice=Voice(id="v2"))) + users.getVoiceUser("v1") match { + case Some(u) => Assert.assertTrue(u.id == "1", "Failed to find voice user.") + case None => Assert.fail("Failed to get user.") + } + } + + @Test(groups = Array[String]("unit")) + def getVoiceUserNoUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR, voice=Voice(id="v1"))) + users.add(UserV("2", "ext2", "Asyong Aksaya", MODERATOR, voice=Voice(id="v2"))) + users.getVoiceUser("v3") match { + case Some(u) => Assert.fail("Should have returned no user.") + case None => // passed + } + } + + @Test(groups = Array[String]("unit")) + def muteUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR, voice=Voice(id="v1"))) + users.add(UserV("2", "ext2", "Asyong Aksaya", MODERATOR, voice=Voice(id="v2"))) + users.mute("v1") match { + case Some(u) => Assert.assertTrue(u.voice.muted, "User should be muted.") + case None => Assert.fail("Failed to get user.") + } + } + + @Test(groups = Array[String]("unit")) + def umuteUserTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR, voice=Voice(id="v1"))) + users.add(UserV("2", "ext2", "Asyong Aksaya", MODERATOR, voice=Voice(id="v2"))) + users.unmute("v1") match { + case Some(u) => Assert.assertFalse(u.voice.muted, "User should be muted.") + case None => Assert.fail("Failed to get user.") + } + } + + @Test(groups = Array[String]("unit")) + def joinedVoiceTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.add(UserV("2", "ext2", "Asyong Aksaya", MODERATOR, voice=Voice(id="v2", callerId=CallerId("456", "Asyong")))) + val voiceUser = Voice(hasJoined=true, id="v1", callerId=CallerId("123", "Juan"), muted=false, talking=false, locked=false) + users.joinedVoice("1", voiceUser) match { + case Some(u) => Assert.assertTrue(u.id == "1", "Failed to find voice user.") + case None => Assert.fail("Failed to get user.") + } + } + + @Test(groups = Array[String]("unit")) + def leftVoiceTest() { + val users = new Users + users.add(UserV("1", "ext1", "Juan Tamad", MODERATOR)) + users.add(UserV("2", "ext2", "Asyong Aksaya", MODERATOR, voice=Voice(id="v2", callerId=CallerId("456", "Asyong")))) + users.leftVoice("v2") match { + case Some(u) => Assert.assertTrue(u.id == "2", "Failed to find voice user.") + case None => Assert.fail("Failed to get user.") + } + } +} \ No newline at end of file diff --git a/bigbluebutton-client/.actionScriptProperties b/bigbluebutton-client/.actionScriptProperties index 656a2dc932..0285e389d2 100755 --- a/bigbluebutton-client/.actionScriptProperties +++ b/bigbluebutton-client/.actionScriptProperties @@ -1,26 +1,12 @@ - - + + - + - - - - - - - - - - - - - - - - + + @@ -28,34 +14,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/bigbluebutton-client/.flexProperties b/bigbluebutton-client/.flexProperties index afb930671b..0f603b0c3e 100755 --- a/bigbluebutton-client/.flexProperties +++ b/bigbluebutton-client/.flexProperties @@ -1,2 +1,2 @@ - + diff --git a/bigbluebutton-client/.gitignore b/bigbluebutton-client/.gitignore index 2a4db7cf02..9e4eb68907 100755 --- a/bigbluebutton-client/.gitignore +++ b/bigbluebutton-client/.gitignore @@ -3,6 +3,7 @@ linker-report.xml bundles.txt build/ bin/ +bin-debug/ client/ bbbResources.properties.* asdoc/ diff --git a/bigbluebutton-client/.project b/bigbluebutton-client/.project old mode 100644 new mode 100755 index d4f99ec5cb..671c3111ec --- a/bigbluebutton-client/.project +++ b/bigbluebutton-client/.project @@ -1,38 +1,18 @@ - - - bigbluebutton-client - - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.adobe.flexbuilder.project.flexbuilder - - - - - com.powerflasher.fdt.core.FlashBuilder - - - - - - com.adobe.flexbuilder.project.flexnature - com.adobe.flexbuilder.project.actionscriptnature - com.powerflasher.fdt.core.FlashNature - org.eclipse.jdt.core.javanature - - - - bin-release - 2 - C:/Documents and Settings/TEMP.LABS.008/Desktop/release - - - - + + + z-bbb-client + + + + + + com.adobe.flexbuilder.project.flexbuilder + + + + + + com.adobe.flexbuilder.project.flexnature + com.adobe.flexbuilder.project.actionscriptnature + + diff --git a/bigbluebutton-client/.settings/org.eclipse.core.resources.prefs b/bigbluebutton-client/.settings/org.eclipse.core.resources.prefs index 3c18556542..720baeca8d 100755 --- a/bigbluebutton-client/.settings/org.eclipse.core.resources.prefs +++ b/bigbluebutton-client/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ +#Thu May 30 12:07:46 EDT 2013 eclipse.preferences.version=1 encoding//locale/el_GR/bbbResources.properties=UTF-8 -encoding/=UTF-8 +encoding/=utf-8 diff --git a/bigbluebutton-client/locale/az_AZ/bbbResources.properties b/bigbluebutton-client/locale/az_AZ/bbbResources.properties old mode 100644 new mode 100755 index 68febacffc..a81397e51a --- a/bigbluebutton-client/locale/az_AZ/bbbResources.properties +++ b/bigbluebutton-client/locale/az_AZ/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.title = İşçi masasını göstÉ™r # bbb.desktopPublish.minimizeBtn.toolTip = Minimize # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/bg_BG/bbbResources.properties b/bigbluebutton-client/locale/bg_BG/bbbResources.properties old mode 100644 new mode 100755 index be6e3e3a19..1bac728659 --- a/bigbluebutton-client/locale/bg_BG/bbbResources.properties +++ b/bigbluebutton-client/locale/bg_BG/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Спиране на ÑподелÑнето bbb.desktopPublish.minimizeBtn.toolTip = Минимизиране bbb.desktopPublish.minimizeBtn.accessibilityName = Минимизиране на прозореца Публикуване на Ñподелен екран bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = МакÑимизиране на прозореца Публикуване на Ñподелен екран -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/bn_IN/bbbResources.properties b/bigbluebutton-client/locale/bn_IN/bbbResources.properties old mode 100644 new mode 100755 index 279899c116..57187c8c68 --- a/bigbluebutton-client/locale/bn_IN/bbbResources.properties +++ b/bigbluebutton-client/locale/bn_IN/bbbResources.properties @@ -181,7 +181,7 @@ bbb.presentation.ok = ঠিক আছে # bbb.desktopPublish.minimizeBtn.toolTip = Minimize # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/ca_ES/bbbResources.properties b/bigbluebutton-client/locale/ca_ES/bbbResources.properties old mode 100644 new mode 100755 index 4e718ebdf3..d0457567bf --- a/bigbluebutton-client/locale/ca_ES/bbbResources.properties +++ b/bigbluebutton-client/locale/ca_ES/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Aturar la compartició i tancar aquesta fi bbb.desktopPublish.minimizeBtn.toolTip = Minimitzar aquesta finestra. bbb.desktopPublish.minimizeBtn.accessibilityName = Minimitzar la finestra d'iniciar el compartir escriptori bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximitzar la finestra d'iniciar el compartir escriptori -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/cs_CZ/bbbResources.properties b/bigbluebutton-client/locale/cs_CZ/bbbResources.properties old mode 100644 new mode 100755 index 076a2ce7aa..b4d903afa4 --- a/bigbluebutton-client/locale/cs_CZ/bbbResources.properties +++ b/bigbluebutton-client/locale/cs_CZ/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = UkonÄit sdílení a zavřít toto okno. bbb.desktopPublish.minimizeBtn.toolTip = Minimalizovat toto okno. # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/cy_GB/bbbResources.properties b/bigbluebutton-client/locale/cy_GB/bbbResources.properties old mode 100644 new mode 100755 index 6fd8090a73..fe35e92fdf --- a/bigbluebutton-client/locale/cy_GB/bbbResources.properties +++ b/bigbluebutton-client/locale/cy_GB/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Terfynu'r Rhannu a Chau bbb.desktopPublish.minimizeBtn.toolTip = Lleihau bbb.desktopPublish.minimizeBtn.accessibilityName = Lleihau'r Ffenestr Cyhoeddi Rhannu Bwrdd Gwaith bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Ehangu'r Ffenestr Cyhoeddi Rhannu Bwrdd Gwaith -bbb.desktopPublish.javaRequiredLabel = Angen Java 7u45 (neu'n ddiweddarach) i redeg. +bbb.desktopPublish.javaRequiredLabel = Angen Java 7u51 (neu'n ddiweddarach) i redeg. bbb.desktopPublish.javaTestLinkLabel = Gwirio Java bbb.desktopPublish.javaTestLinkLabel.tooltip = Gwirio Java bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Gwirio Java diff --git a/bigbluebutton-client/locale/da_DK/bbbResources.properties b/bigbluebutton-client/locale/da_DK/bbbResources.properties old mode 100644 new mode 100755 index cdd0cf600f..0d9339fba3 --- a/bigbluebutton-client/locale/da_DK/bbbResources.properties +++ b/bigbluebutton-client/locale/da_DK/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Stop deling og luk dette vindue. bbb.desktopPublish.minimizeBtn.toolTip = Minimer dette vindue # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/de_DE/bbbResources.properties b/bigbluebutton-client/locale/de_DE/bbbResources.properties old mode 100644 new mode 100755 index d545bdd4f5..a6b50c0f51 --- a/bigbluebutton-client/locale/de_DE/bbbResources.properties +++ b/bigbluebutton-client/locale/de_DE/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Teilen beenden und Fenster schließen. bbb.desktopPublish.minimizeBtn.toolTip = Fenster minimieren. bbb.desktopPublish.minimizeBtn.accessibilityName = Desktop Freigabe minimieren bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Desktop Freigabe maximieren -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/el_GR/bbbResources.properties b/bigbluebutton-client/locale/el_GR/bbbResources.properties old mode 100644 new mode 100755 index f0a432e355..d787a9c52e --- a/bigbluebutton-client/locale/el_GR/bbbResources.properties +++ b/bigbluebutton-client/locale/el_GR/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Διακοπή διαμοιÏÎ±ÏƒÎ¼Î¿Ï Îº bbb.desktopPublish.minimizeBtn.toolTip = Ελαχιστοποίηση bbb.desktopPublish.minimizeBtn.accessibilityName = Ελαχιστοποίηση του παÏαθÏÏου διαμοιÏÎ±ÏƒÎ¼Î¿Ï ÎµÏ€Î¹Ï†Î¬Î½ÎµÎ¹Î±Ï‚ εÏγασίας bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Μεγιστοποίηση του παÏαθÏÏου διαμοιÏÎ±ÏƒÎ¼Î¿Ï ÎµÏ€Î¹Ï†Î¬Î½ÎµÎ¹Î±Ï‚ εÏγασίας -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index fc96d843b4..e9488fc067 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -4,16 +4,27 @@ bbb.mainshell.statusProgress.loading = Loading {0} modules bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server. bbb.mainshell.copyrightLabel2 = (c) 2013 BigBlueButton Inc. [build {0}] - For more information visit http://www.bigbluebutton.org bbb.mainshell.logBtn.toolTip = Open Log Window +bbb.mainshell.meetingNotFound = Meeting Not Found +bbb.mainshell.invalidAuthToken = Invalid Authentication Token bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout bbb.oldlocalewindow.reminder1 = You may have an old language translations of BigBlueButton. bbb.oldlocalewindow.reminder2 = Please clear your browser's cache and try again. bbb.oldlocalewindow.windowTitle = Warning: Old Language Translations +bbb.audioSelection.title = How do you want to join the audio? +bbb.audioSelection.btnMicrophone.label = Microphone +bbb.audioSelection.btnListenOnly.label = Listen Only +bbb.audioSelection.txtPhone.text = To join this meeting by phone, dial: {0} then enter {1} as the conference pin number. bbb.micSettings.speakers.header = Test Speakers bbb.micSettings.microphone.header = Test Microphone bbb.micSettings.playSound = Test Speakers bbb.micSettings.playSound.toolTip = Play music to test your speakers bbb.micSettings.hearFromHeadset = You should hear audio in your headset, not your computer speakers. -bbb.micSettings.speakIntoMic = Test or change your microphone (headset recommended). +bbb.micSettings.speakIntoMic = Speak into your microphone. If you are using a headset, you should hear audio from your headset and not from your computer speakers. +bbb.micSettings.echoTestMicPrompt = Do you hear any audio? +bbb.micSettings.echoTestAudioYes = Yes +bbb.micSettings.echoTestAudioNo = No +bbb.micSettings.speakIntoMicTestLevel = Speak into your microphone. You should see the bar move. If not, choose another mic. +bbb.micSettings.recommendHeadset = Recommend you use a headset or earbuds. Otherwise, you will create echo. bbb.micSettings.changeMic = Test or Change Microphone bbb.micSettings.changeMic.toolTip = Open the Flash Player microphone settings dialog box bbb.micSettings.comboMicList.toolTip = Select a microphone @@ -34,6 +45,8 @@ bbb.micWarning.title = Audio Warning bbb.micWarning.joinBtn.label = Join anyway bbb.micWarning.testAgain.label = Test again bbb.micWarning.message = Your microphone did not show any activity, others probably won't be able to hear you during the session. +bbb.webrtcWarning.message = Could not connect with WebRTC with reason: {0}. Do you want to try Flash instead? +bbb.webrtcWarning.title = WebRTC Connection Failed bbb.mainToolbar.helpBtn = Help bbb.mainToolbar.logoutBtn = Logout bbb.mainToolbar.logoutBtn.toolTip = Log out @@ -133,6 +146,7 @@ bbb.presentation.maximizeRestoreBtn.accessibilityName = Maximize the Presentatio bbb.presentation.closeBtn.accessibilityName = Close the Presentation Window bbb.fileupload.title = Add Files to Your Presentation bbb.fileupload.fileLbl = Choose File to Upload: +bbb.fileupload.lblFileName.defaultText = No file selected bbb.fileupload.selectBtn.label = Select File bbb.fileupload.selectBtn.toolTip = Open dialog box to select a file bbb.fileupload.uploadBtn = Upload @@ -203,7 +217,7 @@ bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close bbb.desktopPublish.minimizeBtn.toolTip = Minimize bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. bbb.desktopPublish.javaTestLinkLabel = Test Java bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java @@ -213,8 +227,11 @@ bbb.desktopView.actualSize = Display actual size bbb.desktopView.minimizeBtn.accessibilityName = Minimize the Desktop Sharing View Window bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing View Window bbb.desktopView.closeBtn.accessibilityName = Close the Desktop Sharing View Window -bbb.toolbar.phone.toolTip.start = Join Audio -bbb.toolbar.phone.toolTip.stop = Leave Audio +bbb.toolbar.phone.toolTip.start = Share My Microphone +bbb.toolbar.phone.toolTip.stop = Stop Sharing My Microphone +bbb.toolbar.phone.toolTip.mute = Stop listening the conference +bbb.toolbar.phone.toolTip.unmute = Start listening the conference +bbb.toolbar.phone.toolTip.nomic = No microphone detected bbb.toolbar.deskshare.toolTip.start = Share My Desktop bbb.toolbar.deskshare.toolTip.stop = Stop Sharing My Desktop bbb.toolbar.video.toolTip.start = Share My Webcam @@ -349,6 +366,8 @@ bbb.shortcutkey.share.desktop = 68 bbb.shortcutkey.share.desktop.function = Open desktop sharing window bbb.shortcutkey.share.microphone = 79 bbb.shortcutkey.share.microphone.function = Open audio settings window +bbb.shortcutkey.share.pauseRemoteStream = 80 +bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference bbb.shortcutkey.share.webcam = 66 bbb.shortcutkey.share.webcam.function = Open webcam sharing window @@ -411,6 +430,8 @@ bbb.shortcutkey.chat.chatbox.goread.function = Navigate to the most recent messa bbb.shortcutkey.chat.chatbox.debug = 71 bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey +bbb.polling.toolbar.toolTip = Manage Polls +bbb.polling.buttonName = Manage Polls bbb.polling.createPoll = Create New Poll bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response bbb.polling.createPoll.hint = Hint: Start every answer with a new line @@ -431,35 +452,13 @@ bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use t bbb.polling.pollPreview.checkAll = (check all that may apply) bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling. -bbb.polling.validation.toolongAnswer = Your answers are too long. Max length is -bbb.polling.validation.toolongQuestion = Question is too long. Maximum chars: -bbb.polling.validation.toolongTitle = Title is too long, Max: -bbb.polling.validation.noQuestion = Please provide a Question -bbb.polling.validation.noTitle = Please provide a Title -bbb.polling.validation.toomuchAnswers = You have too many answers. Max, answers allowed: -bbb.polling.validation.eachNewLine = Please provide at least 2 Answers start each with new line -bbb.polling.validation.answerUnique = Every answer should be unique -bbb.polling.validation.atLeast2Answers = Please provide at least 2 Answers -bbb.polling.validation.duplicateTitle = This poll already exists - -bbb.polling.pollView.vote = Submit -bbb.polling.toolbar.toolTip = Polling - -bbb.polling.stats.repost = Repost -bbb.polling.stats.close = Close -bbb.polling.stats.didNotVote = Did Not Vote -bbb.polling.stats.refresh = Refresh -bbb.polling.stats.stopPoll = Stop Poll -bbb.polling.stats.webPollURL = This poll is available at: -bbb.polling.stats.answer = Answers -bbb.polling.stats.votes = Votes -bbb.polling.stats.percentage = % Of Votes - -bbb.polling.webPollClosed = Web polling has been closed. -bbb.polling.pollClosed = Polling has been closed! The results are - -bbb.polling.vote.error.radio = Please select an option, or close this window to not vote. -bbb.polling.vote.error.check = Please select one or more options, or close this window to not vote. +bbb.polling.resultBtn.label=Result +bbb.polling.resultBtn.toolTip=Show poll result +bbb.polling.startBtn.label=Start +bbb.polling.startBtn.toolTip=Start poll +bbb.polling.editBtn.label=Edit +bbb.polling.editBtn.toolTip=Edit poll +bbb.polling.deleteBtn.toolTip=Delete poll bbb.publishVideo.startPublishBtn.labelText = Start Sharing bbb.publishVideo.changeCameraBtn.labelText = Change Webcam Settings @@ -532,10 +531,16 @@ bbb.lockSettings.cancel = Cancel bbb.lockSettings.cancel.toolTip = Close this window without saving bbb.lockSettings.moderatorLocking = Moderator locking +bbb.lockSettings.privateChat.disabled = [Disabled] Private Chat +bbb.lockSettings.publicChat.disabled = [Disabled] Public Chat +bbb.lockSettings.webcam.disabled = [Disabled] Webcam +bbb.lockSettings.microphone.disabled = [Disabled] Microphone +bbb.lockSettings.layout.disabled = [Disabled] Layout bbb.lockSettings.privateChat = Private Chat bbb.lockSettings.publicChat = Public Chat bbb.lockSettings.webcam = Webcam bbb.lockSettings.microphone = Microphone +bbb.lockSettings.layout = Layout bbb.lockSettings.title=Lock Settings bbb.lockSettings.feature=Feature bbb.lockSettings.enabled=Enabled diff --git a/bigbluebutton-client/locale/es_ES/bbbResources.properties b/bigbluebutton-client/locale/es_ES/bbbResources.properties old mode 100644 new mode 100755 index 0bc090f58c..0e756dc5ac --- a/bigbluebutton-client/locale/es_ES/bbbResources.properties +++ b/bigbluebutton-client/locale/es_ES/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Detener la compartición y cerrar esta ven bbb.desktopPublish.minimizeBtn.toolTip = Minimizar esta ventana. bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar la ventana de iniciar el compartir escritorio bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar la ventana de iniciar el compartir escritorio -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/et_EE/bbbResources.properties b/bigbluebutton-client/locale/et_EE/bbbResources.properties old mode 100644 new mode 100755 index fbf93adbb3..575b4f102d --- a/bigbluebutton-client/locale/et_EE/bbbResources.properties +++ b/bigbluebutton-client/locale/et_EE/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Lõpeta jagamine ja sulge bbb.desktopPublish.minimizeBtn.toolTip = Minimeeri bbb.desktopPublish.minimizeBtn.accessibilityName = Minimeeri töölaua jagamise aken bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maksimeeri töölaua jagamise aken -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/eu_ES/bbbResources.properties b/bigbluebutton-client/locale/eu_ES/bbbResources.properties old mode 100644 new mode 100755 index aa93ff54c5..d20d0bcf64 --- a/bigbluebutton-client/locale/eu_ES/bbbResources.properties +++ b/bigbluebutton-client/locale/eu_ES/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Eten partekatzea eta itxi bbb.desktopPublish.minimizeBtn.toolTip = Txikitu bbb.desktopPublish.minimizeBtn.accessibilityName = Txikitu mahaigaina partekatzeko leihoa bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Handitu mahaigaina partekatzeko leihoa -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/fa_IR/bbbResources.properties b/bigbluebutton-client/locale/fa_IR/bbbResources.properties old mode 100644 new mode 100755 index 72c294cc17..49d15646ac --- a/bigbluebutton-client/locale/fa_IR/bbbResources.properties +++ b/bigbluebutton-client/locale/fa_IR/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = توق٠اشتراک گذاری Ùˆ خرو bbb.desktopPublish.minimizeBtn.toolTip = کمینه کردن bbb.desktopPublish.minimizeBtn.accessibilityName = کمینه کردن پنجره نمایش اشتراک صÙحه bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = بیشینه کردن پنجره نمایش اشتراک صÙحه -bbb.desktopPublish.javaRequiredLabel = برای اجرا نیاز به نسخه 7u45 (یا بالاتر) Ù…ÛŒ باشد +bbb.desktopPublish.javaRequiredLabel = برای اجرا نیاز به نسخه 7u51 (یا بالاتر) Ù…ÛŒ باشد bbb.desktopPublish.javaTestLinkLabel = آزمایش جاوا bbb.desktopPublish.javaTestLinkLabel.tooltip = آزمایش جاوا bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = آزمایش جاوا diff --git a/bigbluebutton-client/locale/fi_FI/bbbResources.properties b/bigbluebutton-client/locale/fi_FI/bbbResources.properties old mode 100644 new mode 100755 index 0ecae9950b..0ab82ac803 --- a/bigbluebutton-client/locale/fi_FI/bbbResources.properties +++ b/bigbluebutton-client/locale/fi_FI/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Lopeta jakaminen ja sulje bbb.desktopPublish.minimizeBtn.toolTip = Pienennä bbb.desktopPublish.minimizeBtn.accessibilityName = Pienennä työpöydän jako ikkuna bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Suurenna työpöydän jako ikkuna -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/fr_CA/bbbResources.properties b/bigbluebutton-client/locale/fr_CA/bbbResources.properties old mode 100644 new mode 100755 index 75385d28aa..201167a86b --- a/bigbluebutton-client/locale/fr_CA/bbbResources.properties +++ b/bigbluebutton-client/locale/fr_CA/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Arrêter de partager et fermer bbb.desktopPublish.minimizeBtn.toolTip = Réduire bbb.desktopPublish.minimizeBtn.accessibilityName = Réduire le module de partage d'écran bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Agrandir le module de partage d'écran -bbb.desktopPublish.javaRequiredLabel = Nécessite Java 7u45 (ou version ultérieure) pour fonctionner. +bbb.desktopPublish.javaRequiredLabel = Nécessite Java 7u51 (ou version ultérieure) pour fonctionner. bbb.desktopPublish.javaTestLinkLabel = Testez Java bbb.desktopPublish.javaTestLinkLabel.tooltip = Testez Java bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Testez Java diff --git a/bigbluebutton-client/locale/fr_FR/bbbResources.properties b/bigbluebutton-client/locale/fr_FR/bbbResources.properties old mode 100644 new mode 100755 index 15c9731188..f491569850 --- a/bigbluebutton-client/locale/fr_FR/bbbResources.properties +++ b/bigbluebutton-client/locale/fr_FR/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Arrêter de partager et fermer bbb.desktopPublish.minimizeBtn.toolTip = Réduire bbb.desktopPublish.minimizeBtn.accessibilityName = Réduire la fenêtre de partage d'écran bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Agrandir la fenêtre de partage d'écran -bbb.desktopPublish.javaRequiredLabel = Nécessite Java 7u45 (ou version ultérieure) pour fonctionner. +bbb.desktopPublish.javaRequiredLabel = Nécessite Java 7u51 (ou version ultérieure) pour fonctionner. bbb.desktopPublish.javaTestLinkLabel = Testez Java bbb.desktopPublish.javaTestLinkLabel.tooltip = Testez Java bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Testez Java diff --git a/bigbluebutton-client/locale/he_IL/bbbResources.properties b/bigbluebutton-client/locale/he_IL/bbbResources.properties old mode 100644 new mode 100755 index 737842f0d1..5a7968ad25 --- a/bigbluebutton-client/locale/he_IL/bbbResources.properties +++ b/bigbluebutton-client/locale/he_IL/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = הפסק שיתוף וסגור חלון ×– bbb.desktopPublish.minimizeBtn.toolTip = מזער חלון ×–×” # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/hr_HR/bbbResources.properties b/bigbluebutton-client/locale/hr_HR/bbbResources.properties old mode 100644 new mode 100755 index a2546c481b..b68043ca7f --- a/bigbluebutton-client/locale/hr_HR/bbbResources.properties +++ b/bigbluebutton-client/locale/hr_HR/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Prekini podelu radne ploÄe i zatvori proz bbb.desktopPublish.minimizeBtn.toolTip = Minimiraj ovaj prozor. # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/hu_HU/bbbResources.properties b/bigbluebutton-client/locale/hu_HU/bbbResources.properties old mode 100644 new mode 100755 index e8cadc51b5..4bec8d817c --- a/bigbluebutton-client/locale/hu_HU/bbbResources.properties +++ b/bigbluebutton-client/locale/hu_HU/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Megosztás leállítása és bezárás bbb.desktopPublish.minimizeBtn.toolTip = Kis méret bbb.desktopPublish.minimizeBtn.accessibilityName = KépernyÅ‘-megosztása ablak kis méretűre bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = KépernyÅ‘-megosztása ablak teljes méretűre -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/hy_AM/bbbResources.properties b/bigbluebutton-client/locale/hy_AM/bbbResources.properties old mode 100644 new mode 100755 index 04c39a17dc..9ad3e0b17e --- a/bigbluebutton-client/locale/hy_AM/bbbResources.properties +++ b/bigbluebutton-client/locale/hy_AM/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.stop.label = Õ“Õ¡Õ£Õ¥Õ¬ bbb.desktopPublish.minimizeBtn.toolTip = Õ“Õ¸Ö„Ö€Õ¡ÖÕ¶Õ¥Õ¬ # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/id_ID/bbbResources.properties b/bigbluebutton-client/locale/id_ID/bbbResources.properties old mode 100644 new mode 100755 index f273213218..727cb9e638 --- a/bigbluebutton-client/locale/id_ID/bbbResources.properties +++ b/bigbluebutton-client/locale/id_ID/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Berhenti berbagi dan tutup jendela ini. bbb.desktopPublish.minimizeBtn.toolTip = Minimalkan jendela ini. # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/ja_JP/bbbResources.properties b/bigbluebutton-client/locale/ja_JP/bbbResources.properties old mode 100644 new mode 100755 index f07027d548..13fb0b2504 --- a/bigbluebutton-client/locale/ja_JP/bbbResources.properties +++ b/bigbluebutton-client/locale/ja_JP/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = 共有をåœæ­¢ã—ã€é–‰ã˜ã‚‹ bbb.desktopPublish.minimizeBtn.toolTip = 最å°åŒ– bbb.desktopPublish.minimizeBtn.accessibilityName = デスクトップ共有ã®å…¬é–‹ã‚¦ã‚£ãƒ³â€‹â€‹ãƒ‰ã‚¦ã‚’最å°åŒ– bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = デスクトップ共有ã®å…¬é–‹ã‚¦ã‚£ãƒ³â€‹â€‹ãƒ‰ã‚¦ã‚’最大化 -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/kk_KZ/bbbResources.properties b/bigbluebutton-client/locale/kk_KZ/bbbResources.properties old mode 100644 new mode 100755 index 1f44a8ff6f..e4f93720cc --- a/bigbluebutton-client/locale/kk_KZ/bbbResources.properties +++ b/bigbluebutton-client/locale/kk_KZ/bbbResources.properties @@ -181,7 +181,7 @@ bbb.chat.sendBtn = Жөнелту # bbb.desktopPublish.minimizeBtn.toolTip = Minimize # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/km_KH/bbbResources.properties b/bigbluebutton-client/locale/km_KH/bbbResources.properties old mode 100644 new mode 100755 index 5a2c6f9655..cf70463aa3 --- a/bigbluebutton-client/locale/km_KH/bbbResources.properties +++ b/bigbluebutton-client/locale/km_KH/bbbResources.properties @@ -181,7 +181,7 @@ # bbb.desktopPublish.minimizeBtn.toolTip = Minimize # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/ko_KR/bbbResources.properties b/bigbluebutton-client/locale/ko_KR/bbbResources.properties old mode 100644 new mode 100755 index 4fe69e2726..8d8921f449 --- a/bigbluebutton-client/locale/ko_KR/bbbResources.properties +++ b/bigbluebutton-client/locale/ko_KR/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = 화면 공유를 중지하고 윈ë„우를 bbb.desktopPublish.minimizeBtn.toolTip = 윈ë„우를 최소화합니다. \# Minimize this window. bbb.desktopPublish.minimizeBtn.accessibilityName = 바탕화면 공유 게시 ì°½ 최소화 bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = 바탕화면 공유 게시 ì°½ 최대화 -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/lt_LT/bbbResources.properties b/bigbluebutton-client/locale/lt_LT/bbbResources.properties old mode 100644 new mode 100755 index 4cc3758a2a..a9bedce0a4 --- a/bigbluebutton-client/locale/lt_LT/bbbResources.properties +++ b/bigbluebutton-client/locale/lt_LT/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.stop.label = Uždaryti # bbb.desktopPublish.minimizeBtn.toolTip = Minimize # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/lv_LV/bbbResources.properties b/bigbluebutton-client/locale/lv_LV/bbbResources.properties old mode 100644 new mode 100755 index 172a932da6..789e5680b4 --- a/bigbluebutton-client/locale/lv_LV/bbbResources.properties +++ b/bigbluebutton-client/locale/lv_LV/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Aptur?t raid?Å¡anu un aizv?rt Å¡o logu. bbb.desktopPublish.minimizeBtn.toolTip = Minimiz?t Å¡o logu. # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/ml_IN/bbbResources.properties b/bigbluebutton-client/locale/ml_IN/bbbResources.properties old mode 100644 new mode 100755 index 6358b78ecb..00a4373b40 --- a/bigbluebutton-client/locale/ml_IN/bbbResources.properties +++ b/bigbluebutton-client/locale/ml_IN/bbbResources.properties @@ -181,7 +181,7 @@ bbb.presentation.title = അവതരണം # bbb.desktopPublish.minimizeBtn.toolTip = Minimize # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/mn_MN/bbbResources.properties b/bigbluebutton-client/locale/mn_MN/bbbResources.properties old mode 100644 new mode 100755 index b445698525..c870fb6d05 --- a/bigbluebutton-client/locale/mn_MN/bbbResources.properties +++ b/bigbluebutton-client/locale/mn_MN/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Хуваалтуудыг зогÑоож Ñ bbb.desktopPublish.minimizeBtn.toolTip = Цонхыг нуух # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/ms_MY/bbbResources.properties b/bigbluebutton-client/locale/ms_MY/bbbResources.properties old mode 100644 new mode 100755 index 75634d2258..f126744343 --- a/bigbluebutton-client/locale/ms_MY/bbbResources.properties +++ b/bigbluebutton-client/locale/ms_MY/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Henti Perkongsian dan Tutup bbb.desktopPublish.minimizeBtn.toolTip = Kecilkan # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. bbb.desktopPublish.javaTestLinkLabel = Uji Java bbb.desktopPublish.javaTestLinkLabel.tooltip = Uji Java bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Uji Java diff --git a/bigbluebutton-client/locale/ne_NP/bbbResources.properties b/bigbluebutton-client/locale/ne_NP/bbbResources.properties old mode 100644 new mode 100755 index c5432c3622..4c016f43db --- a/bigbluebutton-client/locale/ne_NP/bbbResources.properties +++ b/bigbluebutton-client/locale/ne_NP/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Stop het delen en sluit dit scherm. bbb.desktopPublish.minimizeBtn.toolTip = Minimaliseer dit scherm. bbb.desktopPublish.minimizeBtn.accessibilityName = Minimaliseer het desktop delen venster bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximaliseer het desktop delen venster -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/nl_NL/bbbResources.properties b/bigbluebutton-client/locale/nl_NL/bbbResources.properties old mode 100644 new mode 100755 index d9ac69be41..751086377d --- a/bigbluebutton-client/locale/nl_NL/bbbResources.properties +++ b/bigbluebutton-client/locale/nl_NL/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Stop het delen en sluit dit scherm. bbb.desktopPublish.minimizeBtn.toolTip = Minimaliseer dit scherm. bbb.desktopPublish.minimizeBtn.accessibilityName = Minimaliseer het desktop delen venster bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximaliseer het desktop delen venster -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/no_NO/bbbResources.properties b/bigbluebutton-client/locale/no_NO/bbbResources.properties old mode 100644 new mode 100755 index b257101b8f..b308237603 --- a/bigbluebutton-client/locale/no_NO/bbbResources.properties +++ b/bigbluebutton-client/locale/no_NO/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Stopp deling og lukk vinduet. bbb.desktopPublish.minimizeBtn.toolTip = Minimer bbb.desktopPublish.minimizeBtn.accessibilityName = Minimer vinduet for skrivebordsdeling bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maksimer vinduet for skrivebordsdeling -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/pl_PL/bbbResources.properties b/bigbluebutton-client/locale/pl_PL/bbbResources.properties old mode 100644 new mode 100755 index ee70c7549f..4dcdd3c99c --- a/bigbluebutton-client/locale/pl_PL/bbbResources.properties +++ b/bigbluebutton-client/locale/pl_PL/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = ZakoÅ„cz udostÄ™pnianie i zamknij bbb.desktopPublish.minimizeBtn.toolTip = ZwiÅ„ bbb.desktopPublish.minimizeBtn.accessibilityName = ZwiÅ„ okno udostÄ™pniania pulpitu bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = PowiÄ™ksz okno udostÄ™pniania pulpitu -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/pt_BR/bbbResources.properties b/bigbluebutton-client/locale/pt_BR/bbbResources.properties old mode 100644 new mode 100755 index 2a3095b3a3..3746892af8 --- a/bigbluebutton-client/locale/pt_BR/bbbResources.properties +++ b/bigbluebutton-client/locale/pt_BR/bbbResources.properties @@ -193,7 +193,7 @@ bbb.desktopPublish.closeBtn.toolTip = Interromper compartilhamento de tela bbb.desktopPublish.minimizeBtn.toolTip = Minimizar bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar janela do compartilhamento de tela bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar janela do compartilhamento de tela -bbb.desktopPublish.javaRequiredLabel = Requer Java 7u45 (ou posterior) para rodar. +bbb.desktopPublish.javaRequiredLabel = Requer Java 7u51 (ou posterior) para rodar. bbb.desktopPublish.javaTestLinkLabel = Testar Java bbb.desktopPublish.javaTestLinkLabel.tooltip = Testar Java bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Testar Java @@ -203,8 +203,11 @@ bbb.desktopView.actualSize = Exibir tamanho original bbb.desktopView.minimizeBtn.accessibilityName = Minimizar janela do compartilhamento de tela bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximizar janela do compartilhamento de tela bbb.desktopView.closeBtn.accessibilityName = Fechar janela do compartilhamento de tela -bbb.toolbar.phone.toolTip.start = Habilitar o som -bbb.toolbar.phone.toolTip.stop = Desabilitar o som +bbb.toolbar.phone.toolTip.start = Transmitir meu microfone +bbb.toolbar.phone.toolTip.stop = Interromper transmissão do meu microfone +bbb.toolbar.phone.toolTip.mute = Parar de ouvir a conferência +bbb.toolbar.phone.toolTip.unmute = Começar a ouvir a conferência +bbb.toolbar.phone.toolTip.nomic = Nenhum microfone foi detectado bbb.toolbar.deskshare.toolTip.start = Compartilhar minha tela bbb.toolbar.deskshare.toolTip.stop = Interromper compartilhamento de tela bbb.toolbar.video.toolTip.start = Transmitir minha câmera @@ -339,6 +342,8 @@ bbb.shortcutkey.share.desktop = 68 bbb.shortcutkey.share.desktop.function = Abrir janela de compartilhamento de tela bbb.shortcutkey.share.microphone = 79 bbb.shortcutkey.share.microphone.function = Abrir janela de configuração de microfone +bbb.shortcutkey.share.pauseRemoteStream = 80 +bbb.shortcutkey.share.pauseRemoteStream.function = Começar a/Parar de ouvir a conferência bbb.shortcutkey.share.webcam = 66 bbb.shortcutkey.share.webcam.function = Abrir janela de transmissão da câmera diff --git a/bigbluebutton-client/locale/pt_PT/bbbResources.properties b/bigbluebutton-client/locale/pt_PT/bbbResources.properties old mode 100644 new mode 100755 index 91b708e625..098be93de1 --- a/bigbluebutton-client/locale/pt_PT/bbbResources.properties +++ b/bigbluebutton-client/locale/pt_PT/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Parar a partilha e fechar esta janela bbb.desktopPublish.minimizeBtn.toolTip = Minimizar janela # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/ro_RO/bbbResources.properties b/bigbluebutton-client/locale/ro_RO/bbbResources.properties old mode 100644 new mode 100755 index 18384b8224..fd39f07f07 --- a/bigbluebutton-client/locale/ro_RO/bbbResources.properties +++ b/bigbluebutton-client/locale/ro_RO/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = OpreÅŸte partajarea ÅŸi închide aceasta f bbb.desktopPublish.minimizeBtn.toolTip = Minimizează aceasta fereastră # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/ru_RU/bbbResources.properties b/bigbluebutton-client/locale/ru_RU/bbbResources.properties old mode 100644 new mode 100755 index 7a7e80ca0e..7206e02de9 --- a/bigbluebutton-client/locale/ru_RU/bbbResources.properties +++ b/bigbluebutton-client/locale/ru_RU/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = ОÑтановить транÑлÑцию bbb.desktopPublish.minimizeBtn.toolTip = Свернуть bbb.desktopPublish.minimizeBtn.accessibilityName = Свернуть окно транÑлÑции рабочего Ñтола bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Развернуть окно транÑлÑции рабочего Ñтола -bbb.desktopPublish.javaRequiredLabel = Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑка требуетÑÑ Java 7u45 (или новее). +bbb.desktopPublish.javaRequiredLabel = Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑка требуетÑÑ Java 7u51 (или новее). bbb.desktopPublish.javaTestLinkLabel = ТеÑÑ‚ Java bbb.desktopPublish.javaTestLinkLabel.tooltip = ТеÑÑ‚ Java bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = ТеÑÑ‚ Java diff --git a/bigbluebutton-client/locale/si_LK/bbbResources.properties b/bigbluebutton-client/locale/si_LK/bbbResources.properties old mode 100644 new mode 100755 index 8e08848a1b..3e388522e3 --- a/bigbluebutton-client/locale/si_LK/bbbResources.properties +++ b/bigbluebutton-client/locale/si_LK/bbbResources.properties @@ -181,7 +181,7 @@ bbb.chat.fontSize = අකුරු ප්â€à¶»à¶¸à·à¶±à¶º # bbb.desktopPublish.minimizeBtn.toolTip = Minimize # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/sk_SK/bbbResources.properties b/bigbluebutton-client/locale/sk_SK/bbbResources.properties old mode 100644 new mode 100755 index 6b43163492..a0d20a0c3a --- a/bigbluebutton-client/locale/sk_SK/bbbResources.properties +++ b/bigbluebutton-client/locale/sk_SK/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = ZastaviÅ¥ zdieľanie a zatvoriÅ¥ toto okno bbb.desktopPublish.minimizeBtn.toolTip = MinimalizovaÅ¥ toto okno. # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/sl_SI/bbbResources.properties b/bigbluebutton-client/locale/sl_SI/bbbResources.properties old mode 100644 new mode 100755 index c8ea53255f..14e4587f81 --- a/bigbluebutton-client/locale/sl_SI/bbbResources.properties +++ b/bigbluebutton-client/locale/sl_SI/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Prenehaj z deljenjem in zapri to okno. bbb.desktopPublish.minimizeBtn.toolTip = PomanjÅ¡ajte to okno. # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/sr_RS/bbbResources.properties b/bigbluebutton-client/locale/sr_RS/bbbResources.properties old mode 100644 new mode 100755 index c69b34a74a..9cec0d4c09 --- a/bigbluebutton-client/locale/sr_RS/bbbResources.properties +++ b/bigbluebutton-client/locale/sr_RS/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Prekini podelu radne ploÄe i zatvori proz bbb.desktopPublish.minimizeBtn.toolTip = Minimiraj ovaj prozor. # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/sv_SE/bbbResources.properties b/bigbluebutton-client/locale/sv_SE/bbbResources.properties old mode 100644 new mode 100755 index e090f309cf..a9e400c445 --- a/bigbluebutton-client/locale/sv_SE/bbbResources.properties +++ b/bigbluebutton-client/locale/sv_SE/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Avsluta delning och stäng bbb.desktopPublish.minimizeBtn.toolTip = Minimera bbb.desktopPublish.minimizeBtn.accessibilityName = Minimera fönstret för skärmdelning bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximera fönstret för skärmdelning -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/th_TH/bbbResources.properties b/bigbluebutton-client/locale/th_TH/bbbResources.properties old mode 100644 new mode 100755 index 0dc581f1b9..e703fe0329 --- a/bigbluebutton-client/locale/th_TH/bbbResources.properties +++ b/bigbluebutton-client/locale/th_TH/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = หยุดà¸à¸²à¸£à¹à¸œà¸¢à¹à¸žà¸£à¹ˆ bbb.desktopPublish.minimizeBtn.toolTip = ลดหน้าต่างนี้ลง # bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window # bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/tr_TR/bbbResources.properties b/bigbluebutton-client/locale/tr_TR/bbbResources.properties old mode 100644 new mode 100755 index 023f5e9a11..ae294f5c45 --- a/bigbluebutton-client/locale/tr_TR/bbbResources.properties +++ b/bigbluebutton-client/locale/tr_TR/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Paylaşımı durdur ve Kapat. bbb.desktopPublish.minimizeBtn.toolTip = Küçült bbb.desktopPublish.minimizeBtn.accessibilityName = Masaüstü Paylaşımı Yayımlama Penceresini Küçült bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Masaüstü Paylaşımı Yayımlama Penceresini Büyült -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/uk_UA/bbbResources.properties b/bigbluebutton-client/locale/uk_UA/bbbResources.properties old mode 100644 new mode 100755 index c71f2258bb..056a6185ae --- a/bigbluebutton-client/locale/uk_UA/bbbResources.properties +++ b/bigbluebutton-client/locale/uk_UA/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Зупинити транÑлÑцію Ñ– bbb.desktopPublish.minimizeBtn.toolTip = Згорнути bbb.desktopPublish.minimizeBtn.accessibilityName = Згорнути вікно транÑлÑції bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Розгорнути вікно транÑлÑції -bbb.desktopPublish.javaRequiredLabel = Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑку потрібна Java 7u45 (або новіша). +bbb.desktopPublish.javaRequiredLabel = Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑку потрібна Java 7u51 (або новіша). bbb.desktopPublish.javaTestLinkLabel = ТеÑÑ‚ Java bbb.desktopPublish.javaTestLinkLabel.tooltip = ТеÑÑ‚ Java bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = ТеÑÑ‚ Java diff --git a/bigbluebutton-client/locale/vi_VN/bbbResources.properties b/bigbluebutton-client/locale/vi_VN/bbbResources.properties old mode 100644 new mode 100755 index f2c97e0cee..a58dba9c0a --- a/bigbluebutton-client/locale/vi_VN/bbbResources.properties +++ b/bigbluebutton-client/locale/vi_VN/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = Ngừng chia sẻ và đóng cá»­a sổ n bbb.desktopPublish.minimizeBtn.toolTip = Thu nhá» cá»­a sổ này. bbb.desktopPublish.minimizeBtn.accessibilityName = Thu nhở cá»­a sổ xuất bản cho chia sẻ dạng desktop bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Phóng to cá»­a sổ xuất bản cho chia sẻ dạng desktop -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/zh_CN/bbbResources.properties b/bigbluebutton-client/locale/zh_CN/bbbResources.properties old mode 100644 new mode 100755 index f6e14028fd..f8ff6951dc --- a/bigbluebutton-client/locale/zh_CN/bbbResources.properties +++ b/bigbluebutton-client/locale/zh_CN/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = åœæ­¢å…±äº«å¹¶å…³é—­ bbb.desktopPublish.minimizeBtn.toolTip = 最å°åŒ– bbb.desktopPublish.minimizeBtn.accessibilityName = 最å°åŒ–æ¡Œé¢å…±äº«å‘å¸ƒçª—å£ bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = 最大化桌é¢å…±äº«å‘å¸ƒçª—å£ -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/locale/zh_TW/bbbResources.properties b/bigbluebutton-client/locale/zh_TW/bbbResources.properties old mode 100644 new mode 100755 index 3fba22a1de..eb66ae11e2 --- a/bigbluebutton-client/locale/zh_TW/bbbResources.properties +++ b/bigbluebutton-client/locale/zh_TW/bbbResources.properties @@ -181,7 +181,7 @@ bbb.desktopPublish.closeBtn.toolTip = åœæ­¢å…±äº«ä¸¦é—œé–‰è¦–窗 bbb.desktopPublish.minimizeBtn.toolTip = 最å°åŒ–視窗 bbb.desktopPublish.minimizeBtn.accessibilityName = 最å°åŒ–螢幕共享發佈視窗 bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = 最大化螢幕共享發佈視窗 -# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u45 (or later) to run. +# bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. # bbb.desktopPublish.javaTestLinkLabel = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Java # bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Java diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template index 3f5791695b..f24557e251 100755 --- a/bigbluebutton-client/resources/config.xml.template +++ b/bigbluebutton-client/resources/config.xml.template @@ -47,11 +47,16 @@ @@ -95,12 +100,10 @@ keepToolbarVisible="false" /> - = 28) || (browser == "Firefox" && version >= 26) ) ) { - callback("Browser version not supported"); + callback({'status': 'browserError', message: "Browser version not supported"}); return; } @@ -46,46 +46,52 @@ function webrtc_call(username, voiceBridge, server, callback) { bbbAudioConference = new JsSIP.UA(configuration); + bbbAudioConference.on('newRTCSession', function(e) { console.log("New Webrtc session created!"); currentSession = e.data.session; }); + bbbAudioConference.start(); // Make an audio/video call: // HTML5