[openmeetings-dev] [openmeetings] r4671 committed - Fixing icon in exclusive audio

Sun, 04 Dec 2011 04:08:57 -0800 

Revision: 4671
Author:   seba.wagner
Date:     Sun Dec  4 04:08:17 2011
Log:      Fixing icon in exclusive audio
http://code.google.com/p/openmeetings/source/detail?r=4671

Added:
/trunk/singlewebapp/WebContent/src/modules/conference/participents/resources/microphone2.png 
Modified:
 /trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/participents/library.lzx /trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx /trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx 
 /trunk/singlewebapp/src/META-INF/persistence.xml

=======================================
--- /dev/null
+++ /trunk/singlewebapp/WebContent/src/modules/conference/participents/resources/microphone2.png Sun Dec 4 04:08:17 2011 
@@ -0,0 +1,15 @@
+‰PNG
+ + +IHDR óÿa tIME Ø " Ú×&\ pHYs ÒÝ~ü gAMA ± üa ^IDATxÚ RßkRa ~ çx27µ2Ó³‰®¬¦î˜2B*çqT H° 
+º /",袛Œº®  ‹ÑÍ°n‚Vfte  !   +¶¶l+¥ ’2 ¤iþ8þ: s.b¬¦{რ¾çyÞç}Ÿ ` ¥V«/  
ñN¡PÐR©´* ‰æ„B¡
+{Cz‘möS ˜ \uP ÐétP­V! ‰@  øÝn·íh7²V«   èý[^/’N§!
+ C, ƒV« Éd §iú ÖM€ípS"‘ ‰Äw`mC*•‚\. Ùl †á ” ›@£Ñ0Õj5 ‡Ã€¢(à8 Íf“wÀŠs Á¶ vã‘‹.·{0›ÏC¡P€`0 ìâø·J¥ õz ».þw ”J‹œ® 
+F‰AÌyÅ /žûùΉD‚ïÎŽ år™ ñ  "¹\Õê´Cˆq ß¿W Ñ  05u
+62 ~~N„]&CQÔ,  ¹5ƾ~Ùž·C‡õ–³g&áÍë90”
+pÔf Ùñ“à½q=Ãb–Ù3ÍžW
+as
+ˆlŸâ± +±XÇ& Z¯ÂZt Ò Xük³•Ý¸Ìbü[ 
+ÿu@ Ÿ¾;l0Þ3“&ðùfàËj ¤ 0LPh6ÚÎ K óÛÆu‚¢†'œç ËŸ>3
+Ï5 ß%bFLf†<fYÓ‘¤¦[ÔˆÕj•ÊU ó„j@_.þ  V˦@À³Ù'¡oż«´¾^ì&€i´º‡J‚Ðsóî ÷ 
@ˆw’?’ÓK‹ïïpŸ z Šâ¸¿Õ  (†Á îÐʯliÌ7ó€[ Ó‹Ì—Z£¹- ‹éK.÷Óq‡£ G¤Mõ ß é?«^îd    IEND®B`‚
=======================================
--- /trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx Sat Dec 3 03:41:45 2011 +++ /trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx Sun Dec 4 04:08:17 2011 
@@ -42,8 +42,6 @@
        <!--- @keywords private -->
        <method name="createStream">
                this._ns =  new NetStream(this._findnc());
-               if ($debug) Debug.write("this._ns ",this._ns);
-               if ($debug) Debug.write("this._ns.client ",this._ns.client);
                var t = this;
                this._ns.onStatus = function(info) {
                _root.Debug.write("simpleNetStream onStatus",info);
=======================================
--- /trunk/singlewebapp/WebContent/src/modules/conference/participents/library.lzx Fri Dec 2 03:12:38 2011 +++ /trunk/singlewebapp/WebContent/src/modules/conference/participents/library.lzx Sun Dec 4 04:08:17 2011 
@@ -6,7 +6,7 @@
<resource name="participents_isMod_rsc" src="resources/kdmconfig.png" /> <resource name="participents_allow_drawing_rsc" src="resources/color_line.png" /> <resource name="participents_deny_drawing_rsc" src="resources/color_line_dis.png" /> - <resource name="participents_exclusive_audio_rsc" src="resources/exclusive_audio_permission.png" /> + <resource name="participents_exclusive_audio_rsc" src="resources/microphone2.png" /> 

     <include href="participentList.lzx" />
     <include href="participentListItem.lzx" />
=======================================
--- /trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx Fri Dec 2 05:22:39 2011 +++ /trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx Sun Dec 4 04:08:17 2011 
@@ -32,7 +32,6 @@
     <method name="setDefaultVideoSize" args="w,h">
         this.setAttribute("width",w+this.videoInsetX);
         this.setAttribute("height",h+this.videoInsetY);
- if ($debug) Debug.info("setDefaultVideoSize ",this.width,this.height); 
     </method>

        <view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
=======================================
--- /trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx Sat Dec 3 03:41:45 2011 +++ /trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx Sun Dec 4 04:08:17 2011 
@@ -34,7 +34,6 @@
     <method name="setDefaultVideoSize" args="w,h">
         this.setAttribute("width",w+this.videoInsetX);
         this.setAttribute("height",h+this.videoInsetY);
- if ($debug) Debug.info("setDefaultVideoSize ",this.width,this.height); 
     </method>

        <view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
=======================================
--- /trunk/singlewebapp/src/META-INF/persistence.xml Mon Nov 21 05:20:59 2011 +++ /trunk/singlewebapp/src/META-INF/persistence.xml Sun Dec 4 04:08:17 2011 
@@ -1,82 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- persistence.xml schema -->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; version="2.0"> 
-       <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> 
-               
<class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
-               
<class>org.openmeetings.app.persistence.beans.adresses.States</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
-               
<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
- <class>org.openmeetings.app.persistence.beans.calendar.Appointment</class> - <class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class> - <class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class> - <class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class> 
-               
<class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
- <class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class> - <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class> - <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class> - <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class> - <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class> - <class>org.openmeetings.app.persistence.beans.invitation.Invitations</class> 
-               
<class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
- <class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class> 
-               
<class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
-               
<class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
- <class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class> 
-               
<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
-               
<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
- <class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class> - <class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class> 
-               
<class>org.openmeetings.app.persistence.beans.recording.Recording</class>
- <class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class> - <class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class> - <class>org.openmeetings.app.persistence.beans.recording.RoomClient</class> - <class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class> - <class>org.openmeetings.app.persistence.beans.recording.RoomStream</class> - <class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class> - <class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class> 
-               
<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
-               
<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
- <class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class> - <class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class> - <class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class> - <class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class> 
-               
<class>org.openmeetings.app.persistence.beans.user.Salutations</class>
-               
<class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
-               
<class>org.openmeetings.app.persistence.beans.user.Userdata</class>
-               
<class>org.openmeetings.app.persistence.beans.user.Usergroups</class>
-               
<class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
- <class>org.openmeetings.app.persistence.beans.user.Users_Usergroups</class> 
-               
<class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
-               <class>org.openmeetings.app.persistence.beans.user.Users</class>
- <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class> 
-               <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL"> + <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> + <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class> + <class>org.openmeetings.app.persistence.beans.adresses.States</class> + <class>org.openmeetings.app.persistence.beans.basic.Configuration</class> + <class>org.openmeetings.app.persistence.beans.basic.ErrorType</class> + <class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class> + <class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class> + <class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class> + <class>org.openmeetings.app.persistence.beans.basic.Navimain</class> 
+        <class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
+ <class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class> + <class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class> + <class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class> + <class>org.openmeetings.app.persistence.beans.calendar.Appointment</class> + <class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class> + <class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class> + <class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class> + <class>org.openmeetings.app.persistence.beans.domain.Organisation</class> + <class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class> + <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class> + <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class> + <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class> + <class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class> + <class>org.openmeetings.app.persistence.beans.invitation.Invitations</class> + <class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class> + <class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class> + <class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class> + <class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class> + <class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class> 
+        <class>org.openmeetings.app.persistence.beans.poll.PollType</class>
+        <class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
+ <class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class> + <class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class> + <class>org.openmeetings.app.persistence.beans.recording.Recording</class> + <class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class> + <class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class> + <class>org.openmeetings.app.persistence.beans.recording.RoomClient</class> + <class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class> + <class>org.openmeetings.app.persistence.beans.recording.RoomStream</class> + <class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class> + <class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class> 
+        <class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
+ <class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class> + <class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class> + <class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class> + <class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class> + <class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class> + <class>org.openmeetings.app.persistence.beans.user.Salutations</class> + <class>org.openmeetings.app.persistence.beans.user.UserContacts</class> 
+        <class>org.openmeetings.app.persistence.beans.user.Userdata</class>
+ <class>org.openmeetings.app.persistence.beans.user.Usergroups</class> + <class>org.openmeetings.app.persistence.beans.user.Userlevel</class> + <class>org.openmeetings.app.persistence.beans.user.Users_Usergroups</class> + <class>org.openmeetings.app.persistence.beans.user.UserSipData</class> 
+        <class>org.openmeetings.app.persistence.beans.user.Users</class>
+ <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class> 
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
-            <property name="openjpa.ConnectionProperties"
-                value="DriverClassName=org.apache.derby.jdbc.ClientDriver,
-                                  Url=jdbc:derby:openmeetings;create=true,
-                                  create=true,
-                                  MaxActive=100,
-                                  MaxWait=10000,
-                                  TestOnBorrow=true,
-                                  Username=user,
-                                  Password=secret" />
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" /> - <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" /> - <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" /> - <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource" /> 
-            <property name="openjpa.DataCache" value="true" />
-            <property name="openjpa.QueryCache" value="true" />
- <property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" /> 
-            <property name="openjpa.jdbc.QuerySQLCache" value="false" />
-       </properties>
-       </persistence-unit>
+                <property name="openjpa.ConnectionProperties"
+                    value="DriverClassName=com.mysql.jdbc.Driver
+ , Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000 
+                        , MaxActive=100
+                        , MaxWait=10000
+                        , TestOnBorrow=true
+                        , poolPreparedStatements=true
+                        , Username=root
+                        , Password=admin"/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/> + <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/> + <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" /> + <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource"/> 
+                <property name="openjpa.DataCache" value="true"/>
+                <property name="openjpa.QueryCache" value="true"/>
+ <property name="openjpa.jdbc.DBDictionary" value="batchLimit=100,tableType=myisam"/> + <property name="openjpa.jdbc.QuerySQLCache" value="false"/> 
+        </properties>
+    </persistence-unit>
 </persistence>

--
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.

Reply via email to