You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/01/25 08:36:29 UTC
svn commit: r1438374 - in /incubator/openmeetings/trunk/singlewebapp: ./
WebContent/languages/ WebContent/src/modules/admin/roomadmin/
src/org/apache/openmeetings/axis/services/
src/org/apache/openmeetings/data/calendar/management/ src/org/apache/openm...
Author: solomax
Date: Fri Jan 25 07:36:27 2013
New Revision: 1438374
URL: http://svn.apache.org/viewvc?rev=1438374&view=rev
Log:
sipEnabled flag is added to the room, to avoid SIPTransport for the certain rooms.
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/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Fri Jan 25 07:36:27 2013
@@ -4635,6 +4635,9 @@ see http://incubator.apache.org/openmeet
<value>System import</value>
</string>
<string id="1537" name="include_into_backup">
- <value>AAAInclude uploaded files and recordings in backup</value>
+ <value>Include uploaded files and recordings in backup</value>
+ </string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Fri Jan 25 07:36:27 2013
@@ -4539,7 +4539,7 @@ see http://incubator.apache.org/openmeet
<value>СообÑение. ÐолÑзоваÑелÑ:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>ЧÑо Ð±Ñ ÑменÑÑиÑÑ Ð²ÑÐµÐ¼Ñ Ð¸ инÑеÑÐ½ÐµÑ ÑÑаÑÑик Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе воÑполÑзоваÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑокой admin Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸ÑованиÑ/воÑÑÑановлениÑ/обновлениÑ: 1) войдиÑе в ÑÑÑановоÑнÑÑ Ð¿Ð°Ð¿ÐºÑ OM (напÑÐ¸Ð¼ÐµÑ /opt/red5) 2) оÑÑановиÑе OM (./red5-shutdown.sh) 3) вÑполнÑем ./admin.sh -b -file ~/today_om_backup.zip (ÑÐ¾Ð·Ð´Ð°ÐµÑ ÑезеÑвнÑÑ ÐºÐ¾Ð¿Ð¸Ñ OM) 4) загÑÑзиÑе новÑй диÑÑÑибÑÑив OM 5) m
v /opt/red5 /opt.red5.bak (пеÑемеÑаем ÑабоÑÑÑ Ð²ÐµÑÑÐ¸Ñ OM :)) 6) ÑаÑпаковÑваем диÑÑÑибÑÑив OM в Ð¿Ð°Ð¿ÐºÑ /opt/red5 7) запÑÑкаем ./admin.sh -i -file ~/today_om_backup.zip (или './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' в ÑлÑÑае когда база даннÑÑ
оÑлиÑаеÑÑÑ Ð¾Ñ Ð±Ð°Ð·Ñ Ð¿Ð¾ ÑмолÑÐ°Ð½Ð¸Ñ ) 8) запÑÑкаем OM</value>
+ <value>ЧÑо Ð±Ñ ÑменÑÑиÑÑ Ð²ÑÐµÐ¼Ñ Ð¸ инÑеÑÐ½ÐµÑ ÑÑаÑÑик Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе воÑполÑзоваÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑокой admin Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸ÑованиÑ/воÑÑÑановлениÑ/обновлениÑ: 1) войдиÑе в ÑÑÑановоÑнÑÑ Ð¿Ð°Ð¿ÐºÑ OM (напÑÐ¸Ð¼ÐµÑ /opt/red5) 2) оÑÑановиÑе OM (./red5-shutdown.sh) 3) вÑполнÑем ./admin.sh -b -file ~/today_om_backup.zip (ÑÐ¾Ð·Ð´Ð°ÐµÑ ÑезеÑвнÑÑ ÐºÐ¾Ð¿Ð¸Ñ OM) 4) загÑÑзиÑе новÑй диÑÑÑибÑÑив OM 5) mv
/opt/red5 /opt.red5.bak (пеÑемеÑаем ÑабоÑÑÑ Ð²ÐµÑÑÐ¸Ñ OM :)) 6) ÑаÑпаковÑваем диÑÑÑибÑÑив OM в Ð¿Ð°Ð¿ÐºÑ /opt/red5 7) запÑÑкаем ./admin.sh -i -file ~/today_om_backup.zip (или './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' в ÑлÑÑае когда база даннÑÑ
оÑлиÑаеÑÑÑ Ð¾Ñ Ð±Ð°Ð·Ñ Ð¿Ð¾ ÑмолÑÐ°Ð½Ð¸Ñ ) 8) запÑÑкаем OM</value>
</string>
<string id="1506" name="public_room_tooltip">
<value>ÐбÑие комнаÑÑ Ð´Ð»Ñ Ð²ÑеÑ
полÑзоваÑелей</value>
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>ÐклÑÑаÑÑ Ð·Ð°Ð³ÑÑженнÑе ÑÐ°Ð¹Ð»Ñ Ð¸ запиÑи в бÑкап</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</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=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Fri Jan 25 07:36:27 2013
@@ -4637,4 +4637,7 @@ see http://incubator.apache.org/openmeet
<string id="1537" name="include_into_backup">
<value>Include uploaded files and recordings in backup</value>
</string>
+ <string id="1538" name="room_admin_sip">
+ <value>Enable SIP transport in the room</value>
+ </string>
</language>
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=1438374&r1=1438373&r2=1438374&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 Fri Jan 25 07:36:27 2013
@@ -72,6 +72,7 @@
this.chatOpened.setValue(false);
this.filesOpened.setValue(false);
this.autoVideoSelect.setValue(false);
+ this.sipEnabled.setValue(false);
</handler>
<handler name="ondelete" >
@@ -238,6 +239,8 @@
this.showMicrophoneStatus.setValue(false);
}
this.chatModerated.setValue(obj.chatModerated != null && obj.chatModerated);
+ this.sipEnabled.setValue(obj.sipEnabled != null && obj.sipEnabled);
+
this._listRoomModerators.getRoomModeratorsByRoomId.doCall();
]]>
@@ -343,6 +346,7 @@
this.sendObject["chatOpened"] = parent.chatOpened.getValue();
this.sendObject["filesOpened"] = parent.filesOpened.getValue();
this.sendObject["autoVideoSelect"] = parent.autoVideoSelect.getValue();
+ this.sendObject["sipEnabled"] = parent.sipEnabled.getValue();
var ownerId = parent.ownerId.getText();
if (ownerId == "") ownerId = 0;
@@ -487,7 +491,7 @@
<!-- Is Demo Room -->
<labelText labelid="636" width="200" y="520" resize="false" x="2"/>
- <labelCheckbox name="isDemoRoom" width="270" y="520" x="130" fontsize="11">
+ <labelCheckbox name="isDemoRoom" width="250" y="520" x="270" fontsize="11">
<handler name="onvalue" args="v">
if (!parent.isinited) {
return;
@@ -512,7 +516,7 @@
<!-- allowUserQuestions -->
<labelText labelid="879" width="200" y="610" resize="false" x="2"/>
- <labelCheckbox name="allowUserQuestions" width="270" y="610" x="130" fontsize="11" />
+ <labelCheckbox name="allowUserQuestions" width="250" y="610" x="270" fontsize="11" />
<!-- allowUserQuestions Description -->
<view resource="messagebox_info_rsc" x="0" y="630" />
@@ -521,7 +525,7 @@
multiline="true" width="370" />
<labelText labelid="1076" width="200" y="680" resize="false" x="2"/>
- <labelCheckbox name="isAudioOnly" width="270" y="680" x="130" fontsize="11" />
+ <labelCheckbox name="isAudioOnly" width="250" y="680" x="270" fontsize="11" />
<!-- allowUserQuestions Description -->
<view resource="messagebox_info_rsc" x="0" y="700" />
@@ -530,7 +534,7 @@
multiline="true" width="370" />
<labelText labelid="1531" x="2" resize="false" width="250" y="760" />
- <labelCheckbox name="allowFontStyles" width="250" y="760" x="250" />
+ <labelCheckbox name="allowFontStyles" width="250" y="760" x="270" />
<!-- Room termination settings -->
<labelText labelid="1101" width="200" y="780" fontstyle="bold"
@@ -538,7 +542,7 @@
<!-- isClosed -->
<labelText labelid="1099" width="200" y="810" resize="false" x="2"/>
- <labelCheckbox name="isClosed" width="270" y="810" x="130" fontsize="11" />
+ <labelCheckbox name="isClosed" width="250" y="810" x="270" fontsize="11" />
<!-- 1100:Exit URL -->
<labelText labelid="1100" width="200" y="840" resize="false" x="2"/>
@@ -552,10 +556,10 @@
<!-- isClosed -->
<labelText labelid="1355" width="200" y="910" resize="false" x="2"/>
- <labelCheckbox name="waitForRecording" width="270" y="910" x="180" fontsize="11" />
+ <labelCheckbox name="waitForRecording" width="250" y="910" x="270" fontsize="11" />
<labelText labelid="1356" width="200" y="930" resize="false" x="2" visibility="hidden" />
- <labelCheckbox name="allowRecording" width="270" y="930" x="180" fontsize="11" visibility="hidden" />
+ <labelCheckbox name="allowRecording" width="250" y="930" x="270" fontsize="11" visibility="hidden" />
<!-- Room Layout options -->
@@ -569,34 +573,34 @@
<labelCheckbox name="hideChat" width="270" y="1010" x="270" fontsize="11" />
<labelText labelid="1437" width="250" y="1030" resize="false" x="2" />
- <labelCheckbox name="hideActivitiesAndActions" width="250" y="1030" x="250" fontsize="11" />
+ <labelCheckbox name="hideActivitiesAndActions" width="250" y="1030" x="270" fontsize="11" />
<labelText labelid="1438" width="250" y="1050" resize="false" x="2" />
- <labelCheckbox name="hideFilesExplorer" width="250" y="1050" x="250" fontsize="11" />
+ <labelCheckbox name="hideFilesExplorer" width="250" y="1050" x="270" fontsize="11" />
<labelText labelid="1439" width="250" y="1070" resize="false" x="2" />
- <labelCheckbox name="hideActionsMenu" width="250" y="1070" x="250" fontsize="11" />
+ <labelCheckbox name="hideActionsMenu" width="250" y="1070" x="270" fontsize="11" />
<labelText labelid="1440" width="250" y="1090" resize="false" x="2" />
- <labelCheckbox name="hideScreenSharing" width="250" y="1090" x="250" fontsize="11" />
+ <labelCheckbox name="hideScreenSharing" width="250" y="1090" x="270" fontsize="11" />
<labelText labelid="1441" width="250" y="1110" resize="false" x="2" />
- <labelCheckbox name="hideWhiteboard" width="250" y="1110" x="250" fontsize="11" />
+ <labelCheckbox name="hideWhiteboard" width="250" y="1110" x="270" fontsize="11" />
<labelText labelid="1442" width="250" y="1130" resize="false" x="2" />
- <labelCheckbox name="showMicrophoneStatus" width="250" y="1130" x="250" fontsize="11" />
+ <labelCheckbox name="showMicrophoneStatus" width="250" y="1130" x="270" fontsize="11" />
<labelText labelid="1513" width="250" y="1150" resize="false" x="2" />
- <labelCheckbox name="chatModerated" width="250" y="1150" x="250" fontsize="11" />
+ <labelCheckbox name="chatModerated" width="250" y="1150" x="270" fontsize="11" />
<labelText labelid="1515" width="250" y="1170" resize="false" x="2" />
- <labelCheckbox name="chatOpened" width="250" y="1170" x="250" fontsize="11" />
+ <labelCheckbox name="chatOpened" width="250" y="1170" x="270" fontsize="11" />
<labelText labelid="1516" width="250" y="1190" resize="false" x="2" />
- <labelCheckbox name="filesOpened" width="250" y="1190" x="250" fontsize="11" />
+ <labelCheckbox name="filesOpened" width="250" y="1190" x="270" fontsize="11" />
<labelText labelid="1528" width="250" y="1210" resize="false" x="2" />
- <labelCheckbox name="autoVideoSelect" width="250" y="1210" x="250" fontsize="11" />
+ <labelCheckbox name="autoVideoSelect" width="250" y="1210" x="270" fontsize="11" />
<!-- RoomClient List Right Side -->
<labelText labelid="587" width="300" y="40" resize="false"
@@ -763,9 +767,12 @@
<labelText labelid="1004" x="400" y="692" width="270" />
<customEdittext name="conferencePin" x="520" y="692" width="180" />
- <labelText labelid="1308" x="400" y="722" width="270" />
- <customEdittext name="ownerId" x="520" y="722" width="180" />
-
+ <labelText labelid="1308" x="400" y="722" width="270" />
+ <customEdittext name="ownerId" x="520" y="722" width="180" />
+
+ <labelText labelid="1538" x="400" y="744" width="250" />
+ <labelCheckbox name="sipEnabled" width="180" y="744" x="520" fontsize="11" />
+
<view x="400" y="1400" />
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Fri Jan 25 07:36:27 2013
@@ -762,6 +762,7 @@
</fileset>
<fileset dir="${red5.root}" includes="*.jar" />
<fileset dir="${red5.root}/lib" includes="*.jar" />
+ <fileset dir="${red5.root}/plugins" includes="*.jar" />
<pathelement path="${om.dist.webapp}/WEB-INF" />
<pathelement path="${om.dist.webapp}/WEB-INF/classes" />
<pathelement path="${main.out.dir}" />
@@ -772,6 +773,7 @@
<echo message="${myclsp}" /-->
<junit maxmemory="1024m" printsummary="yes" dir="${junit.base.dir}" tempdir="${junit.base.dir}" fork="yes" forkmode="perBatch">
<classpath refid="junit.classpath" />
+ <jvmarg value="-Dom.home=${om.home}" />
<jvmarg value="-Dred5.root=${red5.root}" />
<jvmarg value="-Dbasedir=${basedir}" />
<jvmarg value="-Dred5.config_root=${red5.root}/conf" />
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java Fri Jan 25 07:36:27 2013
@@ -708,7 +708,8 @@ public class RoomWebService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
} catch (Exception err) {
@@ -770,7 +771,8 @@ public class RoomWebService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
} catch (Exception err) {
@@ -839,7 +841,8 @@ public class RoomWebService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
} catch (Exception err) {
@@ -910,7 +913,8 @@ public class RoomWebService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
return -1L;
@@ -996,7 +1000,8 @@ public class RoomWebService {
false, false,
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
return -1L;
@@ -1139,7 +1144,8 @@ public class RoomWebService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
} catch (Exception err) {
@@ -1204,7 +1210,8 @@ public class RoomWebService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
} catch (Exception err) {
@@ -1272,7 +1279,8 @@ public class RoomWebService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
} catch (Exception err) {
@@ -1359,7 +1367,8 @@ public class RoomWebService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
}
} catch (Exception err) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Fri Jan 25 07:36:27 2013
@@ -192,7 +192,8 @@ public class AppointmentLogic {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
log.debug("Appointmentlogic.saveAppointment : Room - " + room_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java Fri Jan 25 07:36:27 2013
@@ -669,7 +669,7 @@ public class Roommanagement {
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened
- , boolean filesOpened, boolean autoVideoSelect) {
+ , boolean filesOpened, boolean autoVideoSelect, boolean sipEnabled) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
@@ -714,7 +714,8 @@ public class Roommanagement {
r.setChatOpened(chatOpened);
r.setFilesOpened(filesOpened);
r.setAutoVideoSelect(autoVideoSelect);
-
+ r.setSipEnabled(sipEnabled);
+
/*****************************************************************************************************/
r = em.merge(r);
@@ -1248,7 +1249,7 @@ public class Roommanagement {
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions,
Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened, boolean filesOpened
- , boolean autoVideoSelect) {
+ , boolean autoVideoSelect, boolean sipEnabled) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
@@ -1263,7 +1264,7 @@ public class Roommanagement {
ownerId, waitForRecording, allowRecording, hideTopBar, hideChat,
hideActivitiesAndActions, hideFilesExplorer, hideActionsMenu,
hideScreenSharing, hideWhiteboard, showMicrophoneStatus, chatModerated
- , chatOpened, filesOpened, autoVideoSelect);
+ , chatOpened, filesOpened, autoVideoSelect, sipEnabled);
}
@@ -1284,7 +1285,7 @@ public class Roommanagement {
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened, boolean filesOpened
- , boolean autoVideoSelect) {
+ , boolean autoVideoSelect, boolean sipEnabled) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
+ numberOfPartizipants);
@@ -1335,6 +1336,7 @@ public class Roommanagement {
r.setChatOpened(chatOpened);
r.setFilesOpened(filesOpened);
r.setAutoVideoSelect(autoVideoSelect);
+ r.setSipEnabled(sipEnabled);
if (r.getRooms_id() == null) {
em.persist(r);
@@ -1661,7 +1663,8 @@ public class Roommanagement {
false, // chatModerated
false, //chatOpened
false, //filesOpened
- false //autoVideoSelect
+ false, //autoVideoSelect
+ false //sipEnabled
);
if (rooms_id != null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java?rev=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java Fri Jan 25 07:36:27 2013
@@ -74,6 +74,12 @@ public class RoomDao implements IDataPro
.getResultList();
}
+ public List<Long> getSipRooms(List<Long> ids) {
+ TypedQuery<Long> q = em.createNamedQuery("getSipRoomIdsByIds", Long.class);
+ q.setParameter("ids", ids);
+ return q.getResultList();
+ }
+
public List<Rooms> getOrganisationRooms(long orgId) {
TypedQuery<Rooms> q = em.createQuery(
"SELECT DISTINCT c.room FROM Rooms_Organisation c LEFT JOIN FETCH c.room "
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Fri Jan 25 07:36:27 2013
@@ -527,7 +527,8 @@ public class ImportInitvalues {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
roommanagement.addRoom(3, "public Conference Room", conference_Id,
@@ -544,7 +545,8 @@ public class ImportInitvalues {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
roommanagement.addRoom(3, "public Video Only Room", conference_Id,
@@ -561,7 +563,8 @@ public class ImportInitvalues {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
roommanagement.addRoom(3, "public Video And Whiteboard Room",
@@ -578,7 +581,8 @@ public class ImportInitvalues {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
roommanagement.addRoom(3, "public Restricted Room", restricted_Id,
@@ -595,7 +599,8 @@ public class ImportInitvalues {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
roommanagement.addRoom(3, "restricted room with micro option set",
@@ -612,7 +617,8 @@ public class ImportInitvalues {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
roommanagement.addRoom(3, "conference room with micro option set",
@@ -629,7 +635,8 @@ public class ImportInitvalues {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
long room2 = roommanagement.addRoom(3, "private Conference Room",
@@ -646,7 +653,8 @@ public class ImportInitvalues {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
roommanagement.addRoomToOrganisation(3, room2, 1);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Fri Jan 25 07:36:27 2013
@@ -53,6 +53,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Rooms r WHERE r.deleted = false"),
@NamedQuery(name = "getPublicRoomsOrdered", query = "SELECT r from Rooms r WHERE r.ispublic= true AND r.deleted= false AND r.appointment = false ORDER BY r.name ASC"),
@NamedQuery(name = "getRoomById", query = "SELECT r FROM Rooms r WHERE r.deleted = false AND r.rooms_id = :id"),
+ @NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.rooms_id FROM Rooms r WHERE r.deleted = false AND r.sipEnabled = true AND r.rooms_id IN :ids"),
@NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Rooms r WHERE r.deleted = false"),
@NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Rooms r LEFT JOIN FETCH r.moderators WHERE r.deleted = false ")
})
@@ -219,6 +220,10 @@ public class Rooms implements Serializab
@Element(name = "meetme", required = false)
private MeetMe meetme;
+ @Column(name = "sip_enabled")
+ @Element(data = true, required = false)
+ private boolean sipEnabled;
+
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "rooms_id", insertable = true, updatable = true)
@ElementDependent
@@ -540,4 +545,12 @@ public class Rooms implements Serializab
this.meetme = meetme;
}
+ public boolean isSipEnabled() {
+ return sipEnabled;
+ }
+
+ public void setSipEnabled(boolean sipEnabled) {
+ this.sipEnabled = sipEnabled;
+ }
+
}
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=1438374&r1=1438373&r2=1438374&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 Fri Jan 25 07:36:27 2013
@@ -538,106 +538,79 @@ public class ConferenceService {
long roomId = -1;
if (rooms_id == 0) {
roomId = roommanagement.addRoom(
- User_level,
- argObjectMap.get("name").toString(),
- Long.valueOf(
- argObjectMap.get("roomtypes_id").toString())
- .longValue(),
- argObjectMap.get("comment").toString(),
- Long.valueOf(
- argObjectMap.get("numberOfPartizipants")
- .toString()).longValue(), Boolean
- .valueOf(argObjectMap.get("ispublic")
- .toString()), organisations, Boolean
- .valueOf(argObjectMap.get("appointment")
- .toString()), Boolean
- .valueOf(argObjectMap.get("isDemoRoom")
- .toString()), demoTime, Boolean
- .valueOf(argObjectMap.get("isModeratedRoom")
- .toString()), roomModerators, Boolean
- .valueOf(argObjectMap.get("allowUserQuestions")
- .toString()), Boolean
- .valueOf(argObjectMap.get("isAudioOnly")
- .toString()), Boolean
- .valueOf(argObjectMap.get("allowFontStyles")
- .toString()), Boolean
- .valueOf(argObjectMap.get("isClosed")
- .toString()),
- argObjectMap.get("redirectURL").toString(), argObjectMap
- .get("conferencePin").toString(),
- Long.valueOf(argObjectMap.get("ownerId").toString())
- .longValue(), Boolean.valueOf(argObjectMap.get(
- "waitForRecording").toString()), Boolean
- .valueOf(argObjectMap.get("allowRecording")
- .toString()), Boolean
- .valueOf(argObjectMap.get("hideTopBar")
- .toString()),
- Boolean.valueOf(argObjectMap.get("hideChat").toString()),
- Boolean.valueOf(argObjectMap.get("hideActivitiesAndActions").toString()),
- 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("showMicrophoneStatus").toString()),
- Boolean.valueOf(argObjectMap.get("chatModerated").toString()),
- Boolean.valueOf(argObjectMap.get("chatOpened").toString()),
- Boolean.valueOf(argObjectMap.get("filesOpened").toString()),
- Boolean.valueOf(argObjectMap.get("autoVideoSelect").toString())
+ User_level
+ , argObjectMap.get("name").toString()
+ , Long.valueOf(argObjectMap.get("roomtypes_id").toString()).longValue()
+ , argObjectMap.get("comment").toString()
+ , Long.valueOf(argObjectMap.get("numberOfPartizipants").toString()).longValue()
+ , Boolean.valueOf(argObjectMap.get("ispublic").toString())
+ , organisations
+ , Boolean.valueOf(argObjectMap.get("appointment").toString())
+ , Boolean.valueOf(argObjectMap.get("isDemoRoom").toString())
+ , demoTime
+ , Boolean.valueOf(argObjectMap.get("isModeratedRoom").toString())
+ , roomModerators
+ , Boolean.valueOf(argObjectMap.get("allowUserQuestions").toString())
+ , Boolean.valueOf(argObjectMap.get("isAudioOnly").toString())
+ , Boolean.valueOf(argObjectMap.get("allowFontStyles").toString())
+ , Boolean.valueOf(argObjectMap.get("isClosed").toString())
+ , argObjectMap.get("redirectURL").toString()
+ , argObjectMap.get("conferencePin").toString()
+ , Long.valueOf(argObjectMap.get("ownerId").toString()).longValue()
+ , Boolean.valueOf(argObjectMap.get("waitForRecording").toString())
+ , Boolean.valueOf(argObjectMap.get("allowRecording").toString())
+ , Boolean.valueOf(argObjectMap.get("hideTopBar").toString())
+ , Boolean.valueOf(argObjectMap.get("hideChat").toString())
+ , Boolean.valueOf(argObjectMap.get("hideActivitiesAndActions").toString())
+ , 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("showMicrophoneStatus").toString())
+ , Boolean.valueOf(argObjectMap.get("chatModerated").toString())
+ , Boolean.valueOf(argObjectMap.get("chatOpened").toString())
+ , Boolean.valueOf(argObjectMap.get("filesOpened").toString())
+ , Boolean.valueOf(argObjectMap.get("autoVideoSelect").toString())
+ , Boolean.valueOf(argObjectMap.get("sipEnabled").toString())
);
} else if (rooms_id > 0) {
roomId = roommanagement.updateRoom(
- User_level,
- rooms_id,
- Long.valueOf(
- argObjectMap.get("roomtypes_id")
- .toString()).longValue(),
- argObjectMap.get("name").toString(),
- Boolean.valueOf(argObjectMap.get("ispublic")
- .toString()),
- argObjectMap.get("comment").toString(),
- Long.valueOf(
- argObjectMap
- .get("numberOfPartizipants")
- .toString()).longValue(),
- organisations,
- Boolean.valueOf(argObjectMap.get("appointment")
- .toString()),
- Boolean.valueOf(argObjectMap.get("isDemoRoom")
- .toString()),
- demoTime,
- Boolean.valueOf(argObjectMap.get(
- "isModeratedRoom").toString()),
- roomModerators,
- Boolean.valueOf(argObjectMap.get(
- "allowUserQuestions").toString()),
- Boolean.valueOf(argObjectMap.get("isAudioOnly")
- .toString()),
- Boolean.valueOf(argObjectMap.get("allowFontStyles")
- .toString()),
- Boolean.valueOf(argObjectMap.get("isClosed")
- .toString()),
- argObjectMap.get("redirectURL").toString(),
- argObjectMap.get("conferencePin").toString(),
- Long.valueOf(
- argObjectMap.get("ownerId").toString())
- .longValue(),
- Boolean.valueOf(argObjectMap.get(
- "waitForRecording").toString()),
- Boolean.valueOf(argObjectMap.get(
- "allowRecording").toString()),
- Boolean.valueOf(argObjectMap.get("hideTopBar").toString()),
- Boolean.valueOf(argObjectMap.get("hideChat").toString()),
- Boolean.valueOf(argObjectMap.get("hideActivitiesAndActions").toString()),
- 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("showMicrophoneStatus").toString()),
- Boolean.valueOf(argObjectMap.get("chatModerated").toString()),
- Boolean.valueOf(argObjectMap.get("chatOpened").toString()),
- Boolean.valueOf(argObjectMap.get("filesOpened").toString()),
- Boolean.valueOf(argObjectMap.get("autoVideoSelect").toString())
- );
+ User_level
+ , rooms_id
+ , Long.valueOf(argObjectMap.get("roomtypes_id").toString()).longValue()
+ , argObjectMap.get("name").toString()
+ , Boolean.valueOf(argObjectMap.get("ispublic").toString())
+ , argObjectMap.get("comment").toString()
+ , Long.valueOf(argObjectMap.get("numberOfPartizipants").toString()).longValue()
+ , organisations
+ , Boolean.valueOf(argObjectMap.get("appointment").toString())
+ , Boolean.valueOf(argObjectMap.get("isDemoRoom").toString())
+ , demoTime
+ , Boolean.valueOf(argObjectMap.get("isModeratedRoom").toString())
+ , roomModerators
+ , Boolean.valueOf(argObjectMap.get("allowUserQuestions").toString())
+ , Boolean.valueOf(argObjectMap.get("isAudioOnly").toString())
+ , Boolean.valueOf(argObjectMap.get("allowFontStyles").toString())
+ , Boolean.valueOf(argObjectMap.get("isClosed").toString())
+ , argObjectMap.get("redirectURL").toString()
+ , argObjectMap.get("conferencePin").toString()
+ , Long.valueOf(argObjectMap.get("ownerId").toString()).longValue()
+ , Boolean.valueOf(argObjectMap.get("waitForRecording").toString())
+ , Boolean.valueOf(argObjectMap.get("allowRecording").toString())
+ , Boolean.valueOf(argObjectMap.get("hideTopBar").toString())
+ , Boolean.valueOf(argObjectMap.get("hideChat").toString())
+ , Boolean.valueOf(argObjectMap.get("hideActivitiesAndActions").toString())
+ , 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("showMicrophoneStatus").toString())
+ , Boolean.valueOf(argObjectMap.get("chatModerated").toString())
+ , Boolean.valueOf(argObjectMap.get("chatOpened").toString())
+ , Boolean.valueOf(argObjectMap.get("filesOpened").toString())
+ , Boolean.valueOf(argObjectMap.get("autoVideoSelect").toString())
+ , Boolean.valueOf(argObjectMap.get("sipEnabled").toString())
+ );
}
return roomId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1438374&r1=1438373&r2=1438374&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Fri Jan 25 07:36:27 2013
@@ -1025,7 +1025,8 @@ public class UserService {
false, // chatModerated
false, // chatOpened
false, // filesOpened
- false // autoVideoSelect
+ false, // autoVideoSelect
+ false //sipEnabled
);
room = roomDao.get(room_id);