Author: sebawagner Date: Thu Dec 27 03:50:10 2012 New Revision: 1426115 URL: http://svn.apache.org/viewvc?rev=1426115&view=rev Log: OPENMEETINGS-460 Add some debug information in the UI to check the current sessions in the map stores
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/sessionDetails.lzx 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/src/modules/admin/connections/library.lzx incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/IClientList.java incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/cache/HashMapStore.java incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Thu Dec 27 03:50:10 2012 @@ -4610,9 +4610,6 @@ see http://incubator.apache.org/openmeet <string id="1528" name="room_options"> <value>Auto select interview video pod</value> </string> - <string id="1528" name="room_options"> - <value>Auto select interview video pod</value> - </string> <string id="1529" name="font_underline"> <value>Underline</value> </string> @@ -4628,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>ÐипеÑÑÑÑлка</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</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=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Dec 27 03:50:10 2012 @@ -4625,4 +4625,10 @@ see http://incubator.apache.org/openmeet <string id="1533" name="hyperlink"> <value>Hyperlink</value> </string> + <string id="1534" name="connection admin"> + <value>Show session statistics</value> + </string> + <string id="1535" name="connection admin"> + <value>Session details</value> + </string> </language> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/library.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/library.lzx?rev=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/library.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/library.lzx Thu Dec 27 03:50:10 2012 @@ -20,6 +20,7 @@ --> <library> + <include href="sessionDetails.lzx" /> <include href="roomClient.lzx" /> <include href="roomClientListItem.lzx" /> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx?rev=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx Thu Dec 27 03:50:10 2012 @@ -99,6 +99,16 @@ </turnOverList> <text name="_header" fontstyle="bold" text="Sessionvars" x="790" y="2"/> + + <view resource="messagebox_info_rsc" x="${ canvas.width - 20 }" y="2"> + <handler name="onclick"> + <![CDATA[ + new lz.sessionDetails(parent); + ]]> + </handler> + <labelTooltip labelid="1534" /> + </view> + <view name="_roomvalueform" x="790" y="20" clip="true" height="${ canvas.height - canvas.naviHeight - 20 }" width="${ canvas.width - 790 }"> Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/sessionDetails.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/sessionDetails.lzx?rev=1426115&view=auto ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/sessionDetails.lzx (added) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/sessionDetails.lzx Thu Dec 27 03:50:10 2012 @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<library> + +<!--- Popup view to input a new language name to be added. --> +<class name="sessionDetails" extends="labelExplorerBox" labelid="1535" y="30" + docking="true" resizeable="true" closable="true" width="460" x="$once{ parent.width - 470 }" height="360"> + + <handler name="oninit"> + <![CDATA[ + this.getSessionStatistics.doCall(); + ]]> + </handler> + + <netRemoteCallHib name="getSessionStatistics" funcname="conferenceservice.getSessionStatistics" + remotecontext="$once{ canvas.thishib }" activeErrorHandler="true" + isCallBackHandler="true" > + <netparam><method name="getValue"> return canvas.sessionId;</method></netparam> + <handler name="ondata" args="value"> + //The onResult-Handler will be called be the rtmpconnection + if($debug) Debug.write("getSessionStatistics ",value); + parent.errorView.errorView.setAttribute("text",value); + </handler> + </netRemoteCallHib> + + <view y="24" width="${ parent.width - 4 }" height="${ parent.height - 30 }" x="2" clip="true" name="errorView"> + <text y="30" fontsize="10" fontstyle="bold" name="errorView" + multiline="true" width="${ parent.width - 14 }" selectable="true" /> + <om_vscrollbar /> + </view> + +</class> + +</library> Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java?rev=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java Thu Dec 27 03:50:10 2012 @@ -20,6 +20,7 @@ package org.apache.openmeetings.conferen import java.math.BigInteger; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -377,7 +378,7 @@ public class ClientListHashMapStore impl } } - + public List<SlaveClientDto> getCurrentSlaveSessions() { List<SlaveClientDto> clients = new ArrayList<SlaveClientDto>( cache.size()); @@ -387,15 +388,20 @@ public class ClientListHashMapStore impl return clients; } - /* - * (non-Javadoc) - * @see org.apache.openmeetings.conference.room.IClientList#getActiveRoomsByServer() - */ public Set<Long> getActiveRoomIdsByServer(Server server) { if (cache.getClientsByServerAndRoom(server) == null) { return EMPTY_HASH_SET; } return cache.getClientsByServerAndRoom(server).keySet(); } + + + public String getSessionStatistics() { + return cache.getDebugInformation(Arrays.asList(HashMapStore.DEBUG_DETAILS.SIZE, + HashMapStore.DEBUG_DETAILS.CLIENT_BY_STREAMID, + HashMapStore.DEBUG_DETAILS.CLIENT_BY_PUBLICSID, + HashMapStore.DEBUG_DETAILS.CLIENT_BY_USERID, + HashMapStore.DEBUG_DETAILS.CLIENT_BY_ROOMID)); + } } Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/IClientList.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/IClientList.java?rev=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/IClientList.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/IClientList.java Thu Dec 27 03:50:10 2012 @@ -195,4 +195,11 @@ public interface IClientList { */ public abstract Set<Long> getActiveRoomIdsByServer(Server server); + /** + * Get some statistics about the current sessions + * + * @return + */ + public abstract String getSessionStatistics(); + } \ No newline at end of file Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/cache/HashMapStore.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/cache/HashMapStore.java?rev=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/cache/HashMapStore.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/cache/HashMapStore.java Thu Dec 27 03:50:10 2012 @@ -468,68 +468,133 @@ public class HashMapStore { return t; } + + /** + * Print some session statistics to the debug out + * + * @param detailLevel + */ public void printDebugInformation(List<DEBUG_DETAILS> detailLevel) { - + + log.debug("Session Statistics Start ################## "); + log.debug(getDebugInformation(detailLevel)); + log.debug("Session Statistics End ################## "); + + } + + /** + * Get some session statistics + * + * @param detailLevel + * @return + */ + public String getDebugInformation(List<DEBUG_DETAILS> detailLevel) { + + StringBuilder statistics = new StringBuilder(); + if (detailLevel.contains(DEBUG_DETAILS.SIZE)) { - log.debug("Number of sessions Total " + getTotalNumberOfSessions()); - log.debug(" clientsByServer SIZE {} ",clientsByServer.size()); - log.debug(" clientsByServerAndPublicSID SIZE {} ",clientsByServerAndPublicSID.size()); - log.debug(" clientsByServerAndUserId SIZE {} ",clientsByServerAndUserId.size()); - log.debug(" clientsByRoomId SIZE {} ",clientsByServerAndRoomId.size()); + addNewLine(statistics, "Number of sessions Total " + + getTotalNumberOfSessions()); + addNewLine(statistics, + " clientsByServer SIZE " + clientsByServer.size()); + addNewLine(statistics, " clientsByServerAndPublicSID SIZE " + + clientsByServerAndPublicSID.size()); + addNewLine(statistics, " clientsByServerAndUserId SIZE " + + clientsByServerAndUserId.size()); + addNewLine(statistics, " clientsByRoomId SIZE " + + clientsByServerAndRoomId.size()); } - + if (detailLevel.contains(DEBUG_DETAILS.CLIENT_BY_STREAMID)) { - - for (Entry<Long, LinkedHashMap<String, RoomClient>> entry : clientsByServer.entrySet()) { - log.debug("clientsByServer Server {} Number of Clients: {} ",entry.getKey(),entry.getValue().size()); + + for (Entry<Long, LinkedHashMap<String, RoomClient>> entry : clientsByServer + .entrySet()) { + addNewLine(statistics, + "clientsByServer Server " + entry.getKey() + + " Number of Clients: " + + entry.getValue().size()); } - + } - + if (detailLevel.contains(DEBUG_DETAILS.CLIENT_BY_PUBLICSID)) { - for (Entry<Long, LinkedHashMap<String, List<RoomClient>>> entry : clientsByServerAndPublicSID.entrySet()) { - log.debug("clientsByServerAndPublicSID Server {} Number of PublicSIDs: {} ",entry.getKey(),entry.getValue().size()); - + for (Entry<Long, LinkedHashMap<String, List<RoomClient>>> entry : clientsByServerAndPublicSID + .entrySet()) { + addNewLine(statistics, "clientsByServerAndPublicSID Server " + + entry.getKey() + " Number of PublicSIDs: " + + entry.getValue().size()); + if (detailLevel.contains(DEBUG_DETAILS.PUBLICSID_LIST_ALL)) { - for (Entry<String, List<RoomClient>> innerEntry : entry.getValue().entrySet()) { - log.debug("clientsByServerAndPublicSID publicSID {} Number of clients {} ",innerEntry.getKey(),innerEntry.getValue().size()); + for (Entry<String, List<RoomClient>> innerEntry : entry + .getValue().entrySet()) { + addNewLine(statistics, + "clientsByServerAndPublicSID publicSID " + + innerEntry.getKey() + + " Number of clients " + + innerEntry.getValue().size()); } } } } - + if (detailLevel.contains(DEBUG_DETAILS.CLIENT_BY_USERID)) { - for (Entry<Long, LinkedHashMap<Long, List<RoomClient>>> entry : clientsByServerAndUserId.entrySet()) { - log.debug("clientsByServerAndUserId Server {} Number of UserIds: {} ",entry.getKey(),entry.getValue().size()); - + for (Entry<Long, LinkedHashMap<Long, List<RoomClient>>> entry : clientsByServerAndUserId + .entrySet()) { + addNewLine(statistics, "clientsByServerAndUserId Server " + + entry.getKey() + " Number of UserIds: " + + entry.getValue().size()); + if (detailLevel.contains(DEBUG_DETAILS.USERID_LIST_ALL)) { - for (Entry<Long, List<RoomClient>> innerEntry : entry.getValue().entrySet()) { - log.debug("clientsByServerAndUserId userId {} Number of clients {} ",innerEntry.getKey(),innerEntry.getValue().size()); + for (Entry<Long, List<RoomClient>> innerEntry : entry + .getValue().entrySet()) { + addNewLine( + statistics, + "clientsByServerAndUserId userId " + + innerEntry.getKey() + + " Number of clients " + + innerEntry.getValue().size()); } } } } - + if (detailLevel.contains(DEBUG_DETAILS.CLIENT_BY_ROOMID)) { - - for (Entry<Long, LinkedHashMap<Long, LinkedHashMap<String, RoomClient>>> serverEntry : clientsByServerAndRoomId.entrySet()) { - - LinkedHashMap<Long, LinkedHashMap<String, RoomClient>> clientsByRoomId = serverEntry.getValue(); - log.debug("clientsByRoomId ServerId {} Number of Rooms: {} roomIds "+serverEntry.getValue().keySet()+" ",serverEntry.getKey(),serverEntry.getValue().size()); - - for (Entry<Long, LinkedHashMap<String, RoomClient>> entry : clientsByRoomId.entrySet()) { - log.debug("clientsByRoomId RoomId {} Number of Clients: {} ",entry.getKey(),entry.getValue().size()); - + + for (Entry<Long, LinkedHashMap<Long, LinkedHashMap<String, RoomClient>>> serverEntry : clientsByServerAndRoomId + .entrySet()) { + + LinkedHashMap<Long, LinkedHashMap<String, RoomClient>> clientsByRoomId = serverEntry + .getValue(); + addNewLine(statistics, "clientsByRoomId ServerId " + + serverEntry.getKey() + " Number of Rooms: " + + serverEntry.getValue().size() + " roomIds " + + serverEntry.getValue().keySet()); + + for (Entry<Long, LinkedHashMap<String, RoomClient>> entry : clientsByRoomId + .entrySet()) { + addNewLine(statistics, + "clientsByRoomId RoomId " + entry.getKey() + + " Number of Clients: " + + entry.getValue().size()); + if (detailLevel.contains(DEBUG_DETAILS.ROOMID_LIST_ALL)) { - for (Entry<String, RoomClient> innerEntry : entry.getValue().entrySet()) { - log.debug("clientsByRoomId streamId {} client {} ",innerEntry.getKey(),innerEntry.getValue()); + for (Entry<String, RoomClient> innerEntry : entry + .getValue().entrySet()) { + addNewLine(statistics, "clientsByRoomId streamId " + + innerEntry.getKey() + " client " + + innerEntry.getValue()); } } } - + } } - + + return statistics.toString(); + } + + private void addNewLine(StringBuilder strBuilder, String message) { + strBuilder.append(message + "\n\r"); } } Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java Thu Dec 27 03:50:10 2012 @@ -737,6 +737,25 @@ public class ConferenceService { } return null; } + + /** + * Get some statistics about the current sessions handled by this instance + * + * @param SID + * @return + */ + public String getSessionStatistics(String SID) { + try { + Long users_id = sessionManagement.checkSession(SID); + Long user_level = userManagement.getUserLevelByID(users_id); + if (authLevelManagement.checkAdminLevel(user_level)) { + return this.clientListManager.getSessionStatistics(); + } + } catch (Exception err) { + log.error("[getRoomClientsMap]", err); + } + return null; + } public List<Rooms> getRoomsWithCurrentUsersByList(String SID, int start, int max, String orderby, boolean asc) { Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java?rev=1426115&r1=1426114&r2=1426115&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java Thu Dec 27 03:50:10 2012 @@ -71,7 +71,7 @@ public class FillLabels { * other label-id's will be only filled up if missing at the end of the * language file */ - private final long[] replaceIds = { 1518L }; + private final long[] replaceIds = { }; // 1518L private Map<Long, Fieldlanguagesvalues> masterLabels;