Revision: 3165
Author: seba.wagner
Date: Thu Mar 18 09:16:21 2010
Log: Fix loading Restricted and Interview Room via Module Loader
http://code.google.com/p/openmeetings/source/detail?r=3165
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx
/trunk/singlewebapp/WebContent/openmeetings/config.xml
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
/trunk/singlewebapp/server/red5/webapps/openmeetings/config.xml
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx Sun
Feb 7 04:21:38 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx Thu
Mar 18 09:16:21 2010
@@ -77,6 +77,100 @@
<attribute name="defaultWhiteboardWidth" value="2400" type="number" />
<attribute name="defaultWhiteboardHeight" value="1200" type="number" />
+<!-- Module Configuration -->
+<!-- #############################################
+ 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="adminModuleBackup" value="backupContent" type="string" />
+
+
+<!-- #############################################
+ Moderator Modules
+ -->
+
+<attribute name="moderatorModuleUser" value="userModerate" type="string" />
+
+<attribute name="moderatorModuleRoom" value="roomModerate" type="string" />
+
+
+<!-- #############################################
+ Dashboard Modules
+ -->
+
+<attribute name="dashboardModuleStartScreen" value="mainDashboard"
type="string" />
+
+<attribute name="dashboardModuleCalendar" value="lzCalendar" type="string"
/>
+
+
+<!-- Conference Room Modules -->
+
+<attribute name="conferenceModuleRoomList" value="allmeetings"
type="string" />
+
+
+<!-- #############################################
+ Conference Room
+
+ Room Layout's: flexibleConferenceRoom,conferenceView
+ -->
+
+<attribute name="conferenceRoomModule" value="flexibleConferenceRoom"
type="string" />
+
+
+<!-- #############################################
+ Event Room Modules
+ -->
+
+<attribute name="eventModuleRoomList" value="allEvents" type="string" />
+
+
+<!-- #############################################
+ Event Room
+
+ Room Layouts: flexibleEventRoom,audienceView
+ -->
+
+<attribute name="eventRoomModule" value="flexibleEventRoom" type="string"
/>
+
+<!-- #############################################
+ Event Room
+
+ Room Layouts: flexibleRestrictedConferenceRoom,restrictedConferenceRoom
+ -->
+<attribute name="restrictedRoomModule" value="restrictedConferenceRoom"
type="string" />
+
+<!-- #############################################
+ Event Room
+
+ Room Layouts: interviewConferenceRoom
+ -->
+<attribute name="interviewRoomModule" value="interviewConferenceRoom"
type="string" />
+
+
+<!-- #############################################
+ Event Room Modules
+ -->
+
+<attribute name="recordModule" value="lzRecordContent" type="string" />
+
+<!-- #############################################
+ Profiles Panel Modules
+ -->
+
+<attribute name="userSettingsModule" value="userSettings" type="string" />
+
<!-- END OF config.xml attributes
##########################################################
-->
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Tue
Mar 2 08:15:29 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Thu
Mar 18 09:16:21 2010
@@ -105,6 +105,11 @@
this.setAttribute('eventModuleRoomList',canvas.myConfigSet.getPointer().xpathQuery('config/eventModuleRoomList/text()'));
this.setAttribute('eventRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/eventRoomModule/text()'));
+
this.setAttribute('restrictedRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/restrictedRoomModule/text()'));
+
+
this.setAttribute('interviewRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/interviewRoomModule/text()'));
+
+
this.setAttribute('userSettingsModule',canvas.myConfigSet.getPointer().xpathQuery('config/userSettingsModule/text()'));
this.setAttribute('recordModule',canvas.myConfigSet.getPointer().xpathQuery('config/recordModule/text()'));
@@ -388,12 +393,12 @@
} else if (roomTypeId==3){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:"restrictedConferenceRoom",roomObj:roomObj});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:roomObj});
//new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
} else if (roomTypeId==4){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:"interviewConferenceRoom",roomObj:roomObj});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.interviewRoomModule,roomObj:roomObj});
//new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
}
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/config.xml Tue Jan 5
07:43:24 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/config.xml Thu Mar 18
09:16:21 2010
@@ -267,6 +267,19 @@
<eventRoomModule>flexibleEventRoom</eventRoomModule>
+<!-- #############################################
+ Event Room
+
+ Room Layouts: flexibleRestrictedConferenceRoom,restrictedConferenceRoom
+ -->
+<restrictedRoomModule>restrictedConferenceRoom</restrictedRoomModule>
+
+<!-- #############################################
+ Interview Room
+
+ Room Layouts: interviewConferenceRoom
+ -->
+<interviewRoomModule>interviewConferenceRoom</interviewRoomModule>
<!-- #############################################
Event Room Modules
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
Tue Feb 9 09:38:52 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
Thu Mar 18 09:16:21 2010
@@ -98,9 +98,9 @@
} else if (this.roomType == 2) {
this.roomClassName = canvas.eventRoomModule;
} else if (this.roomType == 3) {
- this.roomClassName = "restrictedConferenceRoom";
+ this.roomClassName = canvas.restrictedRoomModule;
} else if (this.roomType == 4) {
- this.roomClassName = "interviewConferenceRoom";
+ this.roomClassName = canvas.interviewRoomModule;
} else {
if ($debug) Debug.warn("Not known RoomType:
",this.roomType);
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
Wed Jan 27 09:17:03 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
Thu Mar 18 09:16:21 2010
@@ -107,7 +107,7 @@
} else if
(canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==3){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:"restrictedConferenceRoom",roomObj:canvas.thishib.currentInvitation.room});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:canvas.thishib.currentInvitation.room});
}
</handler>
</netRemoteCallHib>
=======================================
--- /trunk/singlewebapp/server/red5/webapps/openmeetings/config.xml Wed Jan
13 14:59:50 2010
+++ /trunk/singlewebapp/server/red5/webapps/openmeetings/config.xml Thu Mar
18 09:16:21 2010
@@ -21,7 +21,7 @@
To this port the fallback is done once the default rtmport failed
this should workaround 99% of all firewalls
-->
-<rtmpTunnelport>8088</rtmpTunnelport>
+<rtmpTunnelport>8080</rtmpTunnelport>
<rtmpsslport>443</rtmpsslport>
<!--
@@ -38,7 +38,7 @@
This port is used to connec to the http-servlet
of the red5-servlet
-->
-<red5httpport>5080</red5httpport>
+<red5httpport>8080</red5httpport>
<!--
These colors are the main colors and style the hole application
@@ -93,14 +93,9 @@
If the rtmpt issues is solved sothat several Webapps can use different
RTMPT connection
we might change this value again to its origin / webapp-context
-
- If you run openmeetings as .war version: /
- If you run openmeetings as a native red5-webapp: /$WebAppName/, in
most cases /openmeetings/
-
- be carefull in adding the slashes in the beginning and end
-->
-<httpRootKey>/openmeetings/</httpRootKey>
+<httpRootKey>/</httpRootKey>
<!--
Window-Effect Settings
@@ -272,6 +267,19 @@
<eventRoomModule>flexibleEventRoom</eventRoomModule>
+<!-- #############################################
+ Event Room
+
+ Room Layouts: flexibleRestrictedConferenceRoom,restrictedConferenceRoom
+ -->
+<restrictedRoomModule>restrictedConferenceRoom</restrictedRoomModule>
+
+<!-- #############################################
+ Interview Room
+
+ Room Layouts: interviewConferenceRoom
+ -->
+<interviewRoomModule>interviewConferenceRoom</interviewRoomModule>
<!-- #############################################
Event Room Modules
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
