You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/01/21 11:28:26 UTC

svn commit: r1234298 - in /incubator/openmeetings/trunk/singlewebapp: WebContent/languages/ WebContent/openmeetings/ WebContent/src/base/ WebContent/src/modules/admin/roomadmin/ WebContent/src/modules/conference/conference/ WebContent/src/modules/confe...

Author: sebawagner
Date: Sat Jan 21 10:28:24 2012
New Revision: 1234298

URL: http://svn.apache.org/viewvc?rev=1234298&view=rev
Log:
OPENMEETINGS-4 Microphone rooms rework patch so that showMicrophoneStatus, remove room types and attribute "microphones", add new attribute to Backup import/export, fix UI to use new attribute

Modified:
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
    incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Sat Jan 21 10:28:24 2012
@@ -4330,4 +4330,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Sat Jan 21 10:28:24 2012
@@ -4328,4 +4328,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Sat Jan 21 10:28:24 2012
@@ -4335,4 +4335,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Sat Jan 21 10:28:24 2012
@@ -4328,4 +4328,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Sat Jan 21 10:28:24 2012
@@ -4325,4 +4325,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Sat Jan 21 10:28:24 2012
@@ -4328,4 +4328,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Sat Jan 21 10:28:24 2012
@@ -4402,4 +4402,7 @@ transmitowania głosu i obrazu wideo.<
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Sat Jan 21 10:28:24 2012
@@ -4335,4 +4335,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Sat Jan 21 10:28:24 2012
@@ -4337,4 +4337,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Sat Jan 21 10:28:24 2012
@@ -4328,4 +4328,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Sat Jan 21 10:28:24 2012
@@ -4329,4 +4329,7 @@ see http://code.google.com/p/openmeeting
   <string id="1441" name="hide_whiteboard">
     <value>Hide whiteboard</value>
   </string>
+  <string id="1442" name="show microphone status">
+    <value>Show micro status in video</value>
+  </string>
 </language>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml Sat Jan 21 10:28:24 2012
@@ -319,16 +319,6 @@ of the red5-servlet
 <interviewRoomModule>interviewConferenceRoom</interviewRoomModule>
 
 <!-- #############################################
-    Restricted Microphones Room
- -->
-<restrictedMicrophonesRoomModule>restrictedMicrophonesRoom</restrictedMicrophonesRoomModule>
-
-<!-- #############################################
-    Conference Microphones Room
- -->
-<conferenceMicrophonesRoomModule>conferenceMicrophonesRoom</conferenceMicrophonesRoomModule>
-
-<!-- #############################################
     Event Room Modules
  -->
 

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd Sat Jan 21 10:28:24 2012
@@ -51,8 +51,6 @@
         <xs:element ref="eventRoomModule"/>
         <xs:element ref="restrictedRoomModule"/>
         <xs:element ref="interviewRoomModule"/>
-        <xs:element ref="restrictedMicrophonesRoomModule"/>
-        <xs:element ref="conferenceMicrophonesRoomModule"/>
         <xs:element ref="recordModule"/>
         <xs:element ref="userSettingsModule"/>
       </xs:sequence>
@@ -122,8 +120,6 @@
   <xs:element name="eventRoomModule" type="xs:NCName"/>
   <xs:element name="restrictedRoomModule" type="xs:NCName"/>
   <xs:element name="interviewRoomModule" type="xs:NCName"/>
-  <xs:element name="restrictedMicrophonesRoomModule" type="xs:NCName"/>
-  <xs:element name="conferenceMicrophonesRoomModule" type="xs:NCName"/>
   <xs:element name="recordModule" type="xs:NCName"/>
   <xs:element name="userSettingsModule" type="xs:NCName"/>
 </xs:schema>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx Sat Jan 21 10:28:24 2012
@@ -91,16 +91,6 @@ these properties can be overwritten by c
 <attribute name="interviewRoomModule" value="interviewConferenceRoom" type="string" />
 
 <!-- #############################################
-    Restricted Microphones Room
- -->
-<attribute name="restrictedMicrophonesRoomModule" value="restrictedMicrophonesRoom" type="string" />
-
-<!-- #############################################
-    Conference Microphones Room
- -->
-<attribute name="conferenceMicrophonesRoomModule" value="conferenceMicrophonesRoom" type="string" />
-
-<!-- #############################################
     Event Room Modules
  -->
 

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx Sat Jan 21 10:28:24 2012
@@ -46,7 +46,8 @@
         this.hideFilesExplorer.setValue(false);
         this.hideActionsMenu.setValue(false);
         this.hideScreenSharing.setValue(false);
-        this.hideWhiteboard.setValue(false);        
+        this.hideWhiteboard.setValue(false); 
+        this.showMicrophoneStatus.setValue(false);
 	</handler>
 	
     <handler name="ondelete" >
@@ -198,6 +199,12 @@
                 this.hideWhiteboard.setValue(false);
             }
             
+            if (obj.showMicrophoneStatus != null && obj.showMicrophoneStatus){
+                this.showMicrophoneStatus.setValue(true);
+            } else {
+                this.showMicrophoneStatus.setValue(false);
+            }
+            
             this._listRoomModerators.getRoomModeratorsByRoomId.doCall();
         ]]>
     </method>
@@ -294,7 +301,9 @@
             
             this.sendObject["hideScreenSharing"] = parent.hideScreenSharing.getValue();
             
-            this.sendObject["hideWhiteboard"] = parent.hideWhiteboard.getValue();            
+            this.sendObject["hideWhiteboard"] = parent.hideWhiteboard.getValue();      
+            
+            this.sendObject["showMicrophoneStatus"] = parent.showMicrophoneStatus.getValue(); 
             
             var ownerId = parent.ownerId.getText();
             if (ownerId == "") ownerId = 0;
@@ -480,62 +489,65 @@
     <labelText labelid="880" x="24" y="630"  fontstyle="italic"
                multiline="true" width="370" /> 
                
-    <labelText labelid="1076" width="200" y="660" resize="false" x="2"/>  
-        <labelCheckbox name="isAudioOnly" width="270" y="660" x="130" fontsize="11" />  
+    <labelText labelid="1076" width="200" y="680" resize="false" x="2"/>  
+        <labelCheckbox name="isAudioOnly" width="270" y="680" x="130" fontsize="11" />  
         
     <!-- allowUserQuestions Description -->          
-    <view resource="messagebox_info_rsc" x="0" y="680" />
+    <view resource="messagebox_info_rsc" x="0" y="700" />
     
-    <labelText labelid="1077" x="24" y="680"  fontstyle="italic"
+    <labelText labelid="1077" x="24" y="700"  fontstyle="italic"
                multiline="true" width="370" /> 
                 
                 
                
     <!-- Room termination settings -->
-    <labelText labelid="1101" width="200" y="730" fontstyle="bold"
+    <labelText labelid="1101" width="200" y="750" fontstyle="bold"
                resize="false" x="2"/>            
                                    
     <!-- isClosed -->          
-    <labelText labelid="1099" width="200" y="760" resize="false" x="2"/>  
-        <labelCheckbox name="isClosed" width="270" y="760" x="130" fontsize="11" />
+    <labelText labelid="1099" width="200" y="780" resize="false" x="2"/>  
+        <labelCheckbox name="isClosed" width="270" y="780" x="130" fontsize="11" />
         
     <!-- 1100:Exit URL -->
-    <labelText labelid="1100" width="200" y="790" resize="false" x="2"/>
-        <customEdittext name="redirectURL" y="790" x="120" width="270" text="" />    
+    <labelText labelid="1100" width="200" y="810" resize="false" x="2"/>
+        <customEdittext name="redirectURL" y="810" x="120" width="270" text="" />    
       
     <!-- termination Description -->          
-    <view resource="messagebox_info_rsc" x="0" y="820" />
+    <view resource="messagebox_info_rsc" x="0" y="840" />
     
-    <labelText labelid="1102" x="24" y="820"  fontstyle="italic"
+    <labelText labelid="1102" x="24" y="840"  fontstyle="italic"
                multiline="true" width="370" /> 
                 
     <!-- isClosed -->          
-    <labelText labelid="1355" width="200" y="860" resize="false" x="2"/>  
-        <labelCheckbox name="waitForRecording" width="270" y="860" x="130" fontsize="11" />
+    <labelText labelid="1355" width="200" y="880" resize="false" x="2"/>  
+        <labelCheckbox name="waitForRecording" width="270" y="880" x="180" fontsize="11" />
  
-    <labelText labelid="1356" width="200" y="880" resize="false" x="2" visibility="hidden" />  
-        <labelCheckbox name="allowRecording" width="270" y="880" x="130" fontsize="11" visibility="hidden" />
+    <labelText labelid="1356" width="200" y="900" resize="false" x="2" visibility="hidden" />  
+        <labelCheckbox name="allowRecording" width="270" y="900" x="180" fontsize="11" visibility="hidden" />
  
-    <labelText labelid="1357" width="200" y="900" resize="false" x="2" />  
-        <labelCheckbox name="hideTopBar" width="270" y="900" x="130" fontsize="11" />
+    <labelText labelid="1357" width="200" y="920" resize="false" x="2" />  
+        <labelCheckbox name="hideTopBar" width="270" y="920" x="180" fontsize="11" />
         
-    <labelText labelid="1436" width="200" y="920" resize="false" x="2" />  
-        <labelCheckbox name="hideChat" width="270" y="920" x="130" fontsize="11" />
+    <labelText labelid="1436" width="200" y="940" resize="false" x="2" />  
+        <labelCheckbox name="hideChat" width="270" y="940" x="180" fontsize="11" />
         
-    <labelText labelid="1437" width="200" y="940" resize="false" x="2" />  
-        <labelCheckbox name="hideActivitiesAndActions" width="270" y="940" x="130" fontsize="11" />
+    <labelText labelid="1437" width="200" y="960" resize="false" x="2" />  
+        <labelCheckbox name="hideActivitiesAndActions" width="270" y="960" x="180" fontsize="11" />
         
-    <labelText labelid="1438" width="200" y="960" resize="false" x="2" />  
-        <labelCheckbox name="hideFilesExplorer" width="270" y="960" x="130" fontsize="11" />
+    <labelText labelid="1438" width="200" y="980" resize="false" x="2" />  
+        <labelCheckbox name="hideFilesExplorer" width="270" y="980" x="180" fontsize="11" />
     
-    <labelText labelid="1439" width="200" y="980" resize="false" x="2" />  
-        <labelCheckbox name="hideActionsMenu" width="270" y="980" x="130" fontsize="11" />
+    <labelText labelid="1439" width="200" y="1000" resize="false" x="2" />  
+        <labelCheckbox name="hideActionsMenu" width="270" y="1000" x="180" fontsize="11" />
  	
- 	<labelText labelid="1440" width="200" y="1000" resize="false" x="2" />  
-        <labelCheckbox name="hideScreenSharing" width="270" y="1000" x="130" fontsize="11" />
+ 	<labelText labelid="1440" width="200" y="1020" resize="false" x="2" />  
+        <labelCheckbox name="hideScreenSharing" width="270" y="1020" x="180" fontsize="11" />
         
-    <labelText labelid="1441" width="200" y="1020" resize="false" x="2" />  
-        <labelCheckbox name="hideWhiteboard" width="270" y="1020" x="130" fontsize="11" />
+    <labelText labelid="1441" width="200" y="1040" resize="false" x="2" />  
+        <labelCheckbox name="hideWhiteboard" width="270" y="1040" x="180" fontsize="11" />
+     
+    <labelText labelid="1442" width="200" y="1060" resize="false" x="2" />  
+        <labelCheckbox name="showMicrophoneStatus" width="270" y="1060" x="180" fontsize="11" />
                                   
     <!-- RoomClient List Right Side -->
     <labelText labelid="587" width="300" y="40" resize="false" 
@@ -703,7 +715,7 @@
     <labelText labelid="1308" x="400" y="722" width="270" />                 
         <customEdittext name="ownerId" x="520" y="722" width="180" />      
                 
-    <view x="400" y="1000" />    
+    <view x="400" y="1400" />    
     
 </class>
 

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx Sat Jan 21 10:28:24 2012
@@ -133,10 +133,6 @@
                 this.roomClassName = canvas.interviewRoomModule;
             } else if (this.roomType == 5) {
                 this.roomClassName = canvas.customRoomModule;
-            } else if (this.roomType == 6) {
-                this.roomClassName = canvas.restrictedMicrophonesRoomModule;
-            } else if (this.roomType == 7) {
-                this.roomClassName = canvas.conferenceMicrophonesRoomModule;
             } else {
 				if ($debug) Debug.warn("Not known RoomType: ",this.roomType);
 			}

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx Sat Jan 21 10:28:24 2012
@@ -94,9 +94,8 @@
             }
             this._giveExclusiveAudioView.bringToFront();
 
-            var roomType = canvas.currentRoomObject.roomtype;
-            this.isMicrophonesRoom = ('true' == roomType.microphones);
-            if (isMicrophonesRoom) {
+            this.isMicrophonesRoom = canvas.currentRoomObject.showMicrophoneStatus;
+            if (canvas.currentRoomObject.showMicrophoneStatus) {
                 this._innertop.setAttribute("bgcolor", "0xFF6600");
                 this._innerbottom.setAttribute("bgcolor", "0xFF6600");
             } else {

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx Sat Jan 21 10:28:24 2012
@@ -29,9 +29,8 @@
      -->
     <method name="setDefaultVideoSize" args="w,h">
         this.setAttribute("width",w+this.videoInsetX);
-        var roomType = canvas.currentRoomObject.roomtype;
-        this.isMicrophonesRoom = ('true' == roomType.microphones);
-        if (isMicrophonesRoom) {
+        this.isMicrophonesRoom = canvas.currentRoomObject.showMicrophoneStatus;
+        if (canvas.currentRoomObject.showMicrophoneStatus) {
         	this.setAttribute("bottomBarHeight",this._innertop.height + 1);
         }
         this.setAttribute("height",h+this.videoInsetY+this.bottomBarHeight);

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx Sat Jan 21 10:28:24 2012
@@ -32,9 +32,7 @@
     <method name="setDefaultVideoSize" args="w,h">
         this.setAttribute("width",w+this.videoInsetX);
         
-        var roomType = canvas.currentRoomObject.roomtype;
-        this.isMicrophonesRoom = ('true' == roomType.microphones);
-        if (isMicrophonesRoom) {
+        if (canvas.currentRoomObject.showMicrophoneStatus) {
         	this.setAttribute("bottomBarHeight",this._innertop.height + 1);
         }
         

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java Sat Jan 21 10:28:24 2012
@@ -153,8 +153,15 @@ public class AppointmentLogic {
 				"", // sipNumber
 				"", // conferencePIN
 				null, // ownerID
-				null, null, false, false //
-, false, false, false, false, false
+				null, null, 
+				false, // hideTopBar
+				false, // hideChat
+				false, // hideActivitiesAndActions
+				false, // hideFilesExplorer
+				false, // hideActionsMenu
+				false, // hideScreenSharing 
+				false, // hideWhiteboard
+				false //showMicrophoneStatus
 				);
 
 		log.debug("Appointmentlogic.saveAppointment : Room - " + room_id);

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java Sat Jan 21 10:28:24 2012
@@ -67,13 +67,12 @@ public class Roommanagement {
 	 * @param name
 	 * @return ID of new created roomtype or null
 	 */
-	public Long addRoomType(String name, Boolean microphones) {
+	public Long addRoomType(String name) {
 		try {
 			RoomTypes rtype = new RoomTypes();
 			rtype.setName(name);
 			rtype.setStarttime(new Date());
 			rtype.setDeleted("false");
-            rtype.setMicrophones(microphones.toString());
 			rtype = em.merge(rtype);
 			long returnId = rtype.getRoomtypes_id();
 			return returnId;
@@ -723,7 +722,8 @@ public class Roommanagement {
 			String redirectURL, String sipNumber, String conferencePin,
 			Long ownerId, Boolean waitForRecording, Boolean allowRecording,
 			Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer, 
-			Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard) {
+			Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
+			Boolean showMicrophoneStatus) {
 
 		try {
 			if (authLevelManagement.checkAdminLevel(user_level)) {
@@ -764,6 +764,7 @@ public class Roommanagement {
 				r.setHideFilesExplorer(hideFilesExplorer);
 				r.setHideScreenSharing(hideScreenSharing);	
 				r.setHideWhiteboard(hideWhiteboard);
+				r.setShowMicrophoneStatus(showMicrophoneStatus);
 				
 				// handle SIP Issues
 				OpenXGReturnObject openXGReturnObject = openXGHttpClient
@@ -1292,7 +1293,8 @@ public class Roommanagement {
 			String redirectURL, String sipNumber, String conferencePin,
 			Long ownerId, Boolean waitForRecording, Boolean allowRecording,
 			Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, 
-			Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard) {
+			Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
+			Boolean showMicrophoneStatus) {
 		try {
 
 			log.debug("*** updateRoom numberOfPartizipants: "
@@ -1305,7 +1307,8 @@ public class Roommanagement {
 						roomModerators, allowUserQuestions, isAudioOnly,
 						isClosed, redirectURL, sipNumber, conferencePin,
 						ownerId, waitForRecording, allowRecording, hideTopBar, hideChat, 
-						hideActivitiesAndActions, hideFilesExplorer, hideActionsMenu, hideScreenSharing, hideWhiteboard);
+						hideActivitiesAndActions, hideFilesExplorer, hideActionsMenu, 
+						hideScreenSharing, hideWhiteboard, showMicrophoneStatus);
 
 			}
 
@@ -1324,7 +1327,8 @@ public class Roommanagement {
 			String redirectURL, String sipNumber, String conferencePin,
 			Long ownerId, Boolean waitForRecording, Boolean allowRecording,
 			Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer, 
-			Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard) {
+			Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard, 
+			Boolean showMicrophoneStatus) {
 		try {
 			log.debug("*** updateRoom numberOfPartizipants: "
 					+ numberOfPartizipants);
@@ -1363,6 +1367,7 @@ public class Roommanagement {
 			r.setHideFilesExplorer(hideFilesExplorer);
 			r.setHideScreenSharing(hideScreenSharing);
 			r.setHideWhiteboard(hideWhiteboard);
+			r.setShowMicrophoneStatus(showMicrophoneStatus);
 
 			if (r.getRooms_id() == null) {
 				em.persist(r);
@@ -1703,7 +1708,7 @@ public class Roommanagement {
 			} else {
 				log.debug("Could not find room " + ownerId + " || "
 						+ roomtypesId);
-
+				
 				Long rooms_id = this.addRoom(3L, roomName, roomtypesId,
 						"My Rooms of ownerId " + ownerId,
 						(roomtypesId == 1) ? 25L : 150L, // numberOfPartizipants
@@ -1720,7 +1725,16 @@ public class Roommanagement {
 						"", // redirectURL
 						"", // sipNumber
 						"", // conferencePin
-						ownerId, null, null, false, false, false, false, false, false, false);
+						ownerId, null, null, 
+						false, // hideTopBar
+						false, // hideChat
+						false, // hideActivitiesAndActions
+						false, // hideFilesExplorer
+						false, // hideActionsMenu
+						false, // hideScreenSharing 
+						false, // hideWhiteboard
+						false //showMicrophoneStatus
+						);
 
 				if (rooms_id != null) {
 					return this.getRoomById(rooms_id);

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java Sat Jan 21 10:28:24 2012
@@ -496,71 +496,154 @@ public class ImportInitvalues {
 	
 	public void loadDefaultRooms(boolean createRooms) {
 
-		long conference_Id = roommanagement.addRoomType("conference", false);
+		long conference_Id = roommanagement.addRoomType("conference (1-25 users)");
 		log.debug("conference_Id: " + conference_Id);
-		long audience_Id = roommanagement.addRoomType("audience", false);
+		long audience_Id = roommanagement.addRoomType("audience (1-50 users)");
 		log.debug("audience_Id: " + audience_Id);
 
-		long restricted_Id = roommanagement.addRoomType("restricted", false);
+		long restricted_Id = roommanagement.addRoomType("restricted  (1-150 users)");
 		log.debug("restricted_Id: " + restricted_Id);
 
-		long interview_Id = roommanagement.addRoomType("interview", false);
+		long interview_Id = roommanagement.addRoomType("interview  (1:1 meeting with recording)");
 		log.debug("interview_Id: " + interview_Id);
 
-		long custom_Id = roommanagement.addRoomType("custom", false);
+		long custom_Id = roommanagement.addRoomType("custom (extension point for your plugin)");
 		log.debug("custom_Id: " + custom_Id);
 
-        long restr_micro_Id = roommanagement.addRoomType("restricted microphones", true);
-		log.debug("restr_micro_Id: " + restr_micro_Id);
-
-        long conf_micro_Id = roommanagement.addRoomType("conference microphones", true);
-		log.debug("conf_micro_Id: " + conf_micro_Id);
-		
 		if (createRooms) {
 			roommanagement.addRoom(3, "public Interview Room", interview_Id, "",
 					new Long(16), true, null, false, false, null, false, null,
-					true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
+					true, false, false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 	
 			roommanagement.addRoom(3, "public Conference Room", conference_Id, "",
 					new Long(32), true, null, false, false, null, false, null,
-					true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
+					true, false, false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 	
 			roommanagement.addRoom(3, "public Video Only Room", conference_Id, "",
 					new Long(32), true, null, false, false, null, false, null,
-					true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
+					true, false, false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 	
 			roommanagement.addRoom(3, "public Video And Whiteboard Room",
 					conference_Id, "", new Long(32), true, null, false, false,
 					null, false, null, true, false, false, "", "", "", null, null,
-					null, false, false, false, false, false, false, false);
+					null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 	
 			roommanagement.addRoom(3, "public Restricted Room", restricted_Id, "",
 					new Long(100), true, null, false, false, null, false, null,
-					true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
+					true, false, false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 
-            roommanagement.addRoom(3, "restricted Microphones Room", restr_micro_Id, "",
+            roommanagement.addRoom(3, "restricted room with micro option set", restricted_Id, "",
 					new Long(100), true, null, false, false, null, false, null,
-					true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
+					true, false, false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					true //showMicrophoneStatus
+					);
 
-            roommanagement.addRoom(3, "conference Microphones Room", conf_micro_Id, "",
+            roommanagement.addRoom(3, "conference room with micro option set", conference_Id, "",
 					new Long(32), true, null, false, false, null, false, null,
-					true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
+					true, false, false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					true //showMicrophoneStatus
+					);
 	
 			long room2 = roommanagement.addRoom(3, "private Conference Room",
 					conference_Id, "", new Long(32), false, null, false, false,
 					null, false, null, true, false, false, "", "", "", null, null,
-					null, false, false, false, false, false, false, false);
+					null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 	
 			roommanagement.addRoomToOrganisation(3, room2, 1);
 	
 			roommanagement.addRoom(3, "public Audience Room", audience_Id, "",
 					new Long(32), true, null, false, false, null, false, null,
-					true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
+					true, false, false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 	
 			long room4 = roommanagement.addRoom(3, "private Audience Room",
 					audience_Id, "", new Long(32), false, null, false, false, null,
-					false, null, true, false, false, "", "", "", null, null, null,
-					false, false, false, false, false, false, false);
+					false, null, true, false, false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 	
 			roommanagement.addRoomToOrganisation(3, room4, 1);
 		}

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java Sat Jan 21 10:28:24 2012
@@ -28,8 +28,6 @@ public class RoomTypes implements Serial
 	private String name;
 	@Column(name = "deleted")
 	private String deleted;
-    @Column(name = "microphones")
-	private String microphones;
 
     
 	public String getName() {
@@ -67,11 +65,4 @@ public class RoomTypes implements Serial
 		this.deleted = deleted;
 	}
 
-    public String getMicrophones() {
-        return microphones;
-    }
-
-    public void setMicrophones(String microphones) {
-        this.microphones = microphones;
-    }
 }

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java Sat Jan 21 10:28:24 2012
@@ -57,15 +57,6 @@ public class Rooms implements Serializab
 	@Column(name = "externalRoomType")
 	private String externalRoomType;
 	
-	@Column(name = "is_microphone_exclusive")
-	private Boolean isMicrophoneExclusive;
-	
-	/**
-	 * Layout of Room
-	 */
-	@Transient
-	private List<RoomClient> currentusers;
-	
 	@Column(name = "isdemoroom")
 	private Boolean isDemoRoom;
 	@Column(name = "demo_time")
@@ -97,7 +88,10 @@ public class Rooms implements Serializab
 	private Boolean waitForRecording; //Show warning that user has to start recording
 	@Column(name = "allow_recording")
 	private Boolean allowRecording; //Show or show not the recording option in a conference room
-    
+	
+	/**
+	 * Layout of Room
+	 */
 	@Column(name = "hide_top_bar")
 	private Boolean hideTopBar = false;
 	
@@ -118,6 +112,15 @@ public class Rooms implements Serializab
 	
 	@Column(name = "hide_whiteboard")
 	private Boolean hideWhiteboard = false;
+	
+	@Column(name = "show_microphone_status")
+	private Boolean showMicrophoneStatus = false;
+	
+	/*
+	 * Non persistent attributes 
+	 */
+	@Transient
+	private List<RoomClient> currentusers;
     
 	
 	public String getComment() {
@@ -345,6 +348,11 @@ public class Rooms implements Serializab
 		this.hideWhiteboard = hideWhiteboard;
 	}
 	
-	
+	public Boolean getShowMicrophoneStatus() {
+		return showMicrophoneStatus;
+	}
+	public void setShowMicrophoneStatus(Boolean showMicrophoneStatus) {
+		this.showMicrophoneStatus = showMicrophoneStatus;
+	}
     
 }

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java Sat Jan 21 10:28:24 2012
@@ -624,7 +624,8 @@ public class ConferenceService {
 								Boolean.valueOf(argObjectMap.get("hideFilesExplorer").toString()),
 								Boolean.valueOf(argObjectMap.get("hideActionsMenu").toString()),
 								Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString()),
-								Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString())
+								Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString()),
+								Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString())
 						);
 			} else if (rooms_id > 0) {
 				return roommanagement
@@ -673,7 +674,8 @@ public class ConferenceService {
 								Boolean.valueOf(argObjectMap.get("hideFilesExplorer").toString()),
 								Boolean.valueOf(argObjectMap.get("hideActionsMenu").toString()),
 								Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString()),
-								Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString())
+								Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString()),
+								Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString())
 								);
 												
 			}

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java Sat Jan 21 10:28:24 2012
@@ -955,7 +955,16 @@ public class UserService {
 							"", // sipNumber
 							"", // conferencePIN
 							null, // ownerId
-							null, null, false, false, false, false, false, false, false);
+							null, null, 
+							false, // hideTopBar
+							false, // hideChat
+							false, // hideActivitiesAndActions
+							false, // hideFilesExplorer
+							false, // hideActionsMenu
+							false, // hideScreenSharing 
+							false, // hideWhiteboard
+							false //showMicrophoneStatus
+							);
 
 					room = roommanagement.getRoomById(room_id);
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Sat Jan 21 10:28:24 2012
@@ -1441,8 +1441,7 @@ public class ScopeApplicationAdapter ext
 					currentClient);
 
             Rooms room = roommanagement.getRoomById(room_id);
-            RoomTypes type = room.getRoomtype();
-            if (type.getMicrophones().equals( "true" )) {
+            if (room.getShowMicrophoneStatus()) {
             	currentClient.setCanGiveAudio(true);
             }
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java Sat Jan 21 10:28:24 2012
@@ -923,6 +923,13 @@ public class BackupExport {
 				r.setIspublic(false);
 				room.addElement("ispublic").addCDATA("" + r.getIspublic());
 			}
+			
+			if (r.getShowMicrophoneStatus() != null) {
+				room.addElement("showMicrophoneStatus").addCDATA("" + r.getShowMicrophoneStatus());
+			} else {
+				r.setShowMicrophoneStatus(false);
+				room.addElement("showMicrophoneStatus").addCDATA("" + r.getShowMicrophoneStatus());
+			}
 
 			room.addElement("isClosed").addCDATA("" + r.getIsClosed());
 			room.addElement("redirectURL").addCDATA("" + r.getRedirectURL());

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java Sat Jan 21 10:28:24 2012
@@ -1915,6 +1915,8 @@ public class BackupImport {
 								"sipNumber").getText());
 						String conferencePin = unformatString(roomObject
 								.element("conferencePin").getText());
+						Boolean showMicrophoneStatus = importBooleanType(unformatString(roomObject
+								.element("showMicrophoneStatus").getText()));
 
 						Long ownerId = null;
 						if (roomObject.element("ownerid") != null) {
@@ -1985,6 +1987,7 @@ public class BackupImport {
 						room.setWaitForRecording(waitForRecording);
 						room.setHideTopBar(hideTopBar);
 						room.setAllowRecording(allowRecording);
+						room.setShowMicrophoneStatus(showMicrophoneStatus);
 
 						Long roomId = room.getRooms_id();
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java Sat Jan 21 10:28:24 2012
@@ -271,8 +271,16 @@ public class MethodGateway extends HttpS
 					Long returnVal = getRoommanagement().addRoom(user_level,
 							name, roomtypes_id, comment, numberOfPartizipants,
 							ispublic, null, false, false, null, false, null,
-							true, false, false, "", "", "", null, null, null,
-							false, false, false, false, false, false, false);
+							true, false, false, "", "", "", null, null, null, 
+							false, // hideTopBar
+							false, // hideChat
+							false, // hideActivitiesAndActions
+							false, // hideFilesExplorer
+							false, // hideActionsMenu
+							false, // hideScreenSharing 
+							false, // hideWhiteboard
+							false //showMicrophoneStatus
+							);
 
 					XStream xStream = new XStream(new XppDriver());
 					xStream.setMode(XStream.NO_REFERENCES);

Modified: incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java?rev=1234298&r1=1234297&r2=1234298&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java Sat Jan 21 10:28:24 2012
@@ -672,7 +672,16 @@ public class RoomWebService {
 			return roommanagement.addRoom(user_level, name, roomtypes_id,
 					comment, numberOfPartizipants, ispublic, null, false,
 					false, null, false, null, true, false, false, "", "", "",
-					null, null, null, false, false, false, false, false, false, false);
+					null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 		} catch (Exception err) {
 			log.error("[addRoom] ", err);
 		}
@@ -718,7 +727,16 @@ public class RoomWebService {
 			return roommanagement.addRoom(user_level, name, roomtypes_id,
 					comment, numberOfPartizipants, ispublic, null, appointment,
 					isDemoRoom, demoTime, isModeratedRoom, null, true, false,
-					false, "", "", "", null, null, null, false, false, false, false, false, false, false);
+					false, "", "", "", null, null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 		} catch (Exception err) {
 			log.error("[addRoomWithModeration] ", err);
 		}
@@ -771,7 +789,16 @@ public class RoomWebService {
 					comment, numberOfPartizipants, ispublic, null, appointment,
 					isDemoRoom, demoTime, isModeratedRoom, null,
 					allowUserQuestions, false, false, "", "", "", null, null,
-					null, false, false, false, false, false, false, false);
+					null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 		} catch (Exception err) {
 			log.error("[addRoomWithModerationAndQuestions] ", err);
 		}
@@ -826,7 +853,16 @@ public class RoomWebService {
 					comment, numberOfPartizipants, ispublic, null, appointment,
 					isDemoRoom, demoTime, isModeratedRoom, null,
 					allowUserQuestions, isAudioOnly, false, "", "", "", null,
-					null, null, false, false, false, false, false, false, false);
+					null, null, 
+					false, // hideTopBar
+					false, // hideChat
+					false, // hideActivitiesAndActions
+					false, // hideFilesExplorer
+					false, // hideActionsMenu
+					false, // hideScreenSharing 
+					false, // hideWhiteboard
+					false //showMicrophoneStatus
+					);
 		} catch (Exception err) {
 			log.error("[addRoomWithModerationQuestionsAndAudioType] ", err);
 			throw new AxisFault(err.getMessage());
@@ -900,7 +936,7 @@ public class RoomWebService {
 					isDemoRoom, demoTime, isModeratedRoom, null,
 					allowUserQuestions, isAudioOnly, false, "", "", "", null,
 					null, null, hideTopBar, hideChat, hideActivitiesAndActions, hideFilesExplorer, 
-					hideActionsMenu, hideScreenSharing, hideWhiteboard);
+					hideActionsMenu, hideScreenSharing, hideWhiteboard, false);
 		} catch (Exception err) {
 			log.error("[addRoomWithModerationQuestionsAudioTypeAndHideOptions] ", err);
 			throw new AxisFault(err.getMessage());
@@ -1023,7 +1059,16 @@ public class RoomWebService {
 						roomtypes_id, name, ispublic, comment,
 						numberOfPartizipants, null, appointment, false, null,
 						false, null, true, false, false, "", "", "", null,
-						null, null, false, false, false, false, false, false, false);
+						null, null, 
+						false, // hideTopBar
+						false, // hideChat
+						false, // hideActivitiesAndActions
+						false, // hideFilesExplorer
+						false, // hideActionsMenu
+						false, // hideScreenSharing 
+						false, // hideWhiteboard
+						false //showMicrophoneStatus
+						);
 			}
 		} catch (Exception err) {
 			log.error("[addRoom] ", err);
@@ -1073,8 +1118,16 @@ public class RoomWebService {
 				return roommanagement.updateRoomInternal(room_id, roomtypes_id,
 						name, ispublic, comment, numberOfPartizipants, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
-						null, true, false, false, "", "", "", null, null, null,
-						false, false, false, false, false, false, false);
+						null, true, false, false, "", "", "", null, null, null, 
+						false, // hideTopBar
+						false, // hideChat
+						false, // hideActivitiesAndActions
+						false, // hideFilesExplorer
+						false, // hideActionsMenu
+						false, // hideScreenSharing 
+						false, // hideWhiteboard
+						false //showMicrophoneStatus
+						);
 			}
 		} catch (Exception err) {
 			log.error("[updateRoomWithModeration] ", err);
@@ -1128,7 +1181,16 @@ public class RoomWebService {
 						name, ispublic, comment, numberOfPartizipants, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
 						null, allowUserQuestions, false, false, "", "", "",
-						null, null, null, false, false, false, false, false, false, false);
+						null, null, null, 
+						false, // hideTopBar
+						false, // hideChat
+						false, // hideActivitiesAndActions
+						false, // hideFilesExplorer
+						false, // hideActionsMenu
+						false, // hideScreenSharing 
+						false, // hideWhiteboard
+						false //showMicrophoneStatus
+						);
 			}
 		} catch (Exception err) {
 			log.error("[updateRoomWithModerationAndQuestions] ", err);
@@ -1206,7 +1268,9 @@ public class RoomWebService {
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
 						null, allowUserQuestions, false, false, "", "", "",
 						null, null, null, hideTopBar, hideChat, hideActivitiesAndActions, hideFilesExplorer, 
-						hideActionsMenu, hideScreenSharing, hideWhiteboard);
+						hideActionsMenu, hideScreenSharing, hideWhiteboard, 
+						false // showMicrophoneStatus
+						);
 			}
 		} catch (Exception err) {
 			log.error("[updateRoomWithModerationAndQuestions] ", err);