Author: solomax
Date: Sun Aug 11 03:38:16 2013
New Revision: 1512869
URL: http://svn.apache.org/r1512869
Log:
[OPENMEETINGS-758] admin module config values are removed
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xml
openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xsd
openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/mainMethods.lzx
openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/moduleConfiguration.lzx
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xml?rev=1512869&r1=1512868&r2=1512869&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xml
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xml
Sun Aug 11 03:38:16 2013
@@ -283,27 +283,6 @@ To disable AEC please specify 0.
<!-- Module Configuration -->
<!-- #############################################
- Admin Modules
- -->
-
-<adminModuleUser>userAdmin</adminModuleUser>
-
-<adminModuleRoom>roomAdmin</adminModuleRoom>
-
-<adminModuleOrg>orgAdmin</adminModuleOrg>
-
-<adminModuleLanguages>languagesEditor</adminModuleLanguages>
-
-<adminModuleConnections>roomClient</adminModuleConnections>
-
-<adminModuleConfiguration>confAdmin</adminModuleConfiguration>
-
-<adminModuleBackup>backupContent</adminModuleBackup>
-
-<adminModuleLDAP>ldapAdmin</adminModuleLDAP>
-
-<adminModuleServers>serversAdmin</adminModuleServers>
-<!-- #############################################
Moderator Modules
-->
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xsd?rev=1512869&r1=1512868&r2=1512869&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xsd
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/openmeetings/public/config.xsd
Sun Aug 11 03:38:16 2013
@@ -52,15 +52,6 @@
<xs:element ref="defaultWhiteboardWidth"/>
<xs:element ref="defaultWhiteboardHeight"/>
<xs:element ref="availableCameraResolutions"/>
- <xs:element ref="adminModuleUser"/>
- <xs:element ref="adminModuleRoom"/>
- <xs:element ref="adminModuleOrg"/>
- <xs:element ref="adminModuleLanguages"/>
- <xs:element ref="adminModuleConnections"/>
- <xs:element ref="adminModuleConfiguration"/>
- <xs:element ref="adminModuleBackup"/>
- <xs:element ref="adminModuleLDAP"/>
- <xs:element ref="adminModuleServers"/>
<xs:element ref="moderatorModuleUser"/>
<xs:element ref="moderatorModuleRoom"/>
<xs:element ref="dashboardModuleStartScreen"/>
@@ -173,15 +164,6 @@
<xs:attribute name="width" use="required" type="xs:integer"/>
</xs:complexType>
</xs:element>
- <xs:element name="adminModuleUser" type="xs:NCName"/>
- <xs:element name="adminModuleRoom" type="xs:NCName"/>
- <xs:element name="adminModuleOrg" type="xs:NCName"/>
- <xs:element name="adminModuleLanguages" type="xs:NCName"/>
- <xs:element name="adminModuleConnections" type="xs:NCName"/>
- <xs:element name="adminModuleConfiguration" type="xs:NCName"/>
- <xs:element name="adminModuleBackup" type="xs:NCName"/>
- <xs:element name="adminModuleLDAP" type="xs:NCName"/>
- <xs:element name="adminModuleServers" type="xs:NCName"/>
<xs:element name="moderatorModuleUser" type="xs:NCName"/>
<xs:element name="moderatorModuleRoom" type="xs:NCName"/>
<xs:element name="dashboardModuleStartScreen" type="xs:NCName"/>
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/mainMethods.lzx?rev=1512869&r1=1512868&r2=1512869&view=diff
==============================================================================
--- openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/mainMethods.lzx
Sun Aug 11 03:38:16 2013
@@ -246,15 +246,6 @@
this.setAttribute('defaultWhiteboardHeight',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardHeight/text()')));
-
this.setAttribute('adminModuleUser',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleUser/text()'));
-
this.setAttribute('adminModuleRoom',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleRoom/text()'));
-
this.setAttribute('adminModuleOrg',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleOrg/text()'));
-
this.setAttribute('adminModuleLanguages',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleLanguages/text()'));
-
this.setAttribute('adminModuleConnections',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleConnections/text()'));
-
this.setAttribute('adminModuleConfiguration',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleConfiguration/text()'));
-
this.setAttribute('adminModuleBackup',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleBackup/text()'));
-
this.setAttribute('adminModuleServers',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleServers/text()'));
-
this.setAttribute('moderatorModuleUser',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleUser/text()'));
this.setAttribute('moderatorModuleRoom',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleRoom/text()'));
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/moduleConfiguration.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/moduleConfiguration.lzx?rev=1512869&r1=1512868&r2=1512869&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/moduleConfiguration.lzx
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/src/base/moduleConfiguration.lzx
Sun Aug 11 03:38:16 2013
@@ -26,29 +26,6 @@ these properties can be overwritten by p
<!-- #############################################
- Admin Modules
- -->
-
-<attribute name="adminModuleUser" value="userAdmin" type="string" />
-
-<attribute name="adminModuleRoom" value="roomAdmin" type="string" />
-
-<attribute name="adminModuleOrg" value="orgAdmin" type="string" />
-
-<attribute name="adminModuleLanguages" value="languagesEditor" type="string" />
-
-<attribute name="adminModuleConnections" value="roomClient" type="string" />
-
-<attribute name="adminModuleConfiguration" value="confAdmin" type="string" />
-
-<attribute name="adminModuleLDAP" value="ldapAdmin" type="string" />
-
-<attribute name="adminModuleBackup" value="backupContent" type="string" />
-
-<attribute name="adminModuleServers" value="serversAdmin" type="string" />
-
-
-<!-- #############################################
Moderator Modules
-->
