diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index 80dfc6256446995c4b788d7079ecafbbe94bd9f0..b8b7dee46c9fa5f3a17d08dab5e204486533b18b 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -8,10 +8,10 @@
<bwMon server="HOST" application="video/bwTest"/>
<application uri="rtmp://HOST/bigbluebutton" host="http://HOST/bigbluebutton/api/enter"/>
<language userSelectionEnabled="true" rtlEnabled="false"/>
- <skinning enabled="true" url="http://HOST/client/branding/css/V2Theme.css.swf?v=VERSION" />
+ <skinning url="http://HOST/client/branding/css/V2Theme.css.swf?v=VERSION" />
<branding logo="logo.swf" copyright="© 2017 <u><a href="http://HOST/home.html" target="_blank">BigBlueButton Inc.</a></u> (build {0})" background="" toolbarColor="" showQuote="true"/>
- <shortcutKeys showButton="true" />
- <browserVersions chrome="CHROME_VERSION" firefox="FIREFOX_VERSION" flash="FLASH_VERSION" java="1.7.0_51" />
+ <shortcutKeys showButton="true" />
+ <browserVersions chrome="CHROME_VERSION" firefox="FIREFOX_VERSION" flash="FLASH_VERSION"/>
<layout showLogButton="false" defaultLayout="bbb.layout.name.defaultlayout"
showToolbar="true" showFooter="true" showMeetingName="true" showHelpButton="true"
showLogoutWindow="true" showLayoutTools="true" confirmLogout="true" showNetworkMonitor="false"
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/BigBlueButtonModuleLoader.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/BigBlueButtonModuleLoader.as
deleted file mode 100755
index 4832568b937a1d73a229713637d1e028748ba771..0000000000000000000000000000000000000000
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/BigBlueButtonModuleLoader.as
+++ /dev/null
@@ -1,30 +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 <http://www.gnu.org/licenses/>.
-*
-*/
-package org.bigbluebutton.main.model.modules
-{
- import mx.modules.ModuleLoader;
-
- public class BigBlueButtonModuleLoader extends ModuleLoader
- {
- public function BigBlueButtonModuleLoader()
- {
- super();
- }
- }
-}
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as
index e73f43a79f5df974864ca60829d35ab94a59b9e7..dcc1a04b737beac7c02f4c1c3cbef6c50591009a 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as
@@ -38,7 +38,7 @@ package org.bigbluebutton.main.model.modules
private static const LOGGER:ILogger = getClassLogger(ModuleDescriptor);
private var _attributes:Object;
- private var _loader:BigBlueButtonModuleLoader;
+ private var _loader:ModuleLoader;
private var _module:IBigBlueButtonModule;
private var _loaded:Boolean = false;
private var _connected:Boolean = false;
@@ -53,7 +53,7 @@ package org.bigbluebutton.main.model.modules
{
unresolvedDependancies = new ArrayCollection();
_attributes = new Object();
- _loader = new BigBlueButtonModuleLoader();
+ _loader = new ModuleLoader();
parseAttributes(attributes);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/options/BrowserVersionsOptions.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/options/BrowserVersionsOptions.as
index b3d1b34acdd9434bc1997d0667c909967fc6d3ad..6b0e78262030c0d11bf5adb3f032b9c80b28e5c1 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/options/BrowserVersionsOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/options/BrowserVersionsOptions.as
@@ -30,9 +30,6 @@ package org.bigbluebutton.main.model.options {
[Bindable]
public var flash:String = "";
- [Bindable]
- public var java:String = "";
-
public function BrowserVersionsOptions() {
name = "browserVersions";
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/options/SkinningOptions.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/options/SkinningOptions.as
index d5c331b2f4eccb37e854184a5b385212d6a43d86..5dd95ddd2c91192301c3cec3c7e1fa1811206547 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/options/SkinningOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/options/SkinningOptions.as
@@ -21,9 +21,6 @@ package org.bigbluebutton.main.model.options {
public class SkinningOptions extends Options {
- [Bindable]
- public var enabled:Boolean = true;
-
[Bindable]
public var url:String = "";
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/model/CaptionOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/model/CaptionOptions.as
index dc332051266c502f1db0864236206685fe34e00f..f6aa186e6da479bbdfca80fc09d13b824660dc79 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/caption/model/CaptionOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/caption/model/CaptionOptions.as
@@ -1,3 +1,21 @@
+/**
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ *
+ * Copyright (c) 2017 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 <http://www.gnu.org/licenses/>.
+ *
+ */
package org.bigbluebutton.modules.caption.model {
import org.bigbluebutton.core.Options;