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

Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles

Browse Source
This commit is contained in:
Felipe Cecagno 2013-04-28 18:28:56 -04:00
commit eb6035177b
23 changed files with 63 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-video/build.gradle
View File

@ -81,7 +81,7 @@ dependencies {
providedCompile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0r4627@jar'
providedCompile 'org/red5:red5:1.0r4630@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'

2
bbb-voice/build.gradle
View File

@ -81,7 +81,7 @@ dependencies {
providedCompile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0r4627@jar'
providedCompile 'org/red5:red5:1.0r4630@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'

2
bigbluebutton-apps/build.gradle
View File

@ -73,7 +73,7 @@ dependencies {
providedCompile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0r4627@jar'
providedCompile 'org/red5:red5:1.0r4630@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'

63
bigbluebutton-client/.actionScriptProperties
View File

@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties analytics="false" mainApplicationPath="BigBlueButton.mxml" projectUUID="2f78753b-2e4c-41b4-8cf4-eddb768eb4b3" version="10">
<compiler additionalCompilerArguments="-locale=" autoRSLOrdering="true" copyDependentFiles="true" flex3CompatMode="true" flexSDK="Flex 4.5" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="11.2.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="1">
<libraryPathEntry kind="4" path="">
<excludedEntries>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
<libraryPathEntry applicationDomain="default" forceLoad="false" index="4" kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/sparkskins.swc" useDefaultLinkType="true">
<crossDomainRsls>
<crossDomainRslEntry autoExtract="true" policyFileUrl="http://fpdownload.adobe.com/pub/swz/crossdomain.xml" rslUrl="http://fpdownload.adobe.com/pub/swz/flex/4.5.0.20967/sparkskins_4.5.0.20967.swz"/>
<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="sparkskins_4.5.0.20967.swz"/>
</crossDomainRsls>
</libraryPathEntry>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
<libraryPathEntry applicationDomain="default" forceLoad="false" index="3" kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/spark.swc" useDefaultLinkType="true">
<crossDomainRsls>
<crossDomainRslEntry autoExtract="true" policyFileUrl="http://fpdownload.adobe.com/pub/swz/crossdomain.xml" rslUrl="http://fpdownload.adobe.com/pub/swz/flex/4.5.0.20967/spark_4.5.0.20967.swz"/>
<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="spark_4.5.0.20967.swz"/>
</crossDomainRsls>
</libraryPathEntry>
</excludedEntries>
</libraryPathEntry>
<libraryPathEntry kind="1" linkType="1" path="libs"/>
</libraryPath>
<sourceAttachmentPath/>
</compiler>
<applications>
<application path="src/main.mxml"/>
<application path="MessagingUnitTests.mxml"/>
<application path="org/bigbluebutton/modules/settings/SettingsPanel.mxml"/>
<application path="BigBlueButton.mxml"/>
<application path="BigBlueButtonUnitTests.mxml"/>
<application path="DeskshareStandalone.mxml"/>
<application path="src/TestRunners.mxml"/>
<application path="WebcamPreviewStandalone.mxml"/>
<application path="WebcamViewStandalone.mxml"/>
<application path="org/red5/flash/bwcheck/app/BandwidthDetectionApp.as"/>
</applications>
<modules>
<module application="src/BigBlueButton.mxml" destPath="DynamicInfoModule.swf" optimize="true" sourcePath="src/DynamicInfoModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="PhoneModule.swf" optimize="true" sourcePath="src/PhoneModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="PresentModule.swf" optimize="true" sourcePath="src/PresentModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ExampleChatModule.swf" optimize="true" sourcePath="src/ExampleChatModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="DeskShareModule.swf" optimize="true" sourcePath="src/DeskShareModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="VideoconfModule.swf" optimize="true" sourcePath="src/VideoconfModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ViewersModule.swf" optimize="true" sourcePath="src/ViewersModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ChatModule.swf" optimize="true" sourcePath="src/ChatModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ListenersModule.swf" optimize="true" sourcePath="src/ListenersModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="WhiteboardModule.swf" optimize="true" sourcePath="src/WhiteboardModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="BreakoutModule.swf" optimize="true" sourcePath="src/BreakoutModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="SharedNotesModule.swf" optimize="true" sourcePath="src/SharedNotesModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ClassroomAudioModule.swf" optimize="true" sourcePath="src/ClassroomAudioModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="SettingsModule.swf" optimize="true" sourcePath="src/SettingsModule.mxml"/>
</modules>
<buildCSSFiles>
<buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/logo_basic.css"/>
<buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/theme.css"/>
</buildCSSFiles>
<flashCatalyst validateFlashCatalystCompatibility="false"/>
</actionScriptProperties>

44
bigbluebutton-client/.actionScriptProperties.orig
View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties mainApplicationPath="BigBlueButton.mxml" projectUUID="71ca15c9-a313-4acd-a765-12a897cbc088" version="6">
<compiler additionalCompilerArguments="-locale=" autoRSLOrdering="false" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath>
<compilerSourcePathEntry kind="1" linkType="1" path="tests/integration"/>
<compilerSourcePathEntry kind="1" linkType="1" path="tests/unit"/>
<compilerSourcePathEntry kind="1" linkType="1" path="tests/suite"/>
</compilerSourcePath>
<libraryPath defaultLinkType="1">
<libraryPathEntry kind="4" path="">
<excludedEntries>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
</excludedEntries>
</libraryPathEntry>
<libraryPathEntry kind="1" linkType="1" path="libs"/>
</libraryPath>
<sourceAttachmentPath>
<sourceAttachmentPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" sourcepath="${PROJECT_FRAMEWORKS}/source" useDefaultLinkType="false"/>
<sourceAttachmentPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" sourcepath="${PROJECT_FRAMEWORKS}/source" useDefaultLinkType="true"/>
</sourceAttachmentPath>
</compiler>
<applications>
<application path="src/main.mxml"/>
<application path="BbbUnitTests.mxml"/>
<application path="BigBlueButton.mxml"/>
<application path="DeskshareStandalone.mxml"/>
<application path="src/TestRunners.mxml"/>
</applications>
<modules>
<module application="src/BigBlueButton.mxml" destPath="PresentModule.swf" optimize="true" sourcePath="src/PresentModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ViewersModule.swf" optimize="true" sourcePath="src/ViewersModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="HighlighterModule.swf" optimize="true" sourcePath="src/HighlighterModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="PhoneModule.swf" optimize="true" sourcePath="src/PhoneModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="DeskShareModule.swf" optimize="true" sourcePath="src/DeskShareModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="VideoconfModule.swf" optimize="true" sourcePath="src/VideoconfModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="DynamicInfoModule.swf" optimize="true" sourcePath="src/DynamicInfoModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ListenersModule.swf" optimize="true" sourcePath="src/ListenersModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ChatModule.swf" optimize="true" sourcePath="src/ChatModule.mxml"/>
</modules>
<buildCSSFiles/>
</actionScriptProperties>

2
bigbluebutton-client/.flexProperties
View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>

2
bigbluebutton-client/.flexProperties.orig
View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>

3
bigbluebutton-client/.gitignore vendored
View File

@ -5,7 +5,8 @@
linker-report.xml
bundles.txt
build/
client
bin/
client/
bbbResources.properties.*
asdoc/
hs_err_pid*

37
bigbluebutton-client/.project
View File

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>bigbluebutton-client</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.adobe.flexbuilder.project.flexbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.powerflasher.fdt.core.FlashBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.adobe.flexbuilder.project.flexnature</nature>
<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
<nature>com.powerflasher.fdt.core.FlashNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
<link>
<name>bin-release</name>
<type>2</type>
<location>C:/Documents and Settings/TEMP.LABS.008/Desktop/release</location>
</link>
</linkedResources>
</projectDescription>

1
bigbluebutton-client/bin/.gitignore vendored
View File

@ -1 +0,0 @@
*.*

10
bigbluebutton-client/branding/default/style/css/BBBDefault.css
View File

@ -144,7 +144,7 @@ DataGrid {
icon: Embed('assets/images/triangle.png');
}
.presentationUploadButtonStyle, .presentationBackButtonStyle, .presentationForwardButtonStyle,
.presentationUploadButtonStyle, .presentationBackButtonStyle, .presentationBackButtonDisabledStyle, .presentationForwardButtonStyle, .presentationForwardButtonDisabledStyle,
.presentationFitToWidthButtonStyle, .presentationFitToPageButtonStyle
{
textIndent: 0;
@ -172,10 +172,18 @@ DataGrid {
icon: Embed('assets/images/left-arrow.png');
}
.presentationBackButtonDisabledStyle {
icon: Embed('assets/images/left-arrow-disabled.png');
}
.presentationForwardButtonStyle {
icon: Embed('assets/images/right-arrow.png');
}
.presentationForwardButtonDisabledStyle {
icon: Embed('assets/images/right-arrow-disabled.png');
}
.presentationFitToWidthButtonStyle {
icon: Embed('assets/images/fit-to-width.png');
}

BIN
bigbluebutton-client/branding/default/style/css/assets/images/left-arrow-disabled.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 660 B

BIN
bigbluebutton-client/branding/default/style/css/assets/images/right-arrow-disabled.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 648 B

41
bigbluebutton-client/build.xml
View File

@ -15,7 +15,7 @@
<property name="PROD_RESOURCES_DIR" value="${RESOURCES_DIR}/prod" />
<property name="SRC_DIR" value="${BASE_DIR}/src" />
<property name="OUTPUT_DIR" value="${BASE_DIR}/bin" />
<property name="OUTPUT_DIR" value="${BASE_DIR}/client" />
<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<!-- Declare module names here -->
@ -157,6 +157,7 @@
http://forums.adobe.com/thread/758619
ralam - sept 20, 2011
-->
<include-resource-bundles>SharedResources</include-resource-bundles>
<include-resource-bundles>bbbResources</include-resource-bundles>
<include-resource-bundles>collections</include-resource-bundles>
<include-resource-bundles>containers</include-resource-bundles>
@ -289,7 +290,7 @@
<!-- just a grouping of modules to compile -->
<target name="build-deskshare-phone-video-whiteboard-dyn"
depends="build-deskshare, build-phone, build-video, build-videodock, build-whiteboard, build-notes"
depends="build-deskshare, build-phone, build-video, build-videodock, build-whiteboard, build-notes, build-polling"
description="Compile deskshare, phone, video, whiteboard modules">
</target>
@ -438,8 +439,6 @@
<then>
<echo message="Copying config.xml for development environment"/>
<copy file="${BASE_DIR}/src/conf/config.xml" todir="${OUTPUT_DIR}/conf" />
<echo message="Copying join-mock.xml for development environment"/>
<copy file="${BASE_DIR}/src/conf/join-mock.xml" todir="${OUTPUT_DIR}/conf" />
<!-- echo message="Copying layout.xml for development environment"/>
<copy file="${BASE_DIR}/src/conf/layout.xml" todir="${OUTPUT_DIR}/conf" /-->
</then>
@ -490,17 +489,27 @@
<echo message="Done Generating ASDocs" />
</target>
<target name="clean">
<delete>
<fileset dir="${OUTPUT_DIR}" >
<exclude name="locale/*.swf"/>
<exclude name=".gitignore"/>
</fileset>
<dirset dir="${OUTPUT_DIR}">
<include name="**/*"/>
<exclude name="locale"/>
</dirset>
</delete>
<target name="clean" depends="init-ant-contrib">
<if>
<equals arg1="${OUTPUT_DIR}" arg2="true"/>
<then>
<echo message="Locale output dir exists. Deleting contents of ${OUTPUT_DIR}/locale"/>
<delete>
<fileset dir="${OUTPUT_DIR}" >
<exclude name="locale/*.swf"/>
<exclude name=".gitignore"/>
</fileset>
<dirset dir="${OUTPUT_DIR}">
<include name="**/*"/>
<exclude name="locale"/>
</dirset>
</delete>
</then>
<else>
<echo message="Output dir does not exists. Creating [${OUTPUT_DIR}] dir."/>
<mkdir dir="${OUTPUT_DIR}"/>
</else>
</if>
</target>
<!-- NOTE: compile-deskshare-standalone MUST come first before compile-bbb as we need the deskshare-standalone
@ -508,7 +517,7 @@
<target name="clean-build-bbb" depends="clean, init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone,
build-webcam-preview-standalone, build-webcam-view-standalone, compile-bbb"
description="Build BBB client skipping compiling of locales"/>
<target name="clean-build-all" depends="clean, init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone, build-polling, build-mic-check,
<target name="clean-build-all" depends="clean, init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone, build-mic-check,
build-cam-check, build-conn-check, build-webcam-preview-standalone, build-webcam-view-standalone,
compile-bbb, branding, branding-black"
description="Build BBB client including locales"/>

10
bigbluebutton-client/src/VideoconfModule.mxml
View File

@ -45,10 +45,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
public function get uri():String {
if (_attributes.mode == "PLAYBACK") {
return _attributes.uri + "/" + _attributes.playbackRoom;
}
return _attributes.uri + "/" + _attributes.room;
}
@ -81,8 +77,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
public function start(attributes:Object):void {
trace("Starting Video Module");
_attributes = attributes;
var globalDispatcher:Dispatcher = new Dispatcher();
globalDispatcher.dispatchEvent(new VideoModuleStartEvent(VideoModuleStartEvent.START));
var event:VideoModuleStartEvent = new VideoModuleStartEvent(VideoModuleStartEvent.START);
event.uri = uri;
globalDispatcher.dispatchEvent(event);
}
public function stop():void {

4
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
View File

@ -472,14 +472,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function disableSlideNavigationButtons(pageNumber:int):void {
if (pageNumber == 0) {
backButton.enabled = false;
backButton.styleName = "presentationBackButtonDisabledStyle";
} else {
backButton.enabled = true;
backButton.styleName = "presentationBackButtonStyle";
}
if (pageNumber < slideView.slides.length - 1) {
forwardButton.enabled = true;
forwardButton.styleName = "presentationForwardButtonStyle";
} else {
forwardButton.enabled = false;
forwardButton.styleName = "presentationForwardButtonDisabledStyle";
}
}

2
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/events/VideoModuleStartEvent.as
View File

@ -24,6 +24,8 @@ package org.bigbluebutton.modules.videoconf.events
{
public static const START:String = "video module start event";
public var uri:String;
public function VideoModuleStartEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false)
{
super(type, bubbles, cancelable);

2
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
View File

@ -43,7 +43,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<EventHandlers type="{VideoModuleStartEvent.START}">
<ObjectBuilder generator="{VideoEventMapDelegate}" cache="global" constructorArguments="{scope.dispatcher}"/>
<MethodInvoker generator="{VideoEventMapDelegate}" method="start"/>
<MethodInvoker generator="{VideoEventMapDelegate}" method="start" arguments="{event.uri}"/>
</EventHandlers>
<EventHandlers type="{VideoModuleStopEvent.STOP}">

7
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
View File

@ -61,6 +61,8 @@ package org.bigbluebutton.modules.videoconf.maps
public class VideoEventMapDelegate
{
private var options:VideoConfOptions = new VideoConfOptions();
private var uri:String;
private var webcamWindows:WindowManager = new WindowManager();
private var button:ToolbarButton;
@ -80,8 +82,9 @@ package org.bigbluebutton.modules.videoconf.maps
return UsersUtil.getMyUsername();
}
public function start():void {
public function start(uri:String):void {
trace("VideoEventMapDelegate:: [" + me + "] Video Module Started.");
this.uri = uri;
}
public function stop():void {
@ -263,7 +266,7 @@ package org.bigbluebutton.modules.videoconf.maps
}
public function connectToVideoApp():void {
proxy = new VideoProxy(options.uri + "/" + UsersUtil.getInternalMeetingID());
proxy = new VideoProxy(uri + "/" + UsersUtil.getInternalMeetingID());
proxy.connect();
}

6
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
View File

@ -60,6 +60,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Script>
<![CDATA[
import flash.ui.Keyboard;
import flexlib.mdi.events.MDIWindowEvent;
import mx.containers.ControlBar;
import mx.events.MoveEvent;
@ -220,8 +222,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
public function positionToolbar(window:PresentationWindow):void {
trace("Positioning whiteboard toolbar");
presentationWindow = window;
//presentationWindow.addEventListener(MoveEvent.MOVE, setPositionAndDepth);
//presentationWindow.addEventListener(ResizeEvent.RESIZE, setPositionAndDepth);
presentationWindow.addEventListener(MoveEvent.MOVE, setPositionAndDepth);
presentationWindow.addEventListener(ResizeEvent.RESIZE, setPositionAndDepth);
//presentationWindow.addEventListener(MouseEvent.CLICK, setPositionAndDepth);
window.presCtrlBar.addEventListener(MouseEvent.ROLL_OVER, hideToolbar);

10
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View File

@ -778,15 +778,7 @@ class ApiController {
String defConfigXML = paramsProcessorUtil.getDefaultConfigXML();
response.addHeader("Cache-Control", "no-cache")
withFormat {
xml {
render(contentType:"text/xml") {
response() {
config(defConfigXML)
}
}
}
}
render text: defConfigXML, contentType: 'text/xml'
}

2
deskshare/app/build.gradle
View File

@ -24,7 +24,7 @@ dependencies {
providedCompile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0r4627@jar'
providedCompile 'org/red5:red5:1.0r4630@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'

2
deskshare/build.gradle
View File

@ -73,7 +73,7 @@ dependencies {
compile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
// Red5
compile 'org/red5:red5:1.0r4627@jar'
compile 'org/red5:red5:1.0r4630@jar'
// Logging
compile 'ch.qos.logback:logback-core:1.0.9@jar'