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

Merge branch 'antobinary-verto-2'

Browse Source
This commit is contained in:
Richard Alam 2016-05-16 22:38:07 -04:00
commit 8e078dfa68
8 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
akka-bbb-apps/src/main/resources/application.conf
View File

@ -41,8 +41,6 @@ http {
}
services {
telizeHost = "www.telize.com"
telizePort = 80
bbbWebHost = "localhost"
bbbWebPort = 88888
bbbWebAPI = "http://192.168.23.33/bigbluebutton/api"

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
View File

@ -12,8 +12,6 @@ trait SystemConfiguration {
lazy val redisPassword = Try(config.getString("redis.password")).getOrElse("")
lazy val httpInterface = Try(config.getString("http.interface")).getOrElse("")
lazy val httpPort = Try(config.getInt("http.port")).getOrElse(9090)
lazy val telizeHost = Try(config.getString("services.telizeHost")).getOrElse("")
lazy val telizePort = Try(config.getInt("services.telizePort")).getOrElse(80)
lazy val bbbWebHost = Try(config.getString("services.bbbWebHost")).getOrElse("localhost")
lazy val bbbWebPort = Try(config.getInt("services.bbbWebPort")).getOrElse(8888)
lazy val bbbWebAPI = Try(config.getString("services.bbbWebAPI")).getOrElse("localhost")
@ -24,4 +22,4 @@ trait SystemConfiguration {
lazy val keysExpiresInSec = Try(config.getInt("redis.keyExpiry")).getOrElse(14 * 86400) // 14 days
lazy val red5DeskShareIP = Try(config.getString("red5.deskshareip")).getOrElse("127.0.0.1")
lazy val red5DeskShareApp = Try(config.getString("red5.deskshareapp")).getOrElse("")
}
}

1
bbb-screenshare/.gitignore vendored
View File

@ -5,6 +5,7 @@
.project
app/build/
app/lib/
app/lib_managed/
jws/webstart/lib/
build/
/bin/

2
bbb-video/build.gradle
View File

@ -62,7 +62,7 @@ dependencies {
compile 'commons-pool:commons-pool:1.5.6'
compile 'com.google.code.gson:gson:2.5'
compile 'org.bigbluebutton:bbb-common-message:0.0.17-SNAPSHOT'
compile 'org.bigbluebutton:bbb-common-message:0.0.18-SNAPSHOT'
}
test {

6
bigbluebutton-client/resources/prod/lib/verto_extension_share.js
View File

@ -52,11 +52,11 @@ var configDeskshareFromChromeFlash = function(videoTag, callbacks, extensionId)
"audio": false,
"video": {
"mandatory": {
"maxWidth": 160,
"maxHeight": 120,
"maxWidth": 1920,
"maxHeight": 1080,
"chromeMediaSource": constraints.mandatory.chromeMediaSource,
"chromeMediaSourceId": constraints.mandatory.chromeMediaSourceId,
"minFrameRate": 10,
"minFrameRate": 12,
},
"optional": []
}

3
bigbluebutton-html5/package.json
View File

@ -3,7 +3,7 @@
"description": "BigBlueButton HTML5 Client",
"scripts": {
"start": "cd app;./start.sh",
"preinstall": "npm install -g grunt-cli",
"preinstall": "npm install grunt-cli",
"test": "cd app;JASMINE_BROWSER=PhantomJS JASMINE_MIRROR_PORT=3000 meteor run --test",
"lint": "node_modules/jscs/bin/jscs *",
"autofix": "node_modules/jscs/bin/jscs * --fix"
@ -11,6 +11,7 @@
"dependencies": {
"classnames": "^2.2.3",
"history": "^2.1.1",
"meteor-node-stubs": "^0.2.3",
"react": "^15.0.1",
"react-addons-pure-render-mixin": "^15.0.1",
"react-dom": "^15.0.1",

3
video-broadcast/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/lib
/build

37
video-broadcast/build.gradle
View File

@ -15,35 +15,6 @@ task resolveDeps(type: Copy) {
repositories {
mavenCentral()
mavenLocal()
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.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 = "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]"
}
mavenRepo name: "jboss", urls: "http://repository.jboss.org/nexus/content/groups/public-jboss"
mavenRepo name: "sonatype-snapshot", urls: "http://oss.sonatype.org/content/repositories/snapshots"
mavenRepo name: "sonatype-releases", urls: "http://oss.sonatype.org/content/repositories/releases"
}
}
dependencies {
@ -62,9 +33,9 @@ dependencies {
providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar'
// Red5
providedCompile 'org.red5:red5-server:1.0.6-SNAPSHOT@jar'
providedCompile 'org.red5:red5-server-common:1.0.6-SNAPSHOT@jar'
providedCompile 'org.red5:red5-io:1.0.6-SNAPSHOT@jar'
providedCompile 'org.red5:red5-server:1.0.7-M10@jar'
providedCompile 'org.red5:red5-server-common:1.0.7-M10@jar'
providedCompile 'org.red5:red5-io:1.0.7-M8@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.1.2@jar'
@ -91,7 +62,7 @@ dependencies {
providedCompile 'commons-pool:commons-pool:1.5.6'
compile 'com.google.code.gson:gson:1.7.1'
compile 'org.bigbluebutton:bbb-common-message:0.0.5'
compile 'org.bigbluebutton:bbb-common-message:0.0.18-SNAPSHOT'
}
test {