You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openmeetings.apache.org by "seba.wagner@gmail.com" <se...@gmail.com> on 2012/03/26 16:03:27 UTC
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Hi Timur,
nice changeset :)
But it seems like you've missed to checking some of your code:
https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
The beans: AsteriskSipUsers, Extens, MeetMe are missing
And you should enable the BackupExport/BackupImport to include and
re-import the data from the new tables.
We might also add some panels in the Admin UI to have the possibility to
save/edit/delete the settings from the OpenMeetings Admin UI in the future.
Thanks!
Sebastian
2012/3/26 <ti...@apache.org>
> Author: timur
> Date: Mon Mar 26 09:14:15 2012
> New Revision: 1305274
>
> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
> Log:
> red5sip integration:
> - new Asterisk DAO added;
> - new red5sip configurations added to install step1 template;
> - new methods added to ScopeApplicationAdapter.java
> - openjpa.QueryCache temporally disabled to make database changes from
> Asterisk visible in OM.
>
> Added:
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> (with props)
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> (with props)
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> (with props)
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> (with props)
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> (with props)
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> (with props)
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> (with props)
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> (with props)
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> (with props)
> Modified:
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> simplified.xml
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> traditional.xml
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
> (studIP).xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
> brazil.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>
> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> Mon Mar 26 09:14:15 2012
> @@ -204,7 +204,9 @@
> <!-- No Interface -->
> <bean id="manageCryptStyle"
> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
> <bean id="openXGHttpClient"
> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
> - <bean id="generateImage"
> class="org.openmeetings.app.documents.GenerateImage" />
> + <bean id="asteriskDbSipClient"
> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient" />
> + <bean id="asteriskDAO"
> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
> + <bean id="generateImage"
> class="org.openmeetings.app.documents.GenerateImage" />
> <bean id="generateThumbs"
> class="org.openmeetings.app.documents.GenerateThumbs" />
> <bean id="generatePDF"
> class="org.openmeetings.app.documents.GeneratePDF" />
> <bean id="mailHandler"
> class="org.openmeetings.utils.mail.MailHandler" />
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> Mon Mar 26 09:14:15 2012
> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
> Mon Mar 26 09:14:15 2012
> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> simplified.xml (original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> simplified.xml Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> traditional.xml (original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> traditional.xml Mon Mar 26 09:14:15 2012
> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</value>
> + </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
> Mon Mar 26 09:14:15 2012
> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
> (studIP).xml (original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
> (studIP).xml Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
> Mon Mar 26 09:14:15 2012
> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
> Mon Mar 26 09:14:15 2012
> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
> Mon Mar 26 09:14:15 2012
> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
> Mon Mar 26 09:14:15 2012
> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
> Mon Mar 26 09:14:15 2012
> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
> Mon Mar 26 09:14:15 2012
> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
> brazil.xml (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
> brazil.xml Mon Mar 26 09:14:15 2012
> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Ромеронабиратель SIP</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
> Mon Mar 26 09:14:15 2012
> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Mon
> Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
> Mon Mar 26 09:14:15 2012
> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
> Mon Mar 26 09:14:15 2012
> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> <string id="1446" name="calendar edit button">
> <value>Edit details</value>
> </string>
> + <string id="1447" name="sip show dialer">
> + <value>Show sip dialer</value>
> + </string>
> + <string id="1448" name="sip call">
> + <value>Call</value>
> + </string>
> </language>
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
> Mon Mar 26 09:14:15 2012
> @@ -225,8 +225,9 @@ of the red5-servlet
> -->
> <!-- Quality-Modus *normal* -->
> <microphoneRateNormal>22</microphoneRateNormal>
> -<!-- Microphone Settings Quality-Modus *best* -->
> -<microphoneRateBest>44</microphoneRateBest>
> +<!-- Microphone Settings Quality-Modus *best* -->
> +<!-- TODO: red5sip support only 8 -->
> +<microphoneRateBest>44</microphoneRateBest>
>
> <!--
> The Size of the Whiteboard
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
> Mon Mar 26 09:14:15 2012
> @@ -47,7 +47,8 @@
> <confmenucommand id="cmd_importFile"
> onselect="canvas.doActionmenu('importFile')" key="['ALT','Shift','I']"/>
> <confmenucommand id="cmd_editCamMicSettings"
> onselect="canvas.doActionmenu('editCamMicSettings')"
> key="['ALT','Shift','1']"/>
> <confmenucommand id="cmd_editBoardSettings"
> onselect="canvas.doActionmenu('editBoardSettings')"
> key="['ALT','Shift','2']"/>
> - <confmenucommand id="cmd_quit" onselect="canvas.doActionmenu('quit')"
> key="['ALT','Shift','E']"/>
> + <confmenucommand id="cmd_quit" onselect="canvas.doActionmenu('quit')"
> key="['ALT','Shift','E']"/>
> + <confmenucommand id="cmd_showSipDialer"
> onselect="canvas.doActionmenu('showSipDialer')" key="['ALT','Shift','D']" />
>
> <confmenucommand id="cmd_applyforMod_nokey"
> onselect="canvas.doActionmenu('applyForMod')" />
> <confmenucommand id="cmd_createPoll_nokey"
> onselect="canvas.doActionmenu('createPoll')" />
> @@ -56,7 +57,8 @@
> <confmenucommand id="cmd_importFile_nokey"
> onselect="canvas.doActionmenu('importFile')" />
> <confmenucommand id="cmd_editCamMicSettings_nokey"
> onselect="canvas.doActionmenu('editCamMicSettings')"/>
> <confmenucommand id="cmd_editBoardSettings_nokey"
> onselect="canvas.doActionmenu('editBoardSettings')" />
> - <confmenucommand id="cmd_quit_nokey"
> onselect="canvas.doActionmenu('quit')" />
> + <confmenucommand id="cmd_quit_nokey"
> onselect="canvas.doActionmenu('quit')" />
> + <confmenucommand id="cmd_showSipDialer_nokey"
> onselect="canvas.doActionmenu('showSipDialer')" />
>
> <!--
> <command id="cmd_browser_open"
> onselect="canvas.doActionmenu('browser_open')" key="['ALT','Shift','B']"/>
> @@ -402,6 +404,8 @@
> canvas.thishib.applyForModeration.doCall();
> } else if (stringSub=='editCamMicSettings') {
>
> canvas._videocontainer._videoviewcontent.changeDevice();
> + } else if (stringSub=='showSipDialer') {
> + new lz.sipDialer(canvas.main_content._content.inner);
> } else if (stringSub=='editBoardSettings') {
> new
> lz.editWhiteboardDefault(canvas.main_content._content.inner);
> } else if (stringSub=='quit') {
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
> Mon Mar 26 09:14:15 2012
> @@ -47,9 +47,9 @@
> </method>
> </class>
>
> - <!--- Menu for public/private conference and audience room. This
> class shows
> - exit, moderator, file, setteings and poll menu. Those menu
> items are connected
> - to each command that has been declared in
> base/mainMethods.lzx. May 24 2008
> + <!--- Menu for public/private conference and audience room. This
> class shows
> + exit, moderator, file, setteings and poll menu. Those menu
> items are connected
> + to each command that has been declared in
> base/mainMethods.lzx. May 24 2008
> commented by onokeiji@gmail.com -->
> <class name="conferenceMenubar" extends="menubar" height="28"
> style="itemStyle">
> @@ -83,7 +83,7 @@
> parent._exitbtn.destroy();
> }
> }
> -
> +
> if(canvas.isrtl == 'true'){
> if ($debug) Debug.write("onInit : Setting
> nokey");
> lblImport.setCommand(cmd_importFile_nokey);
> @@ -92,11 +92,11 @@
> </handler>
> <_labelMenuItem id="lblImport" labelid="15"
> command="cmd_importFile" enabled="${
> canvas.ismoderator }" />
> - <!-- <menuseparator/> <_labelMenuItem
> labelid="561" command="cmd_exportFilePNG"
> - /> <_labelMenuItem labelid="562"
> command="cmd_exportFileJPG" /> <_labelMenuItem
> - labelid="563" command="cmd_exportFilePDF"
> /> <_labelMenuItem labelid="560"
> - command="cmd_exportFileSVG" />
> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
> - /> <menuseparator/> <_labelMenuItem
> name="_exitItem" labelid="309" command="cmd_quit"
> + <!-- <menuseparator/> <_labelMenuItem
> labelid="561" command="cmd_exportFilePNG"
> + /> <_labelMenuItem labelid="562"
> command="cmd_exportFileJPG" /> <_labelMenuItem
> + labelid="563" command="cmd_exportFilePDF"
> /> <_labelMenuItem labelid="560"
> + command="cmd_exportFileSVG" />
> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
> + /> <menuseparator/> <_labelMenuItem
> name="_exitItem" labelid="309" command="cmd_quit"
> value="quit" /> -->
> </_labelMenu>
>
> @@ -104,7 +104,7 @@
>
> <handler name="oninit">
> <![CDATA[
> -
> +
> if(canvas.isrtl == 'true'){
> if ($debug) Debug.write("onInit : Setting
> nokey");
>
> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
> @@ -112,6 +112,7 @@
> lblPoll.setCommand(cmd_createPoll_nokey);
>
> lblPollResult.setCommand(cmd_pollResults_nokey);
>
> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
> +
> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
> }
> //hideActionsMenu
> if(canvas.currentRoomObj.hideActionsMenu){
> @@ -133,7 +134,7 @@
> </handler>
> </_labelMenuItem>
> <menuseparator />
> - <!-- <_labelMenuItem labelid="749"
> command="cmd_coBrowser" enabled="${
> + <!-- <_labelMenuItem labelid="749"
> command="cmd_coBrowser" enabled="${
> canvas.ismoderator }" /> <menuseparator/>
> -->
> <_labelMenuItem id="lblCamMic" labelid="306"
> command="cmd_editCamMicSettings" />
> @@ -177,14 +178,17 @@
> <_labelMenuItem width="250" id="lblPollVote"
> labelid="42"
> command="cmd_checkPollVoted" />
> <menuseparator />
> + <_labelMenuItem width="250" id="lblShowSipDialer"
> labelid="1447"
> + command="cmd_showSipDialer" />
> + <menuseparator />
> <_labelMenuItem width="250" labelid="1126"
> command="cmd_editWhiteboardDefault" />
> </_labelMenu>
> -
> - <!-- exit room <_labelMenu labelid="308" width="250">
> </_labelMenu> <_labelMenu
> - labelid="301" width="250"> <_labelMenuItem
> id="lblMod" labelid="302" command="cmd_applyforMod"
> - /> </_labelMenu> <_labelMenu labelid="305"
> width="250"> <_labelMenuItem labelid="306"
> - command="cmd_editCamMicSettings" />
> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
> +
> + <!-- exit room <_labelMenu labelid="308" width="250">
> </_labelMenu> <_labelMenu
> + labelid="301" width="250"> <_labelMenuItem
> id="lblMod" labelid="302" command="cmd_applyforMod"
> + /> </_labelMenu> <_labelMenu labelid="305"
> width="250"> <_labelMenuItem labelid="306"
> + command="cmd_editCamMicSettings" />
> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
> /> </_labelMenu> <_labelMenu labelid="303"
> width="250"> </_labelMenu> -->
>
> </class>
> @@ -258,7 +262,7 @@
> </handler>
> </_labelMenuItem>
> <menuseparator />
> - <!-- <_labelMenuItem labelid="749"
> command="cmd_coBrowser" enabled="${
> + <!-- <_labelMenuItem labelid="749"
> command="cmd_coBrowser" enabled="${
> canvas.ismoderator }" />
> <menuseparator/> -->
> <_labelMenuItem labelid="306"
> command="cmd_editCamMicSettings"
> enabled="${ canvas.ismoderator }" />
> @@ -358,7 +362,7 @@
> </handler>
> </_labelMenuItem>
> <menuseparator />
> - <!-- <_labelMenuItem labelid="749"
> command="cmd_coBrowser" enabled="${
> + <!-- <_labelMenuItem labelid="749"
> command="cmd_coBrowser" enabled="${
> canvas.ismoderator }" />
> <menuseparator/> -->
> <_labelMenuItem labelid="306"
> command="cmd_editCamMicSettings"
> enabled="${ canvas.ismoderator }" />
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
> Mon Mar 26 09:14:15 2012
> @@ -65,6 +65,7 @@
> <include href="restricted/" />
> <include href="browser/" />
> <include href="testsetup/" />
> + <include href="sip/" />
>
> <include href="flexibleConferenceRoom/" />
>
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,6 @@
> +<?xml version="1.0" encoding="UTF-8" ?>
> +<library>
> +
> + <include href="sipDialer.lzx" />
> +
> +</library>
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,81 @@
> +<?xml version="1.0" encoding="UTF-8" ?>
> +<library>
> +
> +<class name="sipDialer" extends="window" bgcolor="gray" width="200">
> + <simplelayout axis="y" spacing="5"/>
> + <labelText labelid="1003"/>
> + <view name="phoneNumber" width="100%">
> + <inputtext name="input"
> width="$once{parent.width-parent.del.width}" height="20" bgcolor="white"/>
> + <button name="del" x="$once{parent.input.width}" width="30"
> height="20" onclick="this.del();">
> + â†
> + <method name="del">
> + var t = parent.input.text;
> + if(t.length != 0) {
> + t = t.substr(0, t.length - 1);
> + parent.input.setAttribute('text', t);
> + }
> + </method>
> + </button>
> + </view>
> +
> + <view name="dialerButtons" align="center">
> + <vbox spacing="5">
> + <hbox spacing="5">
> + <button onclick="parent.parent.parent.parent.dial('1')"
> width="40">1</button>
> + <button onclick="parent.parent.parent.parent.dial('2')"
> width="40">2</button>
> + <button onclick="parent.parent.parent.parent.dial('3')"
> width="40">3</button>
> + </hbox>
> + <hbox spacing="5">
> + <button onclick="parent.parent.parent.parent.dial('4')"
> width="40">4</button>
> + <button onclick="parent.parent.parent.parent.dial('5')"
> width="40">5</button>
> + <button onclick="parent.parent.parent.parent.dial('6')"
> width="40">6</button>
> + </hbox>
> + <hbox spacing="5">
> + <button onclick="parent.parent.parent.parent.dial('7')"
> width="40">7</button>
> + <button onclick="parent.parent.parent.parent.dial('8')"
> width="40">8</button>
> + <button onclick="parent.parent.parent.parent.dial('9')"
> width="40">9</button>
> + </hbox>
> + <hbox spacing="5">
> + <button onclick="parent.parent.parent.parent.dial('*')"
> width="40">*</button>
> + <button onclick="parent.parent.parent.parent.dial('0')"
> width="40">0</button>
> + <button onclick="parent.parent.parent.parent.dial('#')"
> width="40">#</button>
> + </hbox>
> + </vbox>
> + </view>
> + <hbox spacing="10" align="center">
> + <simpleLabelButton labelid="1448" name="callButton">
> + <handler name="onclick">
> + parent.parent.joinToConfCall.doCall();
> + </handler>
> + </simpleLabelButton>
> + <simpleLabelButton labelid="85" name="closeButton">
> + <handler name="onclick">
> + canvas.sipDialer = null;
> + parent.parent.destroy();
> + </handler>
> + </simpleLabelButton>
> + </hbox>
> + <handler name="oninit">
> + if(canvas.sipDialer != null) {
> + canvas.sipDialer.destroy();
> + }
> + canvas.setAttribute('sipDialer', this);
> + this.bringToFront();
> + </handler>
> +
> + <method name="dial" args="digit">
> + this.phoneNumber.input.setAttribute('text',
> this.phoneNumber.input.text + digit);
> + </method>
> +
> + <netRemoteCallHib name="joinToConfCall" funcname="joinToConfCall"
> remotecontext="$once{ canvas.thishib }">
> + <netparam><method name="getValue">return
> parent.parent.phoneNumber.input.text</method></netparam>
> + <handler name="ondata" args="value">
> + <![CDATA[
> + //The onResult-Handler will be called be the rtmpconnection
> + if($debug) Debug.write("joinToConfCall : ",value);
> + ]]>
> + </handler>
> + </netRemoteCallHib>
> +</class>
> +
> +</library>
> \ No newline at end of file
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> Mon Mar 26 09:14:15 2012
> @@ -67,6 +67,9 @@
>
> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
>
> <class>org.openmeetings.app.persistence.beans.user.Users</class>
>
> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
> +
> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
> +
> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
> +
> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
> <exclude-unlisted-classes>false</exclude-unlisted-classes>
> <properties>
> <property
> name="openjpa.ConnectionProperties"
> @@ -83,7 +86,8 @@
> <property name="openjpa.Log"
> value="DefaultLevel=WARN, Tool=INFO" />
> <property
> name="openjpa.ConnectionDriverName"
> value="org.apache.commons.dbcp.BasicDataSource"/>
> <property name="openjpa.DataCache"
> value="true"/>
> - <property name="openjpa.QueryCache"
> value="true"/>
> + <!-- QueryCache disabled due to changes outside of JPA
> doesn't take effect with caching -->
> + <property name="openjpa.QueryCache"
> value="false"/>
> <property name="openjpa.jdbc.DBDictionary"
> value="batchLimit=100,tableType=myisam"/>
> <property name="openjpa.jdbc.QuerySQLCache"
> value="false"/>
> </properties>
>
> Modified: incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
> (original)
> +++ incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Mon
> Mar 26 09:14:15 2012
> @@ -331,7 +331,36 @@ function checkEmail()
>
> </i></p>
>
> - </fieldset>
> + </fieldset>
> +
> + <fieldset id="red5sip">
> + <legend>red5SIP Configuration</legend>
> +
> + <li>
> + <label for="red5sip_enable">Enable SIP</label>
> + <select name="red5sip_enable" id="red5sip_enable" size="1">
> + <option value="yes">Yes</option>
> + <option value="no" selected>No</option>
> + </select><br />
> + </li>
> + <p><i>
> + Enable red5SIP integration
> + </i></p>
> + <br />
> +
> + <li>
> + <label for="red5sip_room_prefix">SIP rooms prefix</label>
> + <input name="red5sip_room_prefix" id="red5sip_room_prefix"
> size="27" title="" type="text" value="400" />
> + <p><i>Prefix for phone number of conference rooms</i></p>
> + </li>
> +
> + <li>
> + <label for="red5sip_exten_context">SIP extensions context</label>
> + <input name="red5sip_exten_context" id="red5sip_exten_context"
> size="27" title="" type="text" value="rooms" />
> + <p><i>Context of Asterisk extensions</i></p>
> + </li>
> +
> + </fieldset>
>
> <fieldset id="sip">
>
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
> Mon Mar 26 09:14:15 2012
> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
>
> import org.openmeetings.app.conference.session.RoomClient;
> import org.openmeetings.app.data.basic.AuthLevelmanagement;
> +import org.openmeetings.app.data.basic.Configurationmanagement;
> import org.openmeetings.app.data.beans.basic.SearchResult;
> import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
> import org.openmeetings.app.data.user.Organisationmanagement;
> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
> +import org.openmeetings.app.persistence.beans.basic.Configuration;
> import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
> import org.openmeetings.app.persistence.beans.rooms.Rooms;
> import org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
> import org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
> +import org.openmeetings.app.persistence.beans.user.UserSipData;
> import org.openmeetings.app.persistence.beans.user.Users;
> import org.openmeetings.app.remote.red5.ClientListManager;
> +import org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
> +import
> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
> import org.red5.logging.Red5LoggerFactory;
> import org.slf4j.Logger;
> @@ -71,6 +78,8 @@ public class Roommanagement {
> @Autowired
> private OpenXGHttpClient openXGHttpClient;
> @Autowired
> + private AsteriskDbSipClient asteriskDbSipClient;
> + @Autowired
> private RoomModeratorsDaoImpl roomModeratorsDao;
> @Autowired
> private UsersDaoImpl usersDao;
> @@ -78,6 +87,8 @@ public class Roommanagement {
> private AuthLevelmanagement authLevelManagement;
> @Autowired
> private ClientListManager clientListManager;
> + @Autowired
> + private Configurationmanagement cfgManagement;
>
> /**
> * add a new Record to the table roomtypes
> @@ -102,6 +113,20 @@ public class Roommanagement {
>
> public Long addRoom(Rooms room) {
> try {
> + /* Red5SIP integration
> *******************************************************************************/
> + Configuration conf = cfgManagement.getConfKey(3L,
> "red5sip.enable");
> + if(conf != null && conf.getConf_value().equals("yes")) {
> + if(room.getSipNumber() != null &&
> !room.getSipNumber().isEmpty()) {
> + asteriskDbSipClient.createSIPConference(new
> SIPCreateConferenceRequest(room.getSipNumber()));
> + } else {
> + SipCreateConferenceRequestResult requestResult =
> asteriskDbSipClient.createSIPConference(new SIPCreateConferenceRequest());
> + if(!requestResult.hasError()) {
> +
> room.setSipNumber(requestResult.getConferenceNumber());
> +
> room.setConferencePin(requestResult.getConferencePin());
> + }
> + }
> + }
> +
> /*****************************************************************************************************/
> room.setStarttime(new Date());
> room = em.merge(room);
> long returnId = room.getRooms_id();
> @@ -719,6 +744,25 @@ public class Roommanagement {
> return null;
> }
>
> + /**
> + * Returns number of SIP conference participants
> + * @param rooms_id id of room
> + * @return number of participants
> + */
> + public Integer getSipConferenceMembersNumber(Long rooms_id) {
> + Configuration conf = cfgManagement.getConfKey(3L,
> "red5sip.enable");
> + if(conf != null && conf.getConf_value().equals("yes")) {
> + Rooms rooms = this.getRoomById(rooms_id);
> + if(rooms != null) {
> + return
> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
> + } else {
> + return 0;
> + }
> + } else {
> + return null;
> + }
> + }
> +
> /**
> * adds a new Record to the table rooms
> * @param name
> @@ -793,6 +837,19 @@ public class Roommanagement {
>
> r.setConferencePin(openXGReturnObject.getConferencePin());
> }
>
> + /* Red5SIP integration
> *******************************************************************************/
> + Configuration conf = cfgManagement.getConfKey(3L,
> "red5sip.enable");
> + if(conf != null && conf.getConf_value().equals("yes")) {
> + SipCreateConferenceRequestResult requestResult =
> asteriskDbSipClient
> + .createSIPConference(new
> SIPCreateConferenceRequest());
> +
> + if(!requestResult.hasError()) {
> +
> r.setSipNumber(requestResult.getConferenceNumber());
> +
> r.setConferencePin(requestResult.getConferencePin());
> + }
> + }
> +
> /*****************************************************************************************************/
> +
> r = em.merge(r);
> long returnId = r.getRooms_id();
>
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
> Mon Mar 26 09:14:15 2012
> @@ -252,7 +252,8 @@ public class ImportInitvalues {
> String openxg_client_domain, String
> openxg_community_code,
> String openxg_language_code, String openxg_adminid,
> String sip_language_phonecode, String
> sip_phonerange_start,
> - String sip_phonerange, String jodPath) {
> + String sip_phonerange, String jodPath,
> + String red5sip_enable, String red5sip_room_prefix,String
> red5sip_exten_context) {
>
> cfgManagement
> .addConfByKey(
> @@ -349,6 +350,18 @@ public class ImportInitvalues {
> cfgManagement.addConfByKey(3, "default.rpc.userid", "" + 1,
> null,
> "The User-Id of the Control User in
> OpenMeetings");
>
> + // ***************************************
> + // ***************************************
> + // red5SIP Integration Coniguration Values
> + // ***************************************
> +
> + cfgManagement.addConfByKey(3, "red5sip.enable", red5sip_enable,
> null,
> + "Enable to enable the red5SIP integration
> ");
> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
> red5sip_room_prefix, null,
> + "Enable to enable the red5SIP integration
> ");
> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
> red5sip_exten_context, null,
> + "Enable to enable the red5SIP integration
> ");
> +
> // ***************************************
> // ***************************************
> // SIP Applet Configuration Values
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
> Mon Mar 26 09:14:15 2012
> @@ -19,6 +19,7 @@
> package org.openmeetings.app.remote.red5;
>
> import java.io.File;
> +import java.io.IOException;
> import java.util.ArrayList;
> import java.util.Collection;
> import java.util.Date;
> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
> return null;
> }
>
> + public synchronized List<Integer> listRoomBroadcast() {
> + List<Integer> broadcastList = new ArrayList<Integer>();
> + IConnection current = Red5.getConnectionLocal();
> + String streamid = current.getClient().getId();
> + Collection<Set<IConnection>> conCollection =
> current.getScope().getConnections();
> + for (Set<IConnection> conset : conCollection) {
> + for (IConnection conn : conset) {
> + if (conn != null) {
> + RoomClient rcl = this.clientListManager
> + .getClientByStreamId(conn
> + .getClient().getId());
> + if (rcl == null) {
> + // continue;
> + } else if (rcl.getIsScreenClient() != null
> + && rcl.getIsScreenClient()) {
> + // continue;
> + } else {
> + if (!streamid.equals(rcl.getStreamid())) {
> + // It is not needed to send back
> + // that event to the actuall
> + // Moderator
> + // as it will be already triggered
> + // in the result of this Function
> + // in the Client
> +
> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
> + }
> + }
> + }
> + }
> + }
> + return broadcastList;
> + }
> +
> +
> /**
> * this function is invoked directly after initial connecting
> *
> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
> }
> return null;
> }
> +
> + /*
> + * SIP transport methods
> + */
> +
> + public synchronized void updateSipTransport() {
> + IConnection current = Red5.getConnectionLocal();
> + String streamid = current.getClient().getId();
> + RoomClient currentClient =
> this.clientListManager.getClientByStreamId(streamid);
> + log.debug("getSipConferenceMembersNumber: " +
> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
> + String newNumber =
> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
> + if(!newNumber.equals(currentClient.getLastname())) {
> + currentClient.setLastname(newNumber);
> + this.clientListManager.updateClientByStreamId(streamid,
> currentClient);
> + log.debug("updateSipTransport: {}, {}, {}, {}", new
> Object[]{currentClient.getPublicSID(),
> + currentClient.getRoom_id(),
> currentClient.getFirstname(), currentClient.getLastname()});
> + sendMessageWithClient(new
> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
> + }
> + }
> +
> + /**
> + * Perform call to specified phone number and join to conference
> + * @param number to call
> + */
> + public synchronized void joinToConfCall(String number) {
> + IConnection current = Red5.getConnectionLocal();
> + String streamid = current.getClient().getId();
> + RoomClient currentClient =
> this.clientListManager.getClientByStreamId(streamid);
> + Rooms rooms =
> roommanagement.getRoomById(currentClient.getRoom_id());
> + log.debug("asterisk -rx \"originate Local/" + number + "@rooms
> extension " + rooms.getSipNumber() + "@rooms\"");
> + try {
> + Process proc = Runtime.getRuntime().exec(new
> String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms extension
> " + rooms.getSipNumber() + "@rooms"});
> + } catch (IOException e) {
> + log.error("Executing asterisk originate error: ", e);
> + }
> + }
> +
> + public synchronized String getSipNumber(Long room_id) {
> + Rooms rooms = roommanagement.getRoomById(room_id);
> + if(rooms != null) {
> + log.debug("getSipNumber: room_id: {}, sipNumber: {}", new
> Object[]{room_id, rooms.getSipNumber()});
> + return rooms.getSipNumber();
> + }
> + return null;
> + }
> +
> + public synchronized void setSipTransport(Long room_id, String
> publicSID, String broadCastId) {
> + IConnection current = Red5.getConnectionLocal();
> + String streamid = current.getClient().getId();
> + Rooms room = roommanagement.getRoomById(room_id);
> + // Notify all clients of the same scope (room)
> + RoomClient currentClient =
> this.clientListManager.getClientByStreamId(streamid);
> + currentClient.setRoom_id(room_id);
> + currentClient.setRoomEnter(new Date());
> + currentClient.setFirstname("SIP Transport");
> +
> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
> + currentClient.setBroadCastID(Long.parseLong(broadCastId));
> + currentClient.setIsBroadcasting(true);
> + currentClient.setPublicSID(publicSID);
> + currentClient.setAvsettings("av");
> + currentClient.setVWidth(120);
> + currentClient.setVHeight(90);
> + this.clientListManager.updateClientByStreamId(streamid,
> currentClient);
> +
> + Collection<Set<IConnection>> conCollection = current
> + .getScope().getConnections();
> + for (Set<IConnection> conset : conCollection) {
> + for (IConnection conn : conset) {
> + if (conn != null) {
> + RoomClient rcl =
> this.clientListManager.getClientByStreamId(conn.getClient().getId());
> + if (rcl == null) {
> + // continue;
> + } else if (rcl.getIsScreenClient() != null
> + && rcl.getIsScreenClient()) {
> + // continue;
> + } else {
> + if (!streamid.equals(rcl.getStreamid())) {
> + // It is not needed to send back
> + // that event to the actuall
> + // Moderator
> + // as it will be already triggered
> + // in the result of this Function
> + // in the Client
> + if (conn instanceof
> IServiceCapableConnection) {
> + ((IServiceCapableConnection)
> conn).invoke("addNewUser", new Object[]{currentClient}, this);
> + ((IServiceCapableConnection)
> conn).invoke("newStream", new Object[]{currentClient}, this);
> + log.debug("sending setSipTransport to "
> + + conn);
> + }
> + }
> + }
> + }
> + }
> + }
> + }
> }
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,19 @@
> +package org.openmeetings.app.sip.api;
> +
> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
> +import
> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
> +
> +/**
> + * SIP client interface
> + */
> +public interface ISIPClient {
> +
> + SIPCreateUserRequestResult createSIPUser(SIPCreateUserRequest
> request);
> +
> + SipCreateConferenceRequestResult
> createSIPConference(SIPCreateConferenceRequest request);
> +
> + Integer getConferenceMembersNumber(String sipNumber);
> +
> +}
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,58 @@
> +package org.openmeetings.app.sip.api.impl.asterisk;
> +
> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
> +import org.openmeetings.app.persistence.beans.user.UserSipData;
> +import org.openmeetings.app.sip.api.ISIPClient;
> +import org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
> +import
> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
> +import org.springframework.beans.factory.annotation.Autowired;
> +/**
> + *
> + */
> +public class AsteriskDbSipClient implements ISIPClient {
> +
> + @Autowired
> + private AsteriskDAOImpl asteriskDAO;
> +
> + public SIPCreateUserRequestResult createSIPUser(final
> SIPCreateUserRequest request) {
> + asteriskDAO.addSipUser(request.getLogin(), request.getPassword());
> + return new SIPCreateUserRequestResult() {
> + @Override
> + public UserSipData getUserSipData() {
> + UserSipData sipData = new UserSipData();
> + sipData.setAuthId(request.getLogin());
> + sipData.setUserpass(request.getPassword());
> + sipData.setUsername(request.getLogin());
> + return sipData;
> + }
> +
> + public boolean hasError() {
> + return false;
> + }
> +
> + public String getErrorMessage() {
> + return null;
> + }
> + };
> + }
> +
> + public SipCreateConferenceRequestResult
> createSIPConference(SIPCreateConferenceRequest request) {
> + String confno = asteriskDAO.addMeetMeConference();
> + return new SipCreateConferenceRequestResult(confno, "") {
> + public boolean hasError() {
> + return false;
> + }
> +
> + public String getErrorMessage() {
> + return null;
> + }
> + };
> + }
> +
> + public Integer getConferenceMembersNumber(String sipNumber) {
> + return asteriskDAO.getConferensMembersNumber(sipNumber);
> + }
> +}
> \ No newline at end of file
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,76 @@
> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
> +
> +import org.openmeetings.app.OpenmeetingsVariables;
> +import org.openmeetings.app.data.basic.Configurationmanagement;
> +import org.openmeetings.app.persistence.beans.basic.Configuration;
> +import
> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
> +import org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
> +import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
> +import org.red5.logging.Red5LoggerFactory;
> +import org.slf4j.Logger;
> +import org.springframework.transaction.annotation.Transactional;
> +import org.springframework.beans.factory.annotation.Autowired;
> +
> +import javax.persistence.EntityManager;
> +import javax.persistence.PersistenceContext;
> +
> +@Transactional
> +public class AsteriskDAOImpl {
> +
> + private static final Logger log =
> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
> OpenmeetingsVariables.webAppRootKey);
> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
> + @PersistenceContext
> + private EntityManager em;
> + @Autowired
> + private Configurationmanagement cfgManagement;
> +
> + public void addSipUser(String username, String secret) {
> + AsteriskSipUsers u = new AsteriskSipUsers();
> + Configuration conf =
> cfgManagement.getConfKey(3L,"red5sip.exten_context");
> + String defaultRoomContext = "rooms";
> + if(conf != null && !conf.getConf_value().isEmpty()) {
> + defaultRoomContext = conf.getConf_value();
> + }
> + u.setName(username);
> + u.setSecret(secret);
> + u.setContext(defaultRoomContext);
> + u.setHost("dynamic");
> + Extensions e = new Extensions();
> + e.setApp("Dial");
> + e.setAppdata("SIP/" + username);
> + e.setExten(username);
> + e.setContext(defaultRoomContext);
> + e.setPriority(1);
> + em.persist(u);
> + em.persist(e);
> + }
> +
> + public String addMeetMeConference() {
> + int count = ((Number)em.createQuery("SELECT COUNT(m.confno) FROM
> MeetMe AS m").getSingleResult()).intValue();
> +
> + Configuration conf =
> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
> + String prefix = DEFAULT_SIP_CONTEXT;
> + if(conf != null) {
> + prefix = conf.getConf_value();
> + }
> + String confno = prefix+(count+1);
> + MeetMe mm = new MeetMe();
> + mm.setConfno(confno);
> + Extensions e = new Extensions();
> + e.setApp("MeetMe");
> + e.setAppdata(confno + ",dM");
> + e.setExten(confno);
> + e.setContext("rooms");
> + e.setPriority(1);
> + em.persist(mm);
> + em.persist(e);
> + return confno;
> + }
> +
> + public Integer getConferensMembersNumber(String confNo) {
> + return ((Number)em.createQuery("SELECT m.members FROM MeetMe AS m
> WHERE m.confno=:confno")
> + .setParameter("confno", confNo)
> + .getSingleResult()).intValue();
> + }
> +}
> \ No newline at end of file
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,8 @@
> +package org.openmeetings.app.sip.api.request;
> +
> +/**
> + * Base interface for SIP API requests
> + */
> +public interface ISIPRequest {
> +
> +}
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,17 @@
> +package org.openmeetings.app.sip.api.request;
> +
> +/**
> + * Create SIP conferece request
> + */
> +public class SIPCreateConferenceRequest implements ISIPRequest {
> + private String sipNumber;
> +
> + public SIPCreateConferenceRequest() {
> + super(); //To change body of overridden methods use File |
> Settings | File Templates.
> + }
> +
> + public SIPCreateConferenceRequest(String sipNumber) {
> + super();
> + this.sipNumber = sipNumber;
> + }
> +}
> \ No newline at end of file
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,72 @@
> +package org.openmeetings.app.sip.api.request;
> +
> +/**
> + * Create User Request
> + */
> +public class SIPCreateUserRequest implements ISIPRequest {
> +
> + protected String firstName;
> + protected String middleName;
> + protected String lastName;
> + protected String email;
> + protected String login;
> + protected String password;
> +
> +
> + public SIPCreateUserRequest(String firstName, String middleName,
> String lastName, String email, String login, String password) {
> + this.firstName = firstName;
> + this.middleName = middleName;
> + this.lastName = lastName;
> + this.email = email;
> + this.login = login;
> + this.password = password;
> + }
> +
> + public void withFirstName(String firstName) {
> + this.firstName = firstName;
> + }
> +
> + public void withMiddleName(String middleName) {
> + this.middleName = middleName;
> + }
> +
> + public void withLastName(String lastName) {
> + this.lastName = lastName;
> + }
> +
> + public void withEmail(String email) {
> + this.email = email;
> + }
> +
> + public void withLogin(String login) {
> + this.login = login;
> + }
> +
> + public void withPassword(String password) {
> + this.password = password;
> + }
> +
> + public String getFirstName() {
> + return firstName;
> + }
> +
> + public String getMiddleName() {
> + return middleName;
> + }
> +
> + public String getLastName() {
> + return lastName;
> + }
> +
> + public String getEmail() {
> + return email;
> + }
> +
> + public String getLogin() {
> + return login;
> + }
> +
> + public String getPassword() {
> + return password;
> + }
> +}
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,12 @@
> +package org.openmeetings.app.sip.api.result;
> +
> +/**
> + * * Base interface for SIP API request's resuslt
> + */
> +public interface ISIPRequestResult {
> +
> + boolean hasError();
> +
> + String getErrorMessage();
> +
> +}
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,12 @@
> +package org.openmeetings.app.sip.api.result;
> +
> +import org.openmeetings.app.persistence.beans.user.UserSipData;
> +
> +/**
> + * TODO
> + */
> +public abstract class SIPCreateUserRequestResult implements
> ISIPRequestResult {
> +
> + abstract public UserSipData getUserSipData();
> +
> +}
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> (added)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> Mon Mar 26 09:14:15 2012
> @@ -0,0 +1,26 @@
> +package org.openmeetings.app.sip.api.result;
> +
> +/**
> + * TODO
> + */
> +public abstract class SipCreateConferenceRequestResult implements
> ISIPRequestResult {
> +
> + protected String conferenceNumber;
> + protected String conferencePin;
> +
> + protected SipCreateConferenceRequestResult() {
> + }
> +
> + protected SipCreateConferenceRequestResult(String conferenceNumber,
> String conferencePin) {
> + this.conferenceNumber = conferenceNumber;
> + this.conferencePin = conferencePin;
> + }
> +
> + public String getConferenceNumber() {
> + return conferenceNumber;
> + }
> +
> + public String getConferencePin() {
> + return conferencePin;
> + }
> +}
>
> Propchange:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
> Mon Mar 26 09:14:15 2012
> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
> String screen_viewer =
> httpServletRequest
>
> .getParameter("screen_viewer");
>
> + // red5sip integration config
> + String red5sip_enable = httpServletRequest
> +
> .getParameter("red5sip_enable");
> + String red5sip_room_prefix = httpServletRequest
> +
> .getParameter("red5sip_room_prefix");
> + String red5sip_exten_context = httpServletRequest
> +
> .getParameter("red5sip_exten_context");
> +
> // SIP Applet Configuration
> String sip_enable =
> httpServletRequest
>
> .getParameter("sip_enable");
> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
>
> openxg_community_code, openxg_language_code,
> openxg_adminid,
> sip_language_phonecode,
>
> sip_phonerange_start, sip_phonerange,
> - jodPath);
> + jodPath,
> + red5sip_enable, red5sip_room_prefix,
> red5sip_exten_context);
>
>
> getImportInitvalues().loadInitUserAndOrganisation(username,
> userpass,
> useremail, orgname, timeZone, configdefaultLang);
>
> Modified:
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
> URL:
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>
> ==============================================================================
> ---
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
> (original)
> +++
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
> Mon Mar 26 09:14:15 2012
> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
> private static final String sip_phonerange_start = "";
> private static final String sip_phonerange = "";
> private static final String jodPath = "./jod/lib";
> + private static final String red5sip_enable = "no";
> + private static final String red5sip_room_prefix = "400";
> + private static final String red5sip_exten_context = "rooms";
> protected static final String username = "junit";
> protected static final String userpass = "test";
> private static final String orgname = "smoketest";
> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
> openxg_client_id, openxg_client_secret,
> openxg_client_domain,
> openxg_community_code,
> openxg_language_code, openxg_adminid,
> sip_language_phonecode,
> sip_phonerange_start, sip_phonerange,
> - jodPath);
> + jodPath, red5sip_enable,
> red5sip_room_prefix, red5sip_exten_context);
>
> importInitvalues.loadInitUserAndOrganisation(username,
> userpass,
> useremail, orgname, timeZone,
> configdefaultLang);
>
>
>
--
Sebastian Wagner
http://www.openmeetings.de
http://incubator.apache.org/openmeetings/
http://www.webbase-design.de
http://www.wagner-sebastian.com
seba.wagner@gmail.com
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Posted by Тимур Тлеукенов <ti...@gmail.com>.
> I guess using another database would mean also result in changes in the
red5phone integration code yes?
I think for another databases changes would be mostly in Asterisk
configuration, changes in red5phone integration code will be minor.
> My proposal would then be to make MySQL mandatory for the Asterisk
integration for now and we might re-consider that when we
> have released and a package and gathered some feedback.
I agree.
2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
> I guess using another database would mean also result in changes in the
> red5phone integration code yes?
>
> My proposal would then be to make MySQL mandatory for the Asterisk
> integration for now and we might re-consider that when we have released and
> a package and gathered some feedback.
>
> What do you think?
>
> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>
>> Yes, currently red5sip integration works works only with mysql. But I
>> think it possible to make it works with Asterisk ODBC realtime module
>> instead of mysql realtime.
>>
>> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>>
>>> Forgot to press "Reply to all" :-)
>>>
>>> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>>>
>>>> Such tables structure required by Asterisk Realtime module.
>>>> For MeetMe plugin table structure described here:
>>>> http://www.voip-info.org/wiki/view/Asterisk+RealTime+MeetMe.
>>>> May be it will work with other primary key, I will check it.
>>>>
>>>> 2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
>>>>
>>>>> It is looking great btw ;)
>>>>>
>>>>> But I have a question: The table "meetme", its primary key is a
>>>>> varchar and name is "confno"
>>>>>
>>>>> The pattern so far was, example:
>>>>> Table name: poll_types
>>>>> Primary Key: poll_type_id <Type bigint or int>
>>>>>
>>>>> Even "pure" assoziation tables like: rooms_organisations
>>>>> => In that table you assign rooms to organisation, so it _could_ have
>>>>> only two colums:
>>>>> rooms_id and organisation_id => however I consequently added a primary
>>>>> key with the table name: rooms_organisation_id to it.
>>>>>
>>>>> Now we have some new tables that have the primary_key column name "id"
>>>>> and the one table that has a varchar as primary key.
>>>>>
>>>>> Can we please find a consens together what pattern we use? I think it
>>>>> makes sense to call the primary key just "id" and not including the table
>>>>> name in it cause it lead to problems in the past if the column names are
>>>>> too long.
>>>>> But what about the "meetme" table? Is there a special reason for
>>>>> having a varchar primary key here? Is it possible to bring this in-line
>>>>> with the rest of the database table scheme?
>>>>>
>>>>> Thanks!
>>>>> Sebastian
>>>>>
>>>>> 2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
>>>>>
>>>>>> Hi Timur,
>>>>>>
>>>>>> please don't forget to add the new persistence classes also to the
>>>>>> other templates:
>>>>>> db2/derby/oracle/postgres
>>>>>>
>>>>>> Thanks!
>>>>>> Sebastian
>>>>>>
>>>>>> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>>>>>>
>>>>>>> Hi Sebastian,
>>>>>>>
>>>>>>> I added the missing files and license headers.
>>>>>>>
>>>>>>> 2012/3/27 Alexei Fedotov <al...@gmail.com>
>>>>>>>
>>>>>>>> Ok, I'm here. :-)
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> On Mon, Mar 26, 2012 at 6:03 PM, seba.wagner@gmail.com
>>>>>>>> <se...@gmail.com> wrote:
>>>>>>>> > Hi Timur,
>>>>>>>> >
>>>>>>>> > nice changeset :)
>>>>>>>> >
>>>>>>>> > But it seems like you've missed to checking some of your code:
>>>>>>>> >
>>>>>>>> https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
>>>>>>>> >
>>>>>>>> > The beans: AsteriskSipUsers, Extens, MeetMe are missing
>>>>>>>> >
>>>>>>>> > And you should enable the BackupExport/BackupImport to include and
>>>>>>>> > re-import the data from the new tables.
>>>>>>>> >
>>>>>>>> > We might also add some panels in the Admin UI to have the
>>>>>>>> possibility to
>>>>>>>> > save/edit/delete the settings from the OpenMeetings Admin UI in
>>>>>>>> the future.
>>>>>>>> >
>>>>>>>> > Thanks!
>>>>>>>> > Sebastian
>>>>>>>> >
>>>>>>>> > 2012/3/26 <ti...@apache.org>
>>>>>>>> >
>>>>>>>> >> Author: timur
>>>>>>>> >> Date: Mon Mar 26 09:14:15 2012
>>>>>>>> >> New Revision: 1305274
>>>>>>>> >>
>>>>>>>> >> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
>>>>>>>> >> Log:
>>>>>>>> >> red5sip integration:
>>>>>>>> >> - new Asterisk DAO added;
>>>>>>>> >> - new red5sip configurations added to install step1 template;
>>>>>>>> >> - new methods added to ScopeApplicationAdapter.java
>>>>>>>> >> - openjpa.QueryCache temporally disabled to make database
>>>>>>>> changes from
>>>>>>>> >> Asterisk visible in OM.
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>>> >> (with props)
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>>> >> (with props)
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>>> >> (with props)
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>>> >> (with props)
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>>> >> (with props)
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>>> >> (with props)
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>>> >> (with props)
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>>> >> (with props)
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>>> >> (with props)
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>>> >> simplified.xml
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>>> >> traditional.xml
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>>>> >> (studIP).xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>>>> >> brazil.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -204,7 +204,9 @@
>>>>>>>> >> <!-- No Interface -->
>>>>>>>> >> <bean id="manageCryptStyle"
>>>>>>>> >> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
>>>>>>>> >> <bean id="openXGHttpClient"
>>>>>>>> >> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
>>>>>>>> >> - <bean id="generateImage"
>>>>>>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>>>>>>> >> + <bean id="asteriskDbSipClient"
>>>>>>>> >>
>>>>>>>> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient" />
>>>>>>>> >> + <bean id="asteriskDAO"
>>>>>>>> >>
>>>>>>>> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
>>>>>>>> >> + <bean id="generateImage"
>>>>>>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>>>>>>> >> <bean id="generateThumbs"
>>>>>>>> >> class="org.openmeetings.app.documents.GenerateThumbs" />
>>>>>>>> >> <bean id="generatePDF"
>>>>>>>> >> class="org.openmeetings.app.documents.GeneratePDF" />
>>>>>>>> >> <bean id="mailHandler"
>>>>>>>> >> class="org.openmeetings.utils.mail.MailHandler" />
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>>> >> simplified.xml (original)
>>>>>>>> >> +++
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>>> >> simplified.xml Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>>> >> traditional.xml (original)
>>>>>>>> >> +++
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>>> >> traditional.xml Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>>>> >> (studIP).xml (original)
>>>>>>>> >> +++
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>>>> >> (studIP).xml Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>>>> >> brazil.xml (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>>>> >> brazil.xml Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Ромеронабиратель SIP</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Mon
>>>>>>>> >> Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>>> >> <value>Edit details</value>
>>>>>>>> >> </string>
>>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>>> >> + </string>
>>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>>> >> + <value>Call</value>
>>>>>>>> >> + </string>
>>>>>>>> >> </language>
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -225,8 +225,9 @@ of the red5-servlet
>>>>>>>> >> -->
>>>>>>>> >> <!-- Quality-Modus *normal* -->
>>>>>>>> >> <microphoneRateNormal>22</microphoneRateNormal>
>>>>>>>> >> -<!-- Microphone Settings Quality-Modus *best* -->
>>>>>>>> >> -<microphoneRateBest>44</microphoneRateBest>
>>>>>>>> >> +<!-- Microphone Settings Quality-Modus *best* -->
>>>>>>>> >> +<!-- TODO: red5sip support only 8 -->
>>>>>>>> >> +<microphoneRateBest>44</microphoneRateBest>
>>>>>>>> >>
>>>>>>>> >> <!--
>>>>>>>> >> The Size of the Whiteboard
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -47,7 +47,8 @@
>>>>>>>> >> <confmenucommand id="cmd_importFile"
>>>>>>>> >> onselect="canvas.doActionmenu('importFile')"
>>>>>>>> key="['ALT','Shift','I']"/>
>>>>>>>> >> <confmenucommand id="cmd_editCamMicSettings"
>>>>>>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"
>>>>>>>> >> key="['ALT','Shift','1']"/>
>>>>>>>> >> <confmenucommand id="cmd_editBoardSettings"
>>>>>>>> >> onselect="canvas.doActionmenu('editBoardSettings')"
>>>>>>>> >> key="['ALT','Shift','2']"/>
>>>>>>>> >> - <confmenucommand id="cmd_quit"
>>>>>>>> onselect="canvas.doActionmenu('quit')"
>>>>>>>> >> key="['ALT','Shift','E']"/>
>>>>>>>> >> + <confmenucommand id="cmd_quit"
>>>>>>>> onselect="canvas.doActionmenu('quit')"
>>>>>>>> >> key="['ALT','Shift','E']"/>
>>>>>>>> >> + <confmenucommand id="cmd_showSipDialer"
>>>>>>>> >> onselect="canvas.doActionmenu('showSipDialer')"
>>>>>>>> key="['ALT','Shift','D']" />
>>>>>>>> >>
>>>>>>>> >> <confmenucommand id="cmd_applyforMod_nokey"
>>>>>>>> >> onselect="canvas.doActionmenu('applyForMod')" />
>>>>>>>> >> <confmenucommand id="cmd_createPoll_nokey"
>>>>>>>> >> onselect="canvas.doActionmenu('createPoll')" />
>>>>>>>> >> @@ -56,7 +57,8 @@
>>>>>>>> >> <confmenucommand id="cmd_importFile_nokey"
>>>>>>>> >> onselect="canvas.doActionmenu('importFile')" />
>>>>>>>> >> <confmenucommand id="cmd_editCamMicSettings_nokey"
>>>>>>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"/>
>>>>>>>> >> <confmenucommand id="cmd_editBoardSettings_nokey"
>>>>>>>> >> onselect="canvas.doActionmenu('editBoardSettings')" />
>>>>>>>> >> - <confmenucommand id="cmd_quit_nokey"
>>>>>>>> >> onselect="canvas.doActionmenu('quit')" />
>>>>>>>> >> + <confmenucommand id="cmd_quit_nokey"
>>>>>>>> >> onselect="canvas.doActionmenu('quit')" />
>>>>>>>> >> + <confmenucommand id="cmd_showSipDialer_nokey"
>>>>>>>> >> onselect="canvas.doActionmenu('showSipDialer')" />
>>>>>>>> >>
>>>>>>>> >> <!--
>>>>>>>> >> <command id="cmd_browser_open"
>>>>>>>> >> onselect="canvas.doActionmenu('browser_open')"
>>>>>>>> key="['ALT','Shift','B']"/>
>>>>>>>> >> @@ -402,6 +404,8 @@
>>>>>>>> >> canvas.thishib.applyForModeration.doCall();
>>>>>>>> >> } else if (stringSub=='editCamMicSettings') {
>>>>>>>> >>
>>>>>>>> >> canvas._videocontainer._videoviewcontent.changeDevice();
>>>>>>>> >> + } else if (stringSub=='showSipDialer') {
>>>>>>>> >> + new
>>>>>>>> lz.sipDialer(canvas.main_content._content.inner);
>>>>>>>> >> } else if (stringSub=='editBoardSettings') {
>>>>>>>> >> new
>>>>>>>> >> lz.editWhiteboardDefault(canvas.main_content._content.inner);
>>>>>>>> >> } else if (stringSub=='quit') {
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -47,9 +47,9 @@
>>>>>>>> >> </method>
>>>>>>>> >> </class>
>>>>>>>> >>
>>>>>>>> >> - <!--- Menu for public/private conference and audience
>>>>>>>> room. This
>>>>>>>> >> class shows
>>>>>>>> >> - exit, moderator, file, setteings and poll menu.
>>>>>>>> Those menu
>>>>>>>> >> items are connected
>>>>>>>> >> - to each command that has been declared in
>>>>>>>> >> base/mainMethods.lzx. May 24 2008
>>>>>>>> >> + <!--- Menu for public/private conference and audience
>>>>>>>> room. This
>>>>>>>> >> class shows
>>>>>>>> >> + exit, moderator, file, setteings and poll menu.
>>>>>>>> Those menu
>>>>>>>> >> items are connected
>>>>>>>> >> + to each command that has been declared in
>>>>>>>> >> base/mainMethods.lzx. May 24 2008
>>>>>>>> >> commented by onokeiji@gmail.com -->
>>>>>>>> >> <class name="conferenceMenubar" extends="menubar"
>>>>>>>> height="28"
>>>>>>>> >> style="itemStyle">
>>>>>>>> >> @@ -83,7 +83,7 @@
>>>>>>>> >> parent._exitbtn.destroy();
>>>>>>>> >> }
>>>>>>>> >> }
>>>>>>>> >> -
>>>>>>>> >> +
>>>>>>>> >> if(canvas.isrtl == 'true'){
>>>>>>>> >> if ($debug) Debug.write("onInit :
>>>>>>>> Setting
>>>>>>>> >> nokey");
>>>>>>>> >>
>>>>>>>> lblImport.setCommand(cmd_importFile_nokey);
>>>>>>>> >> @@ -92,11 +92,11 @@
>>>>>>>> >> </handler>
>>>>>>>> >> <_labelMenuItem id="lblImport"
>>>>>>>> labelid="15"
>>>>>>>> >> command="cmd_importFile"
>>>>>>>> enabled="${
>>>>>>>> >> canvas.ismoderator }" />
>>>>>>>> >> - <!-- <menuseparator/> <_labelMenuItem
>>>>>>>> >> labelid="561" command="cmd_exportFilePNG"
>>>>>>>> >> - /> <_labelMenuItem labelid="562"
>>>>>>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>>>>>>> >> - labelid="563"
>>>>>>>> command="cmd_exportFilePDF"
>>>>>>>> >> /> <_labelMenuItem labelid="560"
>>>>>>>> >> - command="cmd_exportFileSVG" />
>>>>>>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>>>>>>> >> - /> <menuseparator/>
>>>>>>>> <_labelMenuItem
>>>>>>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>>>>>>> >> + <!-- <menuseparator/> <_labelMenuItem
>>>>>>>> >> labelid="561" command="cmd_exportFilePNG"
>>>>>>>> >> + /> <_labelMenuItem labelid="562"
>>>>>>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>>>>>>> >> + labelid="563"
>>>>>>>> command="cmd_exportFilePDF"
>>>>>>>> >> /> <_labelMenuItem labelid="560"
>>>>>>>> >> + command="cmd_exportFileSVG" />
>>>>>>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>>>>>>> >> + /> <menuseparator/>
>>>>>>>> <_labelMenuItem
>>>>>>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>>>>>>> >> value="quit" /> -->
>>>>>>>> >> </_labelMenu>
>>>>>>>> >>
>>>>>>>> >> @@ -104,7 +104,7 @@
>>>>>>>> >>
>>>>>>>> >> <handler name="oninit">
>>>>>>>> >> <![CDATA[
>>>>>>>> >> -
>>>>>>>> >> +
>>>>>>>> >> if(canvas.isrtl == 'true'){
>>>>>>>> >> if ($debug) Debug.write("onInit :
>>>>>>>> Setting
>>>>>>>> >> nokey");
>>>>>>>> >>
>>>>>>>> >> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
>>>>>>>> >> @@ -112,6 +112,7 @@
>>>>>>>> >>
>>>>>>>> lblPoll.setCommand(cmd_createPoll_nokey);
>>>>>>>> >>
>>>>>>>> >> lblPollResult.setCommand(cmd_pollResults_nokey);
>>>>>>>> >>
>>>>>>>> >> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
>>>>>>>> >> +
>>>>>>>> >> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
>>>>>>>> >> }
>>>>>>>> >> //hideActionsMenu
>>>>>>>> >>
>>>>>>>> if(canvas.currentRoomObj.hideActionsMenu){
>>>>>>>> >> @@ -133,7 +134,7 @@
>>>>>>>> >> </handler>
>>>>>>>> >> </_labelMenuItem>
>>>>>>>> >> <menuseparator />
>>>>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>>> >> canvas.ismoderator }" />
>>>>>>>> <menuseparator/>
>>>>>>>> >> -->
>>>>>>>> >> <_labelMenuItem id="lblCamMic"
>>>>>>>> labelid="306"
>>>>>>>> >> command="cmd_editCamMicSettings"
>>>>>>>> />
>>>>>>>> >> @@ -177,14 +178,17 @@
>>>>>>>> >> <_labelMenuItem width="250"
>>>>>>>> id="lblPollVote"
>>>>>>>> >> labelid="42"
>>>>>>>> >> command="cmd_checkPollVoted" />
>>>>>>>> >> <menuseparator />
>>>>>>>> >> + <_labelMenuItem width="250" id="lblShowSipDialer"
>>>>>>>> >> labelid="1447"
>>>>>>>> >> + command="cmd_showSipDialer" />
>>>>>>>> >> + <menuseparator />
>>>>>>>> >> <_labelMenuItem width="250" labelid="1126"
>>>>>>>> >>
>>>>>>>> command="cmd_editWhiteboardDefault" />
>>>>>>>> >> </_labelMenu>
>>>>>>>> >> -
>>>>>>>> >> - <!-- exit room <_labelMenu labelid="308"
>>>>>>>> width="250">
>>>>>>>> >> </_labelMenu> <_labelMenu
>>>>>>>> >> - labelid="301" width="250">
>>>>>>>> <_labelMenuItem
>>>>>>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>>>>>>> >> - /> </_labelMenu> <_labelMenu
>>>>>>>> labelid="305"
>>>>>>>> >> width="250"> <_labelMenuItem labelid="306"
>>>>>>>> >> - command="cmd_editCamMicSettings" />
>>>>>>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>>>>>>> >> +
>>>>>>>> >> + <!-- exit room <_labelMenu labelid="308"
>>>>>>>> width="250">
>>>>>>>> >> </_labelMenu> <_labelMenu
>>>>>>>> >> + labelid="301" width="250">
>>>>>>>> <_labelMenuItem
>>>>>>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>>>>>>> >> + /> </_labelMenu> <_labelMenu
>>>>>>>> labelid="305"
>>>>>>>> >> width="250"> <_labelMenuItem labelid="306"
>>>>>>>> >> + command="cmd_editCamMicSettings" />
>>>>>>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>>>>>>> >> /> </_labelMenu> <_labelMenu labelid="303"
>>>>>>>> >> width="250"> </_labelMenu> -->
>>>>>>>> >>
>>>>>>>> >> </class>
>>>>>>>> >> @@ -258,7 +262,7 @@
>>>>>>>> >> </handler>
>>>>>>>> >> </_labelMenuItem>
>>>>>>>> >> <menuseparator />
>>>>>>>> >> - <!-- <_labelMenuItem
>>>>>>>> labelid="749"
>>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>>> >> + <!-- <_labelMenuItem
>>>>>>>> labelid="749"
>>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>>> >> canvas.ismoderator }" />
>>>>>>>> >> <menuseparator/> -->
>>>>>>>> >> <_labelMenuItem labelid="306"
>>>>>>>> >> command="cmd_editCamMicSettings"
>>>>>>>> >> enabled="${
>>>>>>>> canvas.ismoderator }" />
>>>>>>>> >> @@ -358,7 +362,7 @@
>>>>>>>> >> </handler>
>>>>>>>> >> </_labelMenuItem>
>>>>>>>> >> <menuseparator />
>>>>>>>> >> - <!-- <_labelMenuItem
>>>>>>>> labelid="749"
>>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>>> >> + <!-- <_labelMenuItem
>>>>>>>> labelid="749"
>>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>>> >> canvas.ismoderator }" />
>>>>>>>> >> <menuseparator/> -->
>>>>>>>> >> <_labelMenuItem labelid="306"
>>>>>>>> >> command="cmd_editCamMicSettings"
>>>>>>>> >> enabled="${
>>>>>>>> canvas.ismoderator }" />
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -65,6 +65,7 @@
>>>>>>>> >> <include href="restricted/" />
>>>>>>>> >> <include href="browser/" />
>>>>>>>> >> <include href="testsetup/" />
>>>>>>>> >> + <include href="sip/" />
>>>>>>>> >>
>>>>>>>> >> <include href="flexibleConferenceRoom/" />
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,6 @@
>>>>>>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>>>>>>> >> +<library>
>>>>>>>> >> +
>>>>>>>> >> + <include href="sipDialer.lzx" />
>>>>>>>> >> +
>>>>>>>> >> +</library>
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,81 @@
>>>>>>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>>>>>>> >> +<library>
>>>>>>>> >> +
>>>>>>>> >> +<class name="sipDialer" extends="window" bgcolor="gray"
>>>>>>>> width="200">
>>>>>>>> >> + <simplelayout axis="y" spacing="5"/>
>>>>>>>> >> + <labelText labelid="1003"/>
>>>>>>>> >> + <view name="phoneNumber" width="100%">
>>>>>>>> >> + <inputtext name="input"
>>>>>>>> >> width="$once{parent.width-parent.del.width}" height="20"
>>>>>>>> bgcolor="white"/>
>>>>>>>> >> + <button name="del" x="$once{parent.input.width}"
>>>>>>>> width="30"
>>>>>>>> >> height="20" onclick="this.del();">
>>>>>>>> >> + â†
>>>>>>>> >> + <method name="del">
>>>>>>>> >> + var t = parent.input.text;
>>>>>>>> >> + if(t.length != 0) {
>>>>>>>> >> + t = t.substr(0, t.length - 1);
>>>>>>>> >> + parent.input.setAttribute('text', t);
>>>>>>>> >> + }
>>>>>>>> >> + </method>
>>>>>>>> >> + </button>
>>>>>>>> >> + </view>
>>>>>>>> >> +
>>>>>>>> >> + <view name="dialerButtons" align="center">
>>>>>>>> >> + <vbox spacing="5">
>>>>>>>> >> + <hbox spacing="5">
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('1')"
>>>>>>>> >> width="40">1</button>
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('2')"
>>>>>>>> >> width="40">2</button>
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('3')"
>>>>>>>> >> width="40">3</button>
>>>>>>>> >> + </hbox>
>>>>>>>> >> + <hbox spacing="5">
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('4')"
>>>>>>>> >> width="40">4</button>
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('5')"
>>>>>>>> >> width="40">5</button>
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('6')"
>>>>>>>> >> width="40">6</button>
>>>>>>>> >> + </hbox>
>>>>>>>> >> + <hbox spacing="5">
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('7')"
>>>>>>>> >> width="40">7</button>
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('8')"
>>>>>>>> >> width="40">8</button>
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('9')"
>>>>>>>> >> width="40">9</button>
>>>>>>>> >> + </hbox>
>>>>>>>> >> + <hbox spacing="5">
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('*')"
>>>>>>>> >> width="40">*</button>
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('0')"
>>>>>>>> >> width="40">0</button>
>>>>>>>> >> + <button
>>>>>>>> onclick="parent.parent.parent.parent.dial('#')"
>>>>>>>> >> width="40">#</button>
>>>>>>>> >> + </hbox>
>>>>>>>> >> + </vbox>
>>>>>>>> >> + </view>
>>>>>>>> >> + <hbox spacing="10" align="center">
>>>>>>>> >> + <simpleLabelButton labelid="1448" name="callButton">
>>>>>>>> >> + <handler name="onclick">
>>>>>>>> >> + parent.parent.joinToConfCall.doCall();
>>>>>>>> >> + </handler>
>>>>>>>> >> + </simpleLabelButton>
>>>>>>>> >> + <simpleLabelButton labelid="85" name="closeButton">
>>>>>>>> >> + <handler name="onclick">
>>>>>>>> >> + canvas.sipDialer = null;
>>>>>>>> >> + parent.parent.destroy();
>>>>>>>> >> + </handler>
>>>>>>>> >> + </simpleLabelButton>
>>>>>>>> >> + </hbox>
>>>>>>>> >> + <handler name="oninit">
>>>>>>>> >> + if(canvas.sipDialer != null) {
>>>>>>>> >> + canvas.sipDialer.destroy();
>>>>>>>> >> + }
>>>>>>>> >> + canvas.setAttribute('sipDialer', this);
>>>>>>>> >> + this.bringToFront();
>>>>>>>> >> + </handler>
>>>>>>>> >> +
>>>>>>>> >> + <method name="dial" args="digit">
>>>>>>>> >> + this.phoneNumber.input.setAttribute('text',
>>>>>>>> >> this.phoneNumber.input.text + digit);
>>>>>>>> >> + </method>
>>>>>>>> >> +
>>>>>>>> >> + <netRemoteCallHib name="joinToConfCall"
>>>>>>>> funcname="joinToConfCall"
>>>>>>>> >> remotecontext="$once{ canvas.thishib }">
>>>>>>>> >> + <netparam><method name="getValue">return
>>>>>>>> >> parent.parent.phoneNumber.input.text</method></netparam>
>>>>>>>> >> + <handler name="ondata" args="value">
>>>>>>>> >> + <![CDATA[
>>>>>>>> >> + //The onResult-Handler will be called be the
>>>>>>>> rtmpconnection
>>>>>>>> >> + if($debug) Debug.write("joinToConfCall : ",value);
>>>>>>>> >> + ]]>
>>>>>>>> >> + </handler>
>>>>>>>> >> + </netRemoteCallHib>
>>>>>>>> >> +</class>
>>>>>>>> >> +
>>>>>>>> >> +</library>
>>>>>>>> >> \ No newline at end of file
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -67,6 +67,9 @@
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
>>>>>>>> >>
>>>>>>>> >> <class>org.openmeetings.app.persistence.beans.user.Users</class>
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
>>>>>>>> >> +
>>>>>>>> >>
>>>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
>>>>>>>> >> +
>>>>>>>> >>
>>>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
>>>>>>>> >> +
>>>>>>>> >>
>>>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
>>>>>>>> >>
>>>>>>>> <exclude-unlisted-classes>false</exclude-unlisted-classes>
>>>>>>>> >> <properties>
>>>>>>>> >> <property
>>>>>>>> >> name="openjpa.ConnectionProperties"
>>>>>>>> >> @@ -83,7 +86,8 @@
>>>>>>>> >> <property name="openjpa.Log"
>>>>>>>> >> value="DefaultLevel=WARN, Tool=INFO" />
>>>>>>>> >> <property
>>>>>>>> >> name="openjpa.ConnectionDriverName"
>>>>>>>> >> value="org.apache.commons.dbcp.BasicDataSource"/>
>>>>>>>> >> <property name="openjpa.DataCache"
>>>>>>>> >> value="true"/>
>>>>>>>> >> - <property
>>>>>>>> name="openjpa.QueryCache"
>>>>>>>> >> value="true"/>
>>>>>>>> >> + <!-- QueryCache disabled due to changes outside
>>>>>>>> of JPA
>>>>>>>> >> doesn't take effect with caching -->
>>>>>>>> >> + <property
>>>>>>>> name="openjpa.QueryCache"
>>>>>>>> >> value="false"/>
>>>>>>>> >> <property
>>>>>>>> name="openjpa.jdbc.DBDictionary"
>>>>>>>> >> value="batchLimit=100,tableType=myisam"/>
>>>>>>>> >> <property
>>>>>>>> name="openjpa.jdbc.QuerySQLCache"
>>>>>>>> >> value="false"/>
>>>>>>>> >> </properties>
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Mon
>>>>>>>> >> Mar 26 09:14:15 2012
>>>>>>>> >> @@ -331,7 +331,36 @@ function checkEmail()
>>>>>>>> >>
>>>>>>>> >> </i></p>
>>>>>>>> >>
>>>>>>>> >> - </fieldset>
>>>>>>>> >> + </fieldset>
>>>>>>>> >> +
>>>>>>>> >> + <fieldset id="red5sip">
>>>>>>>> >> + <legend>red5SIP Configuration</legend>
>>>>>>>> >> +
>>>>>>>> >> + <li>
>>>>>>>> >> + <label for="red5sip_enable">Enable SIP</label>
>>>>>>>> >> + <select name="red5sip_enable" id="red5sip_enable"
>>>>>>>> size="1">
>>>>>>>> >> + <option value="yes">Yes</option>
>>>>>>>> >> + <option value="no" selected>No</option>
>>>>>>>> >> + </select><br />
>>>>>>>> >> + </li>
>>>>>>>> >> + <p><i>
>>>>>>>> >> + Enable red5SIP integration
>>>>>>>> >> + </i></p>
>>>>>>>> >> + <br />
>>>>>>>> >> +
>>>>>>>> >> + <li>
>>>>>>>> >> + <label for="red5sip_room_prefix">SIP rooms
>>>>>>>> prefix</label>
>>>>>>>> >> + <input name="red5sip_room_prefix"
>>>>>>>> id="red5sip_room_prefix"
>>>>>>>> >> size="27" title="" type="text" value="400" />
>>>>>>>> >> + <p><i>Prefix for phone number of conference
>>>>>>>> rooms</i></p>
>>>>>>>> >> + </li>
>>>>>>>> >> +
>>>>>>>> >> + <li>
>>>>>>>> >> + <label for="red5sip_exten_context">SIP extensions
>>>>>>>> context</label>
>>>>>>>> >> + <input name="red5sip_exten_context"
>>>>>>>> id="red5sip_exten_context"
>>>>>>>> >> size="27" title="" type="text" value="rooms" />
>>>>>>>> >> + <p><i>Context of Asterisk extensions</i></p>
>>>>>>>> >> + </li>
>>>>>>>> >> +
>>>>>>>> >> + </fieldset>
>>>>>>>> >>
>>>>>>>> >> <fieldset id="sip">
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
>>>>>>>> >>
>>>>>>>> >> import org.openmeetings.app.conference.session.RoomClient;
>>>>>>>> >> import org.openmeetings.app.data.basic.AuthLevelmanagement;
>>>>>>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>>>>>>> >> import org.openmeetings.app.data.beans.basic.SearchResult;
>>>>>>>> >> import
>>>>>>>> org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
>>>>>>>> >> import org.openmeetings.app.data.user.Organisationmanagement;
>>>>>>>> >> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.persistence.beans.basic.Configuration;
>>>>>>>> >> import
>>>>>>>> org.openmeetings.app.persistence.beans.domain.Organisation_Users;
>>>>>>>> >> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
>>>>>>>> >> import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>>>>>>> >> import
>>>>>>>> org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
>>>>>>>> >> import
>>>>>>>> org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
>>>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>>>> >> import org.openmeetings.app.persistence.beans.user.Users;
>>>>>>>> >> import org.openmeetings.app.remote.red5.ClientListManager;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>>>> >> +import
>>>>>>>> >>
>>>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>>>> >> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
>>>>>>>> >> import org.red5.logging.Red5LoggerFactory;
>>>>>>>> >> import org.slf4j.Logger;
>>>>>>>> >> @@ -71,6 +78,8 @@ public class Roommanagement {
>>>>>>>> >> @Autowired
>>>>>>>> >> private OpenXGHttpClient openXGHttpClient;
>>>>>>>> >> @Autowired
>>>>>>>> >> + private AsteriskDbSipClient asteriskDbSipClient;
>>>>>>>> >> + @Autowired
>>>>>>>> >> private RoomModeratorsDaoImpl roomModeratorsDao;
>>>>>>>> >> @Autowired
>>>>>>>> >> private UsersDaoImpl usersDao;
>>>>>>>> >> @@ -78,6 +87,8 @@ public class Roommanagement {
>>>>>>>> >> private AuthLevelmanagement authLevelManagement;
>>>>>>>> >> @Autowired
>>>>>>>> >> private ClientListManager clientListManager;
>>>>>>>> >> + @Autowired
>>>>>>>> >> + private Configurationmanagement cfgManagement;
>>>>>>>> >>
>>>>>>>> >> /**
>>>>>>>> >> * add a new Record to the table roomtypes
>>>>>>>> >> @@ -102,6 +113,20 @@ public class Roommanagement {
>>>>>>>> >>
>>>>>>>> >> public Long addRoom(Rooms room) {
>>>>>>>> >> try {
>>>>>>>> >> + /* Red5SIP integration
>>>>>>>> >>
>>>>>>>> *******************************************************************************/
>>>>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>>>>> >> "red5sip.enable");
>>>>>>>> >> + if(conf != null &&
>>>>>>>> conf.getConf_value().equals("yes")) {
>>>>>>>> >> + if(room.getSipNumber() != null &&
>>>>>>>> >> !room.getSipNumber().isEmpty()) {
>>>>>>>> >> + asteriskDbSipClient.createSIPConference(new
>>>>>>>> >> SIPCreateConferenceRequest(room.getSipNumber()));
>>>>>>>> >> + } else {
>>>>>>>> >> + SipCreateConferenceRequestResult
>>>>>>>> requestResult =
>>>>>>>> >> asteriskDbSipClient.createSIPConference(new
>>>>>>>> SIPCreateConferenceRequest());
>>>>>>>> >> + if(!requestResult.hasError()) {
>>>>>>>> >> +
>>>>>>>> >> room.setSipNumber(requestResult.getConferenceNumber());
>>>>>>>> >> +
>>>>>>>> >> room.setConferencePin(requestResult.getConferencePin());
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >>
>>>>>>>> /*****************************************************************************************************/
>>>>>>>> >> room.setStarttime(new Date());
>>>>>>>> >> room = em.merge(room);
>>>>>>>> >> long returnId = room.getRooms_id();
>>>>>>>> >> @@ -719,6 +744,25 @@ public class Roommanagement {
>>>>>>>> >> return null;
>>>>>>>> >> }
>>>>>>>> >>
>>>>>>>> >> + /**
>>>>>>>> >> + * Returns number of SIP conference participants
>>>>>>>> >> + * @param rooms_id id of room
>>>>>>>> >> + * @return number of participants
>>>>>>>> >> + */
>>>>>>>> >> + public Integer getSipConferenceMembersNumber(Long rooms_id)
>>>>>>>> {
>>>>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>>>>> >> "red5sip.enable");
>>>>>>>> >> + if(conf != null && conf.getConf_value().equals("yes")) {
>>>>>>>> >> + Rooms rooms = this.getRoomById(rooms_id);
>>>>>>>> >> + if(rooms != null) {
>>>>>>>> >> + return
>>>>>>>> >>
>>>>>>>> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
>>>>>>>> >> + } else {
>>>>>>>> >> + return 0;
>>>>>>>> >> + }
>>>>>>>> >> + } else {
>>>>>>>> >> + return null;
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> /**
>>>>>>>> >> * adds a new Record to the table rooms
>>>>>>>> >> * @param name
>>>>>>>> >> @@ -793,6 +837,19 @@ public class Roommanagement {
>>>>>>>> >>
>>>>>>>> >> r.setConferencePin(openXGReturnObject.getConferencePin());
>>>>>>>> >> }
>>>>>>>> >>
>>>>>>>> >> + /* Red5SIP integration
>>>>>>>> >>
>>>>>>>> *******************************************************************************/
>>>>>>>> >> + Configuration conf =
>>>>>>>> cfgManagement.getConfKey(3L,
>>>>>>>> >> "red5sip.enable");
>>>>>>>> >> + if(conf != null &&
>>>>>>>> conf.getConf_value().equals("yes")) {
>>>>>>>> >> + SipCreateConferenceRequestResult
>>>>>>>> requestResult =
>>>>>>>> >> asteriskDbSipClient
>>>>>>>> >> + .createSIPConference(new
>>>>>>>> >> SIPCreateConferenceRequest());
>>>>>>>> >> +
>>>>>>>> >> + if(!requestResult.hasError()) {
>>>>>>>> >> +
>>>>>>>> >> r.setSipNumber(requestResult.getConferenceNumber());
>>>>>>>> >> +
>>>>>>>> >> r.setConferencePin(requestResult.getConferencePin());
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >>
>>>>>>>> /*****************************************************************************************************/
>>>>>>>> >> +
>>>>>>>> >> r = em.merge(r);
>>>>>>>> >> long returnId = r.getRooms_id();
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -252,7 +252,8 @@ public class ImportInitvalues {
>>>>>>>> >> String openxg_client_domain, String
>>>>>>>> >> openxg_community_code,
>>>>>>>> >> String openxg_language_code, String
>>>>>>>> openxg_adminid,
>>>>>>>> >> String sip_language_phonecode, String
>>>>>>>> >> sip_phonerange_start,
>>>>>>>> >> - String sip_phonerange, String jodPath) {
>>>>>>>> >> + String sip_phonerange, String jodPath,
>>>>>>>> >> + String red5sip_enable, String
>>>>>>>> red5sip_room_prefix,String
>>>>>>>> >> red5sip_exten_context) {
>>>>>>>> >>
>>>>>>>> >> cfgManagement
>>>>>>>> >> .addConfByKey(
>>>>>>>> >> @@ -349,6 +350,18 @@ public class ImportInitvalues {
>>>>>>>> >> cfgManagement.addConfByKey(3,
>>>>>>>> "default.rpc.userid", "" + 1,
>>>>>>>> >> null,
>>>>>>>> >> "The User-Id of the Control User
>>>>>>>> in
>>>>>>>> >> OpenMeetings");
>>>>>>>> >>
>>>>>>>> >> + // ***************************************
>>>>>>>> >> + // ***************************************
>>>>>>>> >> + // red5SIP Integration Coniguration Values
>>>>>>>> >> + // ***************************************
>>>>>>>> >> +
>>>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.enable",
>>>>>>>> red5sip_enable,
>>>>>>>> >> null,
>>>>>>>> >> + "Enable to enable the red5SIP
>>>>>>>> integration
>>>>>>>> >> ");
>>>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
>>>>>>>> >> red5sip_room_prefix, null,
>>>>>>>> >> + "Enable to enable the red5SIP
>>>>>>>> integration
>>>>>>>> >> ");
>>>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
>>>>>>>> >> red5sip_exten_context, null,
>>>>>>>> >> + "Enable to enable the red5SIP
>>>>>>>> integration
>>>>>>>> >> ");
>>>>>>>> >> +
>>>>>>>> >> // ***************************************
>>>>>>>> >> // ***************************************
>>>>>>>> >> // SIP Applet Configuration Values
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -19,6 +19,7 @@
>>>>>>>> >> package org.openmeetings.app.remote.red5;
>>>>>>>> >>
>>>>>>>> >> import java.io.File;
>>>>>>>> >> +import java.io.IOException;
>>>>>>>> >> import java.util.ArrayList;
>>>>>>>> >> import java.util.Collection;
>>>>>>>> >> import java.util.Date;
>>>>>>>> >> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
>>>>>>>> >> return null;
>>>>>>>> >> }
>>>>>>>> >>
>>>>>>>> >> + public synchronized List<Integer> listRoomBroadcast() {
>>>>>>>> >> + List<Integer> broadcastList = new ArrayList<Integer>();
>>>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>>>> >> + String streamid = current.getClient().getId();
>>>>>>>> >> + Collection<Set<IConnection>> conCollection =
>>>>>>>> >> current.getScope().getConnections();
>>>>>>>> >> + for (Set<IConnection> conset : conCollection) {
>>>>>>>> >> + for (IConnection conn : conset) {
>>>>>>>> >> + if (conn != null) {
>>>>>>>> >> + RoomClient rcl = this.clientListManager
>>>>>>>> >> + .getClientByStreamId(conn
>>>>>>>> >> + .getClient().getId());
>>>>>>>> >> + if (rcl == null) {
>>>>>>>> >> + // continue;
>>>>>>>> >> + } else if (rcl.getIsScreenClient() != null
>>>>>>>> >> + && rcl.getIsScreenClient()) {
>>>>>>>> >> + // continue;
>>>>>>>> >> + } else {
>>>>>>>> >> + if
>>>>>>>> (!streamid.equals(rcl.getStreamid())) {
>>>>>>>> >> + // It is not needed to send back
>>>>>>>> >> + // that event to the actuall
>>>>>>>> >> + // Moderator
>>>>>>>> >> + // as it will be already triggered
>>>>>>>> >> + // in the result of this Function
>>>>>>>> >> + // in the Client
>>>>>>>> >> +
>>>>>>>> >>
>>>>>>>> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + return broadcastList;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> +
>>>>>>>> >> /**
>>>>>>>> >> * this function is invoked directly after initial
>>>>>>>> connecting
>>>>>>>> >> *
>>>>>>>> >> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
>>>>>>>> >> }
>>>>>>>> >> return null;
>>>>>>>> >> }
>>>>>>>> >> +
>>>>>>>> >> + /*
>>>>>>>> >> + * SIP transport methods
>>>>>>>> >> + */
>>>>>>>> >> +
>>>>>>>> >> + public synchronized void updateSipTransport() {
>>>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>>>> >> + String streamid = current.getClient().getId();
>>>>>>>> >> + RoomClient currentClient =
>>>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>>>> >> + log.debug("getSipConferenceMembersNumber: " +
>>>>>>>> >>
>>>>>>>> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
>>>>>>>> >> + String newNumber =
>>>>>>>> >>
>>>>>>>> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
>>>>>>>> >> + if(!newNumber.equals(currentClient.getLastname())) {
>>>>>>>> >> + currentClient.setLastname(newNumber);
>>>>>>>> >> +
>>>>>>>> this.clientListManager.updateClientByStreamId(streamid,
>>>>>>>> >> currentClient);
>>>>>>>> >> + log.debug("updateSipTransport: {}, {}, {}, {}", new
>>>>>>>> >> Object[]{currentClient.getPublicSID(),
>>>>>>>> >> + currentClient.getRoom_id(),
>>>>>>>> >> currentClient.getFirstname(), currentClient.getLastname()});
>>>>>>>> >> + sendMessageWithClient(new
>>>>>>>> >>
>>>>>>>> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + /**
>>>>>>>> >> + * Perform call to specified phone number and join to
>>>>>>>> conference
>>>>>>>> >> + * @param number to call
>>>>>>>> >> + */
>>>>>>>> >> + public synchronized void joinToConfCall(String number) {
>>>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>>>> >> + String streamid = current.getClient().getId();
>>>>>>>> >> + RoomClient currentClient =
>>>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>>>> >> + Rooms rooms =
>>>>>>>> >> roommanagement.getRoomById(currentClient.getRoom_id());
>>>>>>>> >> + log.debug("asterisk -rx \"originate Local/" + number +
>>>>>>>> "@rooms
>>>>>>>> >> extension " + rooms.getSipNumber() + "@rooms\"");
>>>>>>>> >> + try {
>>>>>>>> >> + Process proc = Runtime.getRuntime().exec(new
>>>>>>>> >> String[]{"asterisk", "-rx", "originate Local/" + number +
>>>>>>>> "@rooms extension
>>>>>>>> >> " + rooms.getSipNumber() + "@rooms"});
>>>>>>>> >> + } catch (IOException e) {
>>>>>>>> >> + log.error("Executing asterisk originate error: ",
>>>>>>>> e);
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public synchronized String getSipNumber(Long room_id) {
>>>>>>>> >> + Rooms rooms = roommanagement.getRoomById(room_id);
>>>>>>>> >> + if(rooms != null) {
>>>>>>>> >> + log.debug("getSipNumber: room_id: {}, sipNumber:
>>>>>>>> {}", new
>>>>>>>> >> Object[]{room_id, rooms.getSipNumber()});
>>>>>>>> >> + return rooms.getSipNumber();
>>>>>>>> >> + }
>>>>>>>> >> + return null;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public synchronized void setSipTransport(Long room_id,
>>>>>>>> String
>>>>>>>> >> publicSID, String broadCastId) {
>>>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>>>> >> + String streamid = current.getClient().getId();
>>>>>>>> >> + Rooms room = roommanagement.getRoomById(room_id);
>>>>>>>> >> + // Notify all clients of the same scope (room)
>>>>>>>> >> + RoomClient currentClient =
>>>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>>>> >> + currentClient.setRoom_id(room_id);
>>>>>>>> >> + currentClient.setRoomEnter(new Date());
>>>>>>>> >> + currentClient.setFirstname("SIP Transport");
>>>>>>>> >> +
>>>>>>>> >>
>>>>>>>> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
>>>>>>>> >> +
>>>>>>>> currentClient.setBroadCastID(Long.parseLong(broadCastId));
>>>>>>>> >> + currentClient.setIsBroadcasting(true);
>>>>>>>> >> + currentClient.setPublicSID(publicSID);
>>>>>>>> >> + currentClient.setAvsettings("av");
>>>>>>>> >> + currentClient.setVWidth(120);
>>>>>>>> >> + currentClient.setVHeight(90);
>>>>>>>> >> + this.clientListManager.updateClientByStreamId(streamid,
>>>>>>>> >> currentClient);
>>>>>>>> >> +
>>>>>>>> >> + Collection<Set<IConnection>> conCollection = current
>>>>>>>> >> + .getScope().getConnections();
>>>>>>>> >> + for (Set<IConnection> conset : conCollection) {
>>>>>>>> >> + for (IConnection conn : conset) {
>>>>>>>> >> + if (conn != null) {
>>>>>>>> >> + RoomClient rcl =
>>>>>>>> >>
>>>>>>>> this.clientListManager.getClientByStreamId(conn.getClient().getId());
>>>>>>>> >> + if (rcl == null) {
>>>>>>>> >> + // continue;
>>>>>>>> >> + } else if (rcl.getIsScreenClient() != null
>>>>>>>> >> + && rcl.getIsScreenClient()) {
>>>>>>>> >> + // continue;
>>>>>>>> >> + } else {
>>>>>>>> >> + if
>>>>>>>> (!streamid.equals(rcl.getStreamid())) {
>>>>>>>> >> + // It is not needed to send back
>>>>>>>> >> + // that event to the actuall
>>>>>>>> >> + // Moderator
>>>>>>>> >> + // as it will be already triggered
>>>>>>>> >> + // in the result of this Function
>>>>>>>> >> + // in the Client
>>>>>>>> >> + if (conn instanceof
>>>>>>>> >> IServiceCapableConnection) {
>>>>>>>> >> + ((IServiceCapableConnection)
>>>>>>>> >> conn).invoke("addNewUser", new Object[]{currentClient}, this);
>>>>>>>> >> + ((IServiceCapableConnection)
>>>>>>>> >> conn).invoke("newStream", new Object[]{currentClient}, this);
>>>>>>>> >> + log.debug("sending
>>>>>>>> setSipTransport to "
>>>>>>>> >> + + conn);
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> + }
>>>>>>>> >> }
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,19 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api;
>>>>>>>> >> +
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>>>> >> +import
>>>>>>>> >>
>>>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>>>> >> +
>>>>>>>> >> +/**
>>>>>>>> >> + * SIP client interface
>>>>>>>> >> + */
>>>>>>>> >> +public interface ISIPClient {
>>>>>>>> >> +
>>>>>>>> >> + SIPCreateUserRequestResult
>>>>>>>> createSIPUser(SIPCreateUserRequest
>>>>>>>> >> request);
>>>>>>>> >> +
>>>>>>>> >> + SipCreateConferenceRequestResult
>>>>>>>> >> createSIPConference(SIPCreateConferenceRequest request);
>>>>>>>> >> +
>>>>>>>> >> + Integer getConferenceMembersNumber(String sipNumber);
>>>>>>>> >> +
>>>>>>>> >> +}
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,58 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api.impl.asterisk;
>>>>>>>> >> +
>>>>>>>> >> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>>>> >> +import org.openmeetings.app.sip.api.ISIPClient;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>>>> >> +import
>>>>>>>> >>
>>>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>>>>>>> >> +/**
>>>>>>>> >> + *
>>>>>>>> >> + */
>>>>>>>> >> +public class AsteriskDbSipClient implements ISIPClient {
>>>>>>>> >> +
>>>>>>>> >> + @Autowired
>>>>>>>> >> + private AsteriskDAOImpl asteriskDAO;
>>>>>>>> >> +
>>>>>>>> >> + public SIPCreateUserRequestResult createSIPUser(final
>>>>>>>> >> SIPCreateUserRequest request) {
>>>>>>>> >> + asteriskDAO.addSipUser(request.getLogin(),
>>>>>>>> request.getPassword());
>>>>>>>> >> + return new SIPCreateUserRequestResult() {
>>>>>>>> >> + @Override
>>>>>>>> >> + public UserSipData getUserSipData() {
>>>>>>>> >> + UserSipData sipData = new UserSipData();
>>>>>>>> >> + sipData.setAuthId(request.getLogin());
>>>>>>>> >> + sipData.setUserpass(request.getPassword());
>>>>>>>> >> + sipData.setUsername(request.getLogin());
>>>>>>>> >> + return sipData;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public boolean hasError() {
>>>>>>>> >> + return false;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getErrorMessage() {
>>>>>>>> >> + return null;
>>>>>>>> >> + }
>>>>>>>> >> + };
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public SipCreateConferenceRequestResult
>>>>>>>> >> createSIPConference(SIPCreateConferenceRequest request) {
>>>>>>>> >> + String confno = asteriskDAO.addMeetMeConference();
>>>>>>>> >> + return new SipCreateConferenceRequestResult(confno, "")
>>>>>>>> {
>>>>>>>> >> + public boolean hasError() {
>>>>>>>> >> + return false;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getErrorMessage() {
>>>>>>>> >> + return null;
>>>>>>>> >> + }
>>>>>>>> >> + };
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public Integer getConferenceMembersNumber(String sipNumber)
>>>>>>>> {
>>>>>>>> >> + return asteriskDAO.getConferensMembersNumber(sipNumber);
>>>>>>>> >> + }
>>>>>>>> >> +}
>>>>>>>> >> \ No newline at end of file
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,76 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
>>>>>>>> >> +
>>>>>>>> >> +import org.openmeetings.app.OpenmeetingsVariables;
>>>>>>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.persistence.beans.basic.Configuration;
>>>>>>>> >> +import
>>>>>>>> >>
>>>>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
>>>>>>>> >> +import
>>>>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
>>>>>>>> >> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
>>>>>>>> >> +import org.red5.logging.Red5LoggerFactory;
>>>>>>>> >> +import org.slf4j.Logger;
>>>>>>>> >> +import org.springframework.transaction.annotation.Transactional;
>>>>>>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>>>>>>> >> +
>>>>>>>> >> +import javax.persistence.EntityManager;
>>>>>>>> >> +import javax.persistence.PersistenceContext;
>>>>>>>> >> +
>>>>>>>> >> +@Transactional
>>>>>>>> >> +public class AsteriskDAOImpl {
>>>>>>>> >> +
>>>>>>>> >> + private static final Logger log =
>>>>>>>> >> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
>>>>>>>> >> OpenmeetingsVariables.webAppRootKey);
>>>>>>>> >> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
>>>>>>>> >> + @PersistenceContext
>>>>>>>> >> + private EntityManager em;
>>>>>>>> >> + @Autowired
>>>>>>>> >> + private Configurationmanagement cfgManagement;
>>>>>>>> >> +
>>>>>>>> >> + public void addSipUser(String username, String secret) {
>>>>>>>> >> + AsteriskSipUsers u = new AsteriskSipUsers();
>>>>>>>> >> + Configuration conf =
>>>>>>>> >> cfgManagement.getConfKey(3L,"red5sip.exten_context");
>>>>>>>> >> + String defaultRoomContext = "rooms";
>>>>>>>> >> + if(conf != null && !conf.getConf_value().isEmpty()) {
>>>>>>>> >> + defaultRoomContext = conf.getConf_value();
>>>>>>>> >> + }
>>>>>>>> >> + u.setName(username);
>>>>>>>> >> + u.setSecret(secret);
>>>>>>>> >> + u.setContext(defaultRoomContext);
>>>>>>>> >> + u.setHost("dynamic");
>>>>>>>> >> + Extensions e = new Extensions();
>>>>>>>> >> + e.setApp("Dial");
>>>>>>>> >> + e.setAppdata("SIP/" + username);
>>>>>>>> >> + e.setExten(username);
>>>>>>>> >> + e.setContext(defaultRoomContext);
>>>>>>>> >> + e.setPriority(1);
>>>>>>>> >> + em.persist(u);
>>>>>>>> >> + em.persist(e);
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String addMeetMeConference() {
>>>>>>>> >> + int count = ((Number)em.createQuery("SELECT
>>>>>>>> COUNT(m.confno) FROM
>>>>>>>> >> MeetMe AS m").getSingleResult()).intValue();
>>>>>>>> >> +
>>>>>>>> >> + Configuration conf =
>>>>>>>> >> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
>>>>>>>> >> + String prefix = DEFAULT_SIP_CONTEXT;
>>>>>>>> >> + if(conf != null) {
>>>>>>>> >> + prefix = conf.getConf_value();
>>>>>>>> >> + }
>>>>>>>> >> + String confno = prefix+(count+1);
>>>>>>>> >> + MeetMe mm = new MeetMe();
>>>>>>>> >> + mm.setConfno(confno);
>>>>>>>> >> + Extensions e = new Extensions();
>>>>>>>> >> + e.setApp("MeetMe");
>>>>>>>> >> + e.setAppdata(confno + ",dM");
>>>>>>>> >> + e.setExten(confno);
>>>>>>>> >> + e.setContext("rooms");
>>>>>>>> >> + e.setPriority(1);
>>>>>>>> >> + em.persist(mm);
>>>>>>>> >> + em.persist(e);
>>>>>>>> >> + return confno;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public Integer getConferensMembersNumber(String confNo) {
>>>>>>>> >> + return ((Number)em.createQuery("SELECT m.members FROM
>>>>>>>> MeetMe AS m
>>>>>>>> >> WHERE m.confno=:confno")
>>>>>>>> >> + .setParameter("confno", confNo)
>>>>>>>> >> + .getSingleResult()).intValue();
>>>>>>>> >> + }
>>>>>>>> >> +}
>>>>>>>> >> \ No newline at end of file
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,8 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>>>> >> +
>>>>>>>> >> +/**
>>>>>>>> >> + * Base interface for SIP API requests
>>>>>>>> >> + */
>>>>>>>> >> +public interface ISIPRequest {
>>>>>>>> >> +
>>>>>>>> >> +}
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,17 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>>>> >> +
>>>>>>>> >> +/**
>>>>>>>> >> + * Create SIP conferece request
>>>>>>>> >> + */
>>>>>>>> >> +public class SIPCreateConferenceRequest implements ISIPRequest {
>>>>>>>> >> + private String sipNumber;
>>>>>>>> >> +
>>>>>>>> >> + public SIPCreateConferenceRequest() {
>>>>>>>> >> + super(); //To change body of overridden methods use
>>>>>>>> File |
>>>>>>>> >> Settings | File Templates.
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public SIPCreateConferenceRequest(String sipNumber) {
>>>>>>>> >> + super();
>>>>>>>> >> + this.sipNumber = sipNumber;
>>>>>>>> >> + }
>>>>>>>> >> +}
>>>>>>>> >> \ No newline at end of file
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,72 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>>>> >> +
>>>>>>>> >> +/**
>>>>>>>> >> + * Create User Request
>>>>>>>> >> + */
>>>>>>>> >> +public class SIPCreateUserRequest implements ISIPRequest {
>>>>>>>> >> +
>>>>>>>> >> + protected String firstName;
>>>>>>>> >> + protected String middleName;
>>>>>>>> >> + protected String lastName;
>>>>>>>> >> + protected String email;
>>>>>>>> >> + protected String login;
>>>>>>>> >> + protected String password;
>>>>>>>> >> +
>>>>>>>> >> +
>>>>>>>> >> + public SIPCreateUserRequest(String firstName, String
>>>>>>>> middleName,
>>>>>>>> >> String lastName, String email, String login, String password) {
>>>>>>>> >> + this.firstName = firstName;
>>>>>>>> >> + this.middleName = middleName;
>>>>>>>> >> + this.lastName = lastName;
>>>>>>>> >> + this.email = email;
>>>>>>>> >> + this.login = login;
>>>>>>>> >> + this.password = password;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public void withFirstName(String firstName) {
>>>>>>>> >> + this.firstName = firstName;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public void withMiddleName(String middleName) {
>>>>>>>> >> + this.middleName = middleName;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public void withLastName(String lastName) {
>>>>>>>> >> + this.lastName = lastName;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public void withEmail(String email) {
>>>>>>>> >> + this.email = email;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public void withLogin(String login) {
>>>>>>>> >> + this.login = login;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public void withPassword(String password) {
>>>>>>>> >> + this.password = password;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getFirstName() {
>>>>>>>> >> + return firstName;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getMiddleName() {
>>>>>>>> >> + return middleName;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getLastName() {
>>>>>>>> >> + return lastName;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getEmail() {
>>>>>>>> >> + return email;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getLogin() {
>>>>>>>> >> + return login;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getPassword() {
>>>>>>>> >> + return password;
>>>>>>>> >> + }
>>>>>>>> >> +}
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,12 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>>>> >> +
>>>>>>>> >> +/**
>>>>>>>> >> + * * Base interface for SIP API request's resuslt
>>>>>>>> >> + */
>>>>>>>> >> +public interface ISIPRequestResult {
>>>>>>>> >> +
>>>>>>>> >> + boolean hasError();
>>>>>>>> >> +
>>>>>>>> >> + String getErrorMessage();
>>>>>>>> >> +
>>>>>>>> >> +}
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,12 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>>>> >> +
>>>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>>>> >> +
>>>>>>>> >> +/**
>>>>>>>> >> + * TODO
>>>>>>>> >> + */
>>>>>>>> >> +public abstract class SIPCreateUserRequestResult implements
>>>>>>>> >> ISIPRequestResult {
>>>>>>>> >> +
>>>>>>>> >> + abstract public UserSipData getUserSipData();
>>>>>>>> >> +
>>>>>>>> >> +}
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Added:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>>> >> (added)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -0,0 +1,26 @@
>>>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>>>> >> +
>>>>>>>> >> +/**
>>>>>>>> >> + * TODO
>>>>>>>> >> + */
>>>>>>>> >> +public abstract class SipCreateConferenceRequestResult
>>>>>>>> implements
>>>>>>>> >> ISIPRequestResult {
>>>>>>>> >> +
>>>>>>>> >> + protected String conferenceNumber;
>>>>>>>> >> + protected String conferencePin;
>>>>>>>> >> +
>>>>>>>> >> + protected SipCreateConferenceRequestResult() {
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + protected SipCreateConferenceRequestResult(String
>>>>>>>> conferenceNumber,
>>>>>>>> >> String conferencePin) {
>>>>>>>> >> + this.conferenceNumber = conferenceNumber;
>>>>>>>> >> + this.conferencePin = conferencePin;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getConferenceNumber() {
>>>>>>>> >> + return conferenceNumber;
>>>>>>>> >> + }
>>>>>>>> >> +
>>>>>>>> >> + public String getConferencePin() {
>>>>>>>> >> + return conferencePin;
>>>>>>>> >> + }
>>>>>>>> >> +}
>>>>>>>> >>
>>>>>>>> >> Propchange:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>> >> svn:eol-style = native
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
>>>>>>>> >> String screen_viewer =
>>>>>>>> >> httpServletRequest
>>>>>>>> >>
>>>>>>>> >> .getParameter("screen_viewer");
>>>>>>>> >>
>>>>>>>> >> + // red5sip integration config
>>>>>>>> >> + String red5sip_enable = httpServletRequest
>>>>>>>> >> +
>>>>>>>> >> .getParameter("red5sip_enable");
>>>>>>>> >> + String red5sip_room_prefix =
>>>>>>>> httpServletRequest
>>>>>>>> >> +
>>>>>>>> >> .getParameter("red5sip_room_prefix");
>>>>>>>> >> + String red5sip_exten_context =
>>>>>>>> httpServletRequest
>>>>>>>> >> +
>>>>>>>> >> .getParameter("red5sip_exten_context");
>>>>>>>> >> +
>>>>>>>> >> // SIP Applet
>>>>>>>> Configuration
>>>>>>>> >> String sip_enable =
>>>>>>>> >> httpServletRequest
>>>>>>>> >>
>>>>>>>> >> .getParameter("sip_enable");
>>>>>>>> >> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
>>>>>>>> >>
>>>>>>>> >> openxg_community_code, openxg_language_code,
>>>>>>>> >>
>>>>>>>> openxg_adminid,
>>>>>>>> >> sip_language_phonecode,
>>>>>>>> >>
>>>>>>>> >> sip_phonerange_start, sip_phonerange,
>>>>>>>> >> - jodPath);
>>>>>>>> >> + jodPath,
>>>>>>>> >> + red5sip_enable, red5sip_room_prefix,
>>>>>>>> >> red5sip_exten_context);
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> >> getImportInitvalues().loadInitUserAndOrganisation(username,
>>>>>>>> >> userpass,
>>>>>>>> >> useremail, orgname, timeZone, configdefaultLang);
>>>>>>>> >>
>>>>>>>> >> Modified:
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>>>> >> URL:
>>>>>>>> >>
>>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> ==============================================================================
>>>>>>>> >> ---
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>>>> >> (original)
>>>>>>>> >> +++
>>>>>>>> >>
>>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>>> >> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
>>>>>>>> >> private static final String sip_phonerange_start = "";
>>>>>>>> >> private static final String sip_phonerange = "";
>>>>>>>> >> private static final String jodPath = "./jod/lib";
>>>>>>>> >> + private static final String red5sip_enable = "no";
>>>>>>>> >> + private static final String red5sip_room_prefix = "400";
>>>>>>>> >> + private static final String red5sip_exten_context = "rooms";
>>>>>>>> >> protected static final String username = "junit";
>>>>>>>> >> protected static final String userpass = "test";
>>>>>>>> >> private static final String orgname = "smoketest";
>>>>>>>> >> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
>>>>>>>> >> openxg_client_id,
>>>>>>>> openxg_client_secret,
>>>>>>>> >> openxg_client_domain,
>>>>>>>> >> openxg_community_code,
>>>>>>>> >> openxg_language_code, openxg_adminid,
>>>>>>>> >> sip_language_phonecode,
>>>>>>>> >> sip_phonerange_start, sip_phonerange,
>>>>>>>> >> - jodPath);
>>>>>>>> >> + jodPath, red5sip_enable,
>>>>>>>> >> red5sip_room_prefix, red5sip_exten_context);
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> importInitvalues.loadInitUserAndOrganisation(username,
>>>>>>>> >> userpass,
>>>>>>>> >> useremail, orgname, timeZone,
>>>>>>>> >> configdefaultLang);
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> >>
>>>>>>>> >
>>>>>>>> >
>>>>>>>> > --
>>>>>>>> > Sebastian Wagner
>>>>>>>> > http://www.openmeetings.de
>>>>>>>> > http://incubator.apache.org/openmeetings/
>>>>>>>> > http://www.webbase-design.de
>>>>>>>> > http://www.wagner-sebastian.com
>>>>>>>> > seba.wagner@gmail.com
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> --
>>>>>>> Timur Tleukenov
>>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> Sebastian Wagner
>>>>>> http://www.openmeetings.de
>>>>>> http://incubator.apache.org/openmeetings/
>>>>>> http://www.webbase-design.de
>>>>>> http://www.wagner-sebastian.com
>>>>>> seba.wagner@gmail.com
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Sebastian Wagner
>>>>> http://www.openmeetings.de
>>>>> http://incubator.apache.org/openmeetings/
>>>>> http://www.webbase-design.de
>>>>> http://www.wagner-sebastian.com
>>>>> seba.wagner@gmail.com
>>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> Timur Tleukenov
>>>>
>>>
>>>
>>>
>>> --
>>> Timur Tleukenov
>>>
>>
>>
>>
>> --
>> Timur Tleukenov
>>
>
>
>
> --
> Sebastian Wagner
> http://www.openmeetings.de
> http://incubator.apache.org/openmeetings/
> http://www.webbase-design.de
> http://www.wagner-sebastian.com
> seba.wagner@gmail.com
>
--
Timur Tleukenov
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Posted by "seba.wagner@gmail.com" <se...@gmail.com>.
I guess using another database would mean also result in changes in the
red5phone integration code yes?
My proposal would then be to make MySQL mandatory for the Asterisk
integration for now and we might re-consider that when we have released and
a package and gathered some feedback.
What do you think?
2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
> Yes, currently red5sip integration works works only with mysql. But I
> think it possible to make it works with Asterisk ODBC realtime module
> instead of mysql realtime.
>
> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>
>> Forgot to press "Reply to all" :-)
>>
>> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>>
>>> Such tables structure required by Asterisk Realtime module.
>>> For MeetMe plugin table structure described here:
>>> http://www.voip-info.org/wiki/view/Asterisk+RealTime+MeetMe.
>>> May be it will work with other primary key, I will check it.
>>>
>>> 2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
>>>
>>>> It is looking great btw ;)
>>>>
>>>> But I have a question: The table "meetme", its primary key is a varchar
>>>> and name is "confno"
>>>>
>>>> The pattern so far was, example:
>>>> Table name: poll_types
>>>> Primary Key: poll_type_id <Type bigint or int>
>>>>
>>>> Even "pure" assoziation tables like: rooms_organisations
>>>> => In that table you assign rooms to organisation, so it _could_ have
>>>> only two colums:
>>>> rooms_id and organisation_id => however I consequently added a primary
>>>> key with the table name: rooms_organisation_id to it.
>>>>
>>>> Now we have some new tables that have the primary_key column name "id"
>>>> and the one table that has a varchar as primary key.
>>>>
>>>> Can we please find a consens together what pattern we use? I think it
>>>> makes sense to call the primary key just "id" and not including the table
>>>> name in it cause it lead to problems in the past if the column names are
>>>> too long.
>>>> But what about the "meetme" table? Is there a special reason for having
>>>> a varchar primary key here? Is it possible to bring this in-line with the
>>>> rest of the database table scheme?
>>>>
>>>> Thanks!
>>>> Sebastian
>>>>
>>>> 2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
>>>>
>>>>> Hi Timur,
>>>>>
>>>>> please don't forget to add the new persistence classes also to the
>>>>> other templates:
>>>>> db2/derby/oracle/postgres
>>>>>
>>>>> Thanks!
>>>>> Sebastian
>>>>>
>>>>> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>>>>>
>>>>>> Hi Sebastian,
>>>>>>
>>>>>> I added the missing files and license headers.
>>>>>>
>>>>>> 2012/3/27 Alexei Fedotov <al...@gmail.com>
>>>>>>
>>>>>>> Ok, I'm here. :-)
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> On Mon, Mar 26, 2012 at 6:03 PM, seba.wagner@gmail.com
>>>>>>> <se...@gmail.com> wrote:
>>>>>>> > Hi Timur,
>>>>>>> >
>>>>>>> > nice changeset :)
>>>>>>> >
>>>>>>> > But it seems like you've missed to checking some of your code:
>>>>>>> >
>>>>>>> https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
>>>>>>> >
>>>>>>> > The beans: AsteriskSipUsers, Extens, MeetMe are missing
>>>>>>> >
>>>>>>> > And you should enable the BackupExport/BackupImport to include and
>>>>>>> > re-import the data from the new tables.
>>>>>>> >
>>>>>>> > We might also add some panels in the Admin UI to have the
>>>>>>> possibility to
>>>>>>> > save/edit/delete the settings from the OpenMeetings Admin UI in
>>>>>>> the future.
>>>>>>> >
>>>>>>> > Thanks!
>>>>>>> > Sebastian
>>>>>>> >
>>>>>>> > 2012/3/26 <ti...@apache.org>
>>>>>>> >
>>>>>>> >> Author: timur
>>>>>>> >> Date: Mon Mar 26 09:14:15 2012
>>>>>>> >> New Revision: 1305274
>>>>>>> >>
>>>>>>> >> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
>>>>>>> >> Log:
>>>>>>> >> red5sip integration:
>>>>>>> >> - new Asterisk DAO added;
>>>>>>> >> - new red5sip configurations added to install step1 template;
>>>>>>> >> - new methods added to ScopeApplicationAdapter.java
>>>>>>> >> - openjpa.QueryCache temporally disabled to make database
>>>>>>> changes from
>>>>>>> >> Asterisk visible in OM.
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>> >> (with props)
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>> >> (with props)
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>> >> (with props)
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>> >> (with props)
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>> >> (with props)
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>> >> (with props)
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>> >> (with props)
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>> >> (with props)
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>> >> (with props)
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>> >> simplified.xml
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>> >> traditional.xml
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>>> >> (studIP).xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>>> >> brazil.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -204,7 +204,9 @@
>>>>>>> >> <!-- No Interface -->
>>>>>>> >> <bean id="manageCryptStyle"
>>>>>>> >> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
>>>>>>> >> <bean id="openXGHttpClient"
>>>>>>> >> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
>>>>>>> >> - <bean id="generateImage"
>>>>>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>>>>>> >> + <bean id="asteriskDbSipClient"
>>>>>>> >>
>>>>>>> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient" />
>>>>>>> >> + <bean id="asteriskDAO"
>>>>>>> >>
>>>>>>> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
>>>>>>> >> + <bean id="generateImage"
>>>>>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>>>>>> >> <bean id="generateThumbs"
>>>>>>> >> class="org.openmeetings.app.documents.GenerateThumbs" />
>>>>>>> >> <bean id="generatePDF"
>>>>>>> >> class="org.openmeetings.app.documents.GeneratePDF" />
>>>>>>> >> <bean id="mailHandler"
>>>>>>> >> class="org.openmeetings.utils.mail.MailHandler" />
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>> >> simplified.xml (original)
>>>>>>> >> +++
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>> >> simplified.xml Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>> >> traditional.xml (original)
>>>>>>> >> +++
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>>> >> traditional.xml Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>>> >> (studIP).xml (original)
>>>>>>> >> +++
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>>> >> (studIP).xml Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>>> >> brazil.xml (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>>> >> brazil.xml Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Ромеронабиратель SIP</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Mon
>>>>>>> >> Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>>> >> <value>Edit details</value>
>>>>>>> >> </string>
>>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>>> >> + <value>Show sip dialer</value>
>>>>>>> >> + </string>
>>>>>>> >> + <string id="1448" name="sip call">
>>>>>>> >> + <value>Call</value>
>>>>>>> >> + </string>
>>>>>>> >> </language>
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -225,8 +225,9 @@ of the red5-servlet
>>>>>>> >> -->
>>>>>>> >> <!-- Quality-Modus *normal* -->
>>>>>>> >> <microphoneRateNormal>22</microphoneRateNormal>
>>>>>>> >> -<!-- Microphone Settings Quality-Modus *best* -->
>>>>>>> >> -<microphoneRateBest>44</microphoneRateBest>
>>>>>>> >> +<!-- Microphone Settings Quality-Modus *best* -->
>>>>>>> >> +<!-- TODO: red5sip support only 8 -->
>>>>>>> >> +<microphoneRateBest>44</microphoneRateBest>
>>>>>>> >>
>>>>>>> >> <!--
>>>>>>> >> The Size of the Whiteboard
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -47,7 +47,8 @@
>>>>>>> >> <confmenucommand id="cmd_importFile"
>>>>>>> >> onselect="canvas.doActionmenu('importFile')"
>>>>>>> key="['ALT','Shift','I']"/>
>>>>>>> >> <confmenucommand id="cmd_editCamMicSettings"
>>>>>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"
>>>>>>> >> key="['ALT','Shift','1']"/>
>>>>>>> >> <confmenucommand id="cmd_editBoardSettings"
>>>>>>> >> onselect="canvas.doActionmenu('editBoardSettings')"
>>>>>>> >> key="['ALT','Shift','2']"/>
>>>>>>> >> - <confmenucommand id="cmd_quit"
>>>>>>> onselect="canvas.doActionmenu('quit')"
>>>>>>> >> key="['ALT','Shift','E']"/>
>>>>>>> >> + <confmenucommand id="cmd_quit"
>>>>>>> onselect="canvas.doActionmenu('quit')"
>>>>>>> >> key="['ALT','Shift','E']"/>
>>>>>>> >> + <confmenucommand id="cmd_showSipDialer"
>>>>>>> >> onselect="canvas.doActionmenu('showSipDialer')"
>>>>>>> key="['ALT','Shift','D']" />
>>>>>>> >>
>>>>>>> >> <confmenucommand id="cmd_applyforMod_nokey"
>>>>>>> >> onselect="canvas.doActionmenu('applyForMod')" />
>>>>>>> >> <confmenucommand id="cmd_createPoll_nokey"
>>>>>>> >> onselect="canvas.doActionmenu('createPoll')" />
>>>>>>> >> @@ -56,7 +57,8 @@
>>>>>>> >> <confmenucommand id="cmd_importFile_nokey"
>>>>>>> >> onselect="canvas.doActionmenu('importFile')" />
>>>>>>> >> <confmenucommand id="cmd_editCamMicSettings_nokey"
>>>>>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"/>
>>>>>>> >> <confmenucommand id="cmd_editBoardSettings_nokey"
>>>>>>> >> onselect="canvas.doActionmenu('editBoardSettings')" />
>>>>>>> >> - <confmenucommand id="cmd_quit_nokey"
>>>>>>> >> onselect="canvas.doActionmenu('quit')" />
>>>>>>> >> + <confmenucommand id="cmd_quit_nokey"
>>>>>>> >> onselect="canvas.doActionmenu('quit')" />
>>>>>>> >> + <confmenucommand id="cmd_showSipDialer_nokey"
>>>>>>> >> onselect="canvas.doActionmenu('showSipDialer')" />
>>>>>>> >>
>>>>>>> >> <!--
>>>>>>> >> <command id="cmd_browser_open"
>>>>>>> >> onselect="canvas.doActionmenu('browser_open')"
>>>>>>> key="['ALT','Shift','B']"/>
>>>>>>> >> @@ -402,6 +404,8 @@
>>>>>>> >> canvas.thishib.applyForModeration.doCall();
>>>>>>> >> } else if (stringSub=='editCamMicSettings') {
>>>>>>> >>
>>>>>>> >> canvas._videocontainer._videoviewcontent.changeDevice();
>>>>>>> >> + } else if (stringSub=='showSipDialer') {
>>>>>>> >> + new
>>>>>>> lz.sipDialer(canvas.main_content._content.inner);
>>>>>>> >> } else if (stringSub=='editBoardSettings') {
>>>>>>> >> new
>>>>>>> >> lz.editWhiteboardDefault(canvas.main_content._content.inner);
>>>>>>> >> } else if (stringSub=='quit') {
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -47,9 +47,9 @@
>>>>>>> >> </method>
>>>>>>> >> </class>
>>>>>>> >>
>>>>>>> >> - <!--- Menu for public/private conference and audience
>>>>>>> room. This
>>>>>>> >> class shows
>>>>>>> >> - exit, moderator, file, setteings and poll menu.
>>>>>>> Those menu
>>>>>>> >> items are connected
>>>>>>> >> - to each command that has been declared in
>>>>>>> >> base/mainMethods.lzx. May 24 2008
>>>>>>> >> + <!--- Menu for public/private conference and audience
>>>>>>> room. This
>>>>>>> >> class shows
>>>>>>> >> + exit, moderator, file, setteings and poll menu.
>>>>>>> Those menu
>>>>>>> >> items are connected
>>>>>>> >> + to each command that has been declared in
>>>>>>> >> base/mainMethods.lzx. May 24 2008
>>>>>>> >> commented by onokeiji@gmail.com -->
>>>>>>> >> <class name="conferenceMenubar" extends="menubar"
>>>>>>> height="28"
>>>>>>> >> style="itemStyle">
>>>>>>> >> @@ -83,7 +83,7 @@
>>>>>>> >> parent._exitbtn.destroy();
>>>>>>> >> }
>>>>>>> >> }
>>>>>>> >> -
>>>>>>> >> +
>>>>>>> >> if(canvas.isrtl == 'true'){
>>>>>>> >> if ($debug) Debug.write("onInit :
>>>>>>> Setting
>>>>>>> >> nokey");
>>>>>>> >>
>>>>>>> lblImport.setCommand(cmd_importFile_nokey);
>>>>>>> >> @@ -92,11 +92,11 @@
>>>>>>> >> </handler>
>>>>>>> >> <_labelMenuItem id="lblImport" labelid="15"
>>>>>>> >> command="cmd_importFile"
>>>>>>> enabled="${
>>>>>>> >> canvas.ismoderator }" />
>>>>>>> >> - <!-- <menuseparator/> <_labelMenuItem
>>>>>>> >> labelid="561" command="cmd_exportFilePNG"
>>>>>>> >> - /> <_labelMenuItem labelid="562"
>>>>>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>>>>>> >> - labelid="563"
>>>>>>> command="cmd_exportFilePDF"
>>>>>>> >> /> <_labelMenuItem labelid="560"
>>>>>>> >> - command="cmd_exportFileSVG" />
>>>>>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>>>>>> >> - /> <menuseparator/>
>>>>>>> <_labelMenuItem
>>>>>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>>>>>> >> + <!-- <menuseparator/> <_labelMenuItem
>>>>>>> >> labelid="561" command="cmd_exportFilePNG"
>>>>>>> >> + /> <_labelMenuItem labelid="562"
>>>>>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>>>>>> >> + labelid="563"
>>>>>>> command="cmd_exportFilePDF"
>>>>>>> >> /> <_labelMenuItem labelid="560"
>>>>>>> >> + command="cmd_exportFileSVG" />
>>>>>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>>>>>> >> + /> <menuseparator/>
>>>>>>> <_labelMenuItem
>>>>>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>>>>>> >> value="quit" /> -->
>>>>>>> >> </_labelMenu>
>>>>>>> >>
>>>>>>> >> @@ -104,7 +104,7 @@
>>>>>>> >>
>>>>>>> >> <handler name="oninit">
>>>>>>> >> <![CDATA[
>>>>>>> >> -
>>>>>>> >> +
>>>>>>> >> if(canvas.isrtl == 'true'){
>>>>>>> >> if ($debug) Debug.write("onInit :
>>>>>>> Setting
>>>>>>> >> nokey");
>>>>>>> >>
>>>>>>> >> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
>>>>>>> >> @@ -112,6 +112,7 @@
>>>>>>> >>
>>>>>>> lblPoll.setCommand(cmd_createPoll_nokey);
>>>>>>> >>
>>>>>>> >> lblPollResult.setCommand(cmd_pollResults_nokey);
>>>>>>> >>
>>>>>>> >> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
>>>>>>> >> +
>>>>>>> >> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
>>>>>>> >> }
>>>>>>> >> //hideActionsMenu
>>>>>>> >>
>>>>>>> if(canvas.currentRoomObj.hideActionsMenu){
>>>>>>> >> @@ -133,7 +134,7 @@
>>>>>>> >> </handler>
>>>>>>> >> </_labelMenuItem>
>>>>>>> >> <menuseparator />
>>>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>> >> canvas.ismoderator }" />
>>>>>>> <menuseparator/>
>>>>>>> >> -->
>>>>>>> >> <_labelMenuItem id="lblCamMic"
>>>>>>> labelid="306"
>>>>>>> >> command="cmd_editCamMicSettings" />
>>>>>>> >> @@ -177,14 +178,17 @@
>>>>>>> >> <_labelMenuItem width="250"
>>>>>>> id="lblPollVote"
>>>>>>> >> labelid="42"
>>>>>>> >> command="cmd_checkPollVoted" />
>>>>>>> >> <menuseparator />
>>>>>>> >> + <_labelMenuItem width="250" id="lblShowSipDialer"
>>>>>>> >> labelid="1447"
>>>>>>> >> + command="cmd_showSipDialer" />
>>>>>>> >> + <menuseparator />
>>>>>>> >> <_labelMenuItem width="250" labelid="1126"
>>>>>>> >>
>>>>>>> command="cmd_editWhiteboardDefault" />
>>>>>>> >> </_labelMenu>
>>>>>>> >> -
>>>>>>> >> - <!-- exit room <_labelMenu labelid="308"
>>>>>>> width="250">
>>>>>>> >> </_labelMenu> <_labelMenu
>>>>>>> >> - labelid="301" width="250"> <_labelMenuItem
>>>>>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>>>>>> >> - /> </_labelMenu> <_labelMenu labelid="305"
>>>>>>> >> width="250"> <_labelMenuItem labelid="306"
>>>>>>> >> - command="cmd_editCamMicSettings" />
>>>>>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>>>>>> >> +
>>>>>>> >> + <!-- exit room <_labelMenu labelid="308"
>>>>>>> width="250">
>>>>>>> >> </_labelMenu> <_labelMenu
>>>>>>> >> + labelid="301" width="250"> <_labelMenuItem
>>>>>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>>>>>> >> + /> </_labelMenu> <_labelMenu labelid="305"
>>>>>>> >> width="250"> <_labelMenuItem labelid="306"
>>>>>>> >> + command="cmd_editCamMicSettings" />
>>>>>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>>>>>> >> /> </_labelMenu> <_labelMenu labelid="303"
>>>>>>> >> width="250"> </_labelMenu> -->
>>>>>>> >>
>>>>>>> >> </class>
>>>>>>> >> @@ -258,7 +262,7 @@
>>>>>>> >> </handler>
>>>>>>> >> </_labelMenuItem>
>>>>>>> >> <menuseparator />
>>>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>> >> canvas.ismoderator }" />
>>>>>>> >> <menuseparator/> -->
>>>>>>> >> <_labelMenuItem labelid="306"
>>>>>>> >> command="cmd_editCamMicSettings"
>>>>>>> >> enabled="${
>>>>>>> canvas.ismoderator }" />
>>>>>>> >> @@ -358,7 +362,7 @@
>>>>>>> >> </handler>
>>>>>>> >> </_labelMenuItem>
>>>>>>> >> <menuseparator />
>>>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>>> >> canvas.ismoderator }" />
>>>>>>> >> <menuseparator/> -->
>>>>>>> >> <_labelMenuItem labelid="306"
>>>>>>> >> command="cmd_editCamMicSettings"
>>>>>>> >> enabled="${
>>>>>>> canvas.ismoderator }" />
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -65,6 +65,7 @@
>>>>>>> >> <include href="restricted/" />
>>>>>>> >> <include href="browser/" />
>>>>>>> >> <include href="testsetup/" />
>>>>>>> >> + <include href="sip/" />
>>>>>>> >>
>>>>>>> >> <include href="flexibleConferenceRoom/" />
>>>>>>> >>
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,6 @@
>>>>>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>>>>>> >> +<library>
>>>>>>> >> +
>>>>>>> >> + <include href="sipDialer.lzx" />
>>>>>>> >> +
>>>>>>> >> +</library>
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,81 @@
>>>>>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>>>>>> >> +<library>
>>>>>>> >> +
>>>>>>> >> +<class name="sipDialer" extends="window" bgcolor="gray"
>>>>>>> width="200">
>>>>>>> >> + <simplelayout axis="y" spacing="5"/>
>>>>>>> >> + <labelText labelid="1003"/>
>>>>>>> >> + <view name="phoneNumber" width="100%">
>>>>>>> >> + <inputtext name="input"
>>>>>>> >> width="$once{parent.width-parent.del.width}" height="20"
>>>>>>> bgcolor="white"/>
>>>>>>> >> + <button name="del" x="$once{parent.input.width}"
>>>>>>> width="30"
>>>>>>> >> height="20" onclick="this.del();">
>>>>>>> >> + â†
>>>>>>> >> + <method name="del">
>>>>>>> >> + var t = parent.input.text;
>>>>>>> >> + if(t.length != 0) {
>>>>>>> >> + t = t.substr(0, t.length - 1);
>>>>>>> >> + parent.input.setAttribute('text', t);
>>>>>>> >> + }
>>>>>>> >> + </method>
>>>>>>> >> + </button>
>>>>>>> >> + </view>
>>>>>>> >> +
>>>>>>> >> + <view name="dialerButtons" align="center">
>>>>>>> >> + <vbox spacing="5">
>>>>>>> >> + <hbox spacing="5">
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('1')"
>>>>>>> >> width="40">1</button>
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('2')"
>>>>>>> >> width="40">2</button>
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('3')"
>>>>>>> >> width="40">3</button>
>>>>>>> >> + </hbox>
>>>>>>> >> + <hbox spacing="5">
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('4')"
>>>>>>> >> width="40">4</button>
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('5')"
>>>>>>> >> width="40">5</button>
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('6')"
>>>>>>> >> width="40">6</button>
>>>>>>> >> + </hbox>
>>>>>>> >> + <hbox spacing="5">
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('7')"
>>>>>>> >> width="40">7</button>
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('8')"
>>>>>>> >> width="40">8</button>
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('9')"
>>>>>>> >> width="40">9</button>
>>>>>>> >> + </hbox>
>>>>>>> >> + <hbox spacing="5">
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('*')"
>>>>>>> >> width="40">*</button>
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('0')"
>>>>>>> >> width="40">0</button>
>>>>>>> >> + <button
>>>>>>> onclick="parent.parent.parent.parent.dial('#')"
>>>>>>> >> width="40">#</button>
>>>>>>> >> + </hbox>
>>>>>>> >> + </vbox>
>>>>>>> >> + </view>
>>>>>>> >> + <hbox spacing="10" align="center">
>>>>>>> >> + <simpleLabelButton labelid="1448" name="callButton">
>>>>>>> >> + <handler name="onclick">
>>>>>>> >> + parent.parent.joinToConfCall.doCall();
>>>>>>> >> + </handler>
>>>>>>> >> + </simpleLabelButton>
>>>>>>> >> + <simpleLabelButton labelid="85" name="closeButton">
>>>>>>> >> + <handler name="onclick">
>>>>>>> >> + canvas.sipDialer = null;
>>>>>>> >> + parent.parent.destroy();
>>>>>>> >> + </handler>
>>>>>>> >> + </simpleLabelButton>
>>>>>>> >> + </hbox>
>>>>>>> >> + <handler name="oninit">
>>>>>>> >> + if(canvas.sipDialer != null) {
>>>>>>> >> + canvas.sipDialer.destroy();
>>>>>>> >> + }
>>>>>>> >> + canvas.setAttribute('sipDialer', this);
>>>>>>> >> + this.bringToFront();
>>>>>>> >> + </handler>
>>>>>>> >> +
>>>>>>> >> + <method name="dial" args="digit">
>>>>>>> >> + this.phoneNumber.input.setAttribute('text',
>>>>>>> >> this.phoneNumber.input.text + digit);
>>>>>>> >> + </method>
>>>>>>> >> +
>>>>>>> >> + <netRemoteCallHib name="joinToConfCall"
>>>>>>> funcname="joinToConfCall"
>>>>>>> >> remotecontext="$once{ canvas.thishib }">
>>>>>>> >> + <netparam><method name="getValue">return
>>>>>>> >> parent.parent.phoneNumber.input.text</method></netparam>
>>>>>>> >> + <handler name="ondata" args="value">
>>>>>>> >> + <![CDATA[
>>>>>>> >> + //The onResult-Handler will be called be the
>>>>>>> rtmpconnection
>>>>>>> >> + if($debug) Debug.write("joinToConfCall : ",value);
>>>>>>> >> + ]]>
>>>>>>> >> + </handler>
>>>>>>> >> + </netRemoteCallHib>
>>>>>>> >> +</class>
>>>>>>> >> +
>>>>>>> >> +</library>
>>>>>>> >> \ No newline at end of file
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -67,6 +67,9 @@
>>>>>>> >>
>>>>>>> >>
>>>>>>> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
>>>>>>> >>
>>>>>>> >> <class>org.openmeetings.app.persistence.beans.user.Users</class>
>>>>>>> >>
>>>>>>> >>
>>>>>>> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
>>>>>>> >> +
>>>>>>> >>
>>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
>>>>>>> >> +
>>>>>>> >>
>>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
>>>>>>> >> +
>>>>>>> >>
>>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
>>>>>>> >>
>>>>>>> <exclude-unlisted-classes>false</exclude-unlisted-classes>
>>>>>>> >> <properties>
>>>>>>> >> <property
>>>>>>> >> name="openjpa.ConnectionProperties"
>>>>>>> >> @@ -83,7 +86,8 @@
>>>>>>> >> <property name="openjpa.Log"
>>>>>>> >> value="DefaultLevel=WARN, Tool=INFO" />
>>>>>>> >> <property
>>>>>>> >> name="openjpa.ConnectionDriverName"
>>>>>>> >> value="org.apache.commons.dbcp.BasicDataSource"/>
>>>>>>> >> <property name="openjpa.DataCache"
>>>>>>> >> value="true"/>
>>>>>>> >> - <property
>>>>>>> name="openjpa.QueryCache"
>>>>>>> >> value="true"/>
>>>>>>> >> + <!-- QueryCache disabled due to changes outside
>>>>>>> of JPA
>>>>>>> >> doesn't take effect with caching -->
>>>>>>> >> + <property
>>>>>>> name="openjpa.QueryCache"
>>>>>>> >> value="false"/>
>>>>>>> >> <property
>>>>>>> name="openjpa.jdbc.DBDictionary"
>>>>>>> >> value="batchLimit=100,tableType=myisam"/>
>>>>>>> >> <property
>>>>>>> name="openjpa.jdbc.QuerySQLCache"
>>>>>>> >> value="false"/>
>>>>>>> >> </properties>
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Mon
>>>>>>> >> Mar 26 09:14:15 2012
>>>>>>> >> @@ -331,7 +331,36 @@ function checkEmail()
>>>>>>> >>
>>>>>>> >> </i></p>
>>>>>>> >>
>>>>>>> >> - </fieldset>
>>>>>>> >> + </fieldset>
>>>>>>> >> +
>>>>>>> >> + <fieldset id="red5sip">
>>>>>>> >> + <legend>red5SIP Configuration</legend>
>>>>>>> >> +
>>>>>>> >> + <li>
>>>>>>> >> + <label for="red5sip_enable">Enable SIP</label>
>>>>>>> >> + <select name="red5sip_enable" id="red5sip_enable"
>>>>>>> size="1">
>>>>>>> >> + <option value="yes">Yes</option>
>>>>>>> >> + <option value="no" selected>No</option>
>>>>>>> >> + </select><br />
>>>>>>> >> + </li>
>>>>>>> >> + <p><i>
>>>>>>> >> + Enable red5SIP integration
>>>>>>> >> + </i></p>
>>>>>>> >> + <br />
>>>>>>> >> +
>>>>>>> >> + <li>
>>>>>>> >> + <label for="red5sip_room_prefix">SIP rooms prefix</label>
>>>>>>> >> + <input name="red5sip_room_prefix"
>>>>>>> id="red5sip_room_prefix"
>>>>>>> >> size="27" title="" type="text" value="400" />
>>>>>>> >> + <p><i>Prefix for phone number of conference rooms</i></p>
>>>>>>> >> + </li>
>>>>>>> >> +
>>>>>>> >> + <li>
>>>>>>> >> + <label for="red5sip_exten_context">SIP extensions
>>>>>>> context</label>
>>>>>>> >> + <input name="red5sip_exten_context"
>>>>>>> id="red5sip_exten_context"
>>>>>>> >> size="27" title="" type="text" value="rooms" />
>>>>>>> >> + <p><i>Context of Asterisk extensions</i></p>
>>>>>>> >> + </li>
>>>>>>> >> +
>>>>>>> >> + </fieldset>
>>>>>>> >>
>>>>>>> >> <fieldset id="sip">
>>>>>>> >>
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
>>>>>>> >>
>>>>>>> >> import org.openmeetings.app.conference.session.RoomClient;
>>>>>>> >> import org.openmeetings.app.data.basic.AuthLevelmanagement;
>>>>>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>>>>>> >> import org.openmeetings.app.data.beans.basic.SearchResult;
>>>>>>> >> import
>>>>>>> org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
>>>>>>> >> import org.openmeetings.app.data.user.Organisationmanagement;
>>>>>>> >> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.persistence.beans.basic.Configuration;
>>>>>>> >> import
>>>>>>> org.openmeetings.app.persistence.beans.domain.Organisation_Users;
>>>>>>> >> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
>>>>>>> >> import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>>>>>> >> import
>>>>>>> org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
>>>>>>> >> import
>>>>>>> org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
>>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>>> >> import org.openmeetings.app.persistence.beans.user.Users;
>>>>>>> >> import org.openmeetings.app.remote.red5.ClientListManager;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>>> >> +import
>>>>>>> >>
>>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>>> >> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
>>>>>>> >> import org.red5.logging.Red5LoggerFactory;
>>>>>>> >> import org.slf4j.Logger;
>>>>>>> >> @@ -71,6 +78,8 @@ public class Roommanagement {
>>>>>>> >> @Autowired
>>>>>>> >> private OpenXGHttpClient openXGHttpClient;
>>>>>>> >> @Autowired
>>>>>>> >> + private AsteriskDbSipClient asteriskDbSipClient;
>>>>>>> >> + @Autowired
>>>>>>> >> private RoomModeratorsDaoImpl roomModeratorsDao;
>>>>>>> >> @Autowired
>>>>>>> >> private UsersDaoImpl usersDao;
>>>>>>> >> @@ -78,6 +87,8 @@ public class Roommanagement {
>>>>>>> >> private AuthLevelmanagement authLevelManagement;
>>>>>>> >> @Autowired
>>>>>>> >> private ClientListManager clientListManager;
>>>>>>> >> + @Autowired
>>>>>>> >> + private Configurationmanagement cfgManagement;
>>>>>>> >>
>>>>>>> >> /**
>>>>>>> >> * add a new Record to the table roomtypes
>>>>>>> >> @@ -102,6 +113,20 @@ public class Roommanagement {
>>>>>>> >>
>>>>>>> >> public Long addRoom(Rooms room) {
>>>>>>> >> try {
>>>>>>> >> + /* Red5SIP integration
>>>>>>> >>
>>>>>>> *******************************************************************************/
>>>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>>>> >> "red5sip.enable");
>>>>>>> >> + if(conf != null &&
>>>>>>> conf.getConf_value().equals("yes")) {
>>>>>>> >> + if(room.getSipNumber() != null &&
>>>>>>> >> !room.getSipNumber().isEmpty()) {
>>>>>>> >> + asteriskDbSipClient.createSIPConference(new
>>>>>>> >> SIPCreateConferenceRequest(room.getSipNumber()));
>>>>>>> >> + } else {
>>>>>>> >> + SipCreateConferenceRequestResult
>>>>>>> requestResult =
>>>>>>> >> asteriskDbSipClient.createSIPConference(new
>>>>>>> SIPCreateConferenceRequest());
>>>>>>> >> + if(!requestResult.hasError()) {
>>>>>>> >> +
>>>>>>> >> room.setSipNumber(requestResult.getConferenceNumber());
>>>>>>> >> +
>>>>>>> >> room.setConferencePin(requestResult.getConferencePin());
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >>
>>>>>>> /*****************************************************************************************************/
>>>>>>> >> room.setStarttime(new Date());
>>>>>>> >> room = em.merge(room);
>>>>>>> >> long returnId = room.getRooms_id();
>>>>>>> >> @@ -719,6 +744,25 @@ public class Roommanagement {
>>>>>>> >> return null;
>>>>>>> >> }
>>>>>>> >>
>>>>>>> >> + /**
>>>>>>> >> + * Returns number of SIP conference participants
>>>>>>> >> + * @param rooms_id id of room
>>>>>>> >> + * @return number of participants
>>>>>>> >> + */
>>>>>>> >> + public Integer getSipConferenceMembersNumber(Long rooms_id) {
>>>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>>>> >> "red5sip.enable");
>>>>>>> >> + if(conf != null && conf.getConf_value().equals("yes")) {
>>>>>>> >> + Rooms rooms = this.getRoomById(rooms_id);
>>>>>>> >> + if(rooms != null) {
>>>>>>> >> + return
>>>>>>> >>
>>>>>>> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
>>>>>>> >> + } else {
>>>>>>> >> + return 0;
>>>>>>> >> + }
>>>>>>> >> + } else {
>>>>>>> >> + return null;
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> /**
>>>>>>> >> * adds a new Record to the table rooms
>>>>>>> >> * @param name
>>>>>>> >> @@ -793,6 +837,19 @@ public class Roommanagement {
>>>>>>> >>
>>>>>>> >> r.setConferencePin(openXGReturnObject.getConferencePin());
>>>>>>> >> }
>>>>>>> >>
>>>>>>> >> + /* Red5SIP integration
>>>>>>> >>
>>>>>>> *******************************************************************************/
>>>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>>>> >> "red5sip.enable");
>>>>>>> >> + if(conf != null &&
>>>>>>> conf.getConf_value().equals("yes")) {
>>>>>>> >> + SipCreateConferenceRequestResult
>>>>>>> requestResult =
>>>>>>> >> asteriskDbSipClient
>>>>>>> >> + .createSIPConference(new
>>>>>>> >> SIPCreateConferenceRequest());
>>>>>>> >> +
>>>>>>> >> + if(!requestResult.hasError()) {
>>>>>>> >> +
>>>>>>> >> r.setSipNumber(requestResult.getConferenceNumber());
>>>>>>> >> +
>>>>>>> >> r.setConferencePin(requestResult.getConferencePin());
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >>
>>>>>>> /*****************************************************************************************************/
>>>>>>> >> +
>>>>>>> >> r = em.merge(r);
>>>>>>> >> long returnId = r.getRooms_id();
>>>>>>> >>
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -252,7 +252,8 @@ public class ImportInitvalues {
>>>>>>> >> String openxg_client_domain, String
>>>>>>> >> openxg_community_code,
>>>>>>> >> String openxg_language_code, String
>>>>>>> openxg_adminid,
>>>>>>> >> String sip_language_phonecode, String
>>>>>>> >> sip_phonerange_start,
>>>>>>> >> - String sip_phonerange, String jodPath) {
>>>>>>> >> + String sip_phonerange, String jodPath,
>>>>>>> >> + String red5sip_enable, String
>>>>>>> red5sip_room_prefix,String
>>>>>>> >> red5sip_exten_context) {
>>>>>>> >>
>>>>>>> >> cfgManagement
>>>>>>> >> .addConfByKey(
>>>>>>> >> @@ -349,6 +350,18 @@ public class ImportInitvalues {
>>>>>>> >> cfgManagement.addConfByKey(3,
>>>>>>> "default.rpc.userid", "" + 1,
>>>>>>> >> null,
>>>>>>> >> "The User-Id of the Control User in
>>>>>>> >> OpenMeetings");
>>>>>>> >>
>>>>>>> >> + // ***************************************
>>>>>>> >> + // ***************************************
>>>>>>> >> + // red5SIP Integration Coniguration Values
>>>>>>> >> + // ***************************************
>>>>>>> >> +
>>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.enable",
>>>>>>> red5sip_enable,
>>>>>>> >> null,
>>>>>>> >> + "Enable to enable the red5SIP
>>>>>>> integration
>>>>>>> >> ");
>>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
>>>>>>> >> red5sip_room_prefix, null,
>>>>>>> >> + "Enable to enable the red5SIP
>>>>>>> integration
>>>>>>> >> ");
>>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
>>>>>>> >> red5sip_exten_context, null,
>>>>>>> >> + "Enable to enable the red5SIP
>>>>>>> integration
>>>>>>> >> ");
>>>>>>> >> +
>>>>>>> >> // ***************************************
>>>>>>> >> // ***************************************
>>>>>>> >> // SIP Applet Configuration Values
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -19,6 +19,7 @@
>>>>>>> >> package org.openmeetings.app.remote.red5;
>>>>>>> >>
>>>>>>> >> import java.io.File;
>>>>>>> >> +import java.io.IOException;
>>>>>>> >> import java.util.ArrayList;
>>>>>>> >> import java.util.Collection;
>>>>>>> >> import java.util.Date;
>>>>>>> >> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
>>>>>>> >> return null;
>>>>>>> >> }
>>>>>>> >>
>>>>>>> >> + public synchronized List<Integer> listRoomBroadcast() {
>>>>>>> >> + List<Integer> broadcastList = new ArrayList<Integer>();
>>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>>> >> + String streamid = current.getClient().getId();
>>>>>>> >> + Collection<Set<IConnection>> conCollection =
>>>>>>> >> current.getScope().getConnections();
>>>>>>> >> + for (Set<IConnection> conset : conCollection) {
>>>>>>> >> + for (IConnection conn : conset) {
>>>>>>> >> + if (conn != null) {
>>>>>>> >> + RoomClient rcl = this.clientListManager
>>>>>>> >> + .getClientByStreamId(conn
>>>>>>> >> + .getClient().getId());
>>>>>>> >> + if (rcl == null) {
>>>>>>> >> + // continue;
>>>>>>> >> + } else if (rcl.getIsScreenClient() != null
>>>>>>> >> + && rcl.getIsScreenClient()) {
>>>>>>> >> + // continue;
>>>>>>> >> + } else {
>>>>>>> >> + if (!streamid.equals(rcl.getStreamid()))
>>>>>>> {
>>>>>>> >> + // It is not needed to send back
>>>>>>> >> + // that event to the actuall
>>>>>>> >> + // Moderator
>>>>>>> >> + // as it will be already triggered
>>>>>>> >> + // in the result of this Function
>>>>>>> >> + // in the Client
>>>>>>> >> +
>>>>>>> >> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + return broadcastList;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> +
>>>>>>> >> /**
>>>>>>> >> * this function is invoked directly after initial
>>>>>>> connecting
>>>>>>> >> *
>>>>>>> >> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
>>>>>>> >> }
>>>>>>> >> return null;
>>>>>>> >> }
>>>>>>> >> +
>>>>>>> >> + /*
>>>>>>> >> + * SIP transport methods
>>>>>>> >> + */
>>>>>>> >> +
>>>>>>> >> + public synchronized void updateSipTransport() {
>>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>>> >> + String streamid = current.getClient().getId();
>>>>>>> >> + RoomClient currentClient =
>>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>>> >> + log.debug("getSipConferenceMembersNumber: " +
>>>>>>> >>
>>>>>>> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
>>>>>>> >> + String newNumber =
>>>>>>> >>
>>>>>>> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
>>>>>>> >> + if(!newNumber.equals(currentClient.getLastname())) {
>>>>>>> >> + currentClient.setLastname(newNumber);
>>>>>>> >> +
>>>>>>> this.clientListManager.updateClientByStreamId(streamid,
>>>>>>> >> currentClient);
>>>>>>> >> + log.debug("updateSipTransport: {}, {}, {}, {}", new
>>>>>>> >> Object[]{currentClient.getPublicSID(),
>>>>>>> >> + currentClient.getRoom_id(),
>>>>>>> >> currentClient.getFirstname(), currentClient.getLastname()});
>>>>>>> >> + sendMessageWithClient(new
>>>>>>> >>
>>>>>>> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + /**
>>>>>>> >> + * Perform call to specified phone number and join to
>>>>>>> conference
>>>>>>> >> + * @param number to call
>>>>>>> >> + */
>>>>>>> >> + public synchronized void joinToConfCall(String number) {
>>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>>> >> + String streamid = current.getClient().getId();
>>>>>>> >> + RoomClient currentClient =
>>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>>> >> + Rooms rooms =
>>>>>>> >> roommanagement.getRoomById(currentClient.getRoom_id());
>>>>>>> >> + log.debug("asterisk -rx \"originate Local/" + number +
>>>>>>> "@rooms
>>>>>>> >> extension " + rooms.getSipNumber() + "@rooms\"");
>>>>>>> >> + try {
>>>>>>> >> + Process proc = Runtime.getRuntime().exec(new
>>>>>>> >> String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms
>>>>>>> extension
>>>>>>> >> " + rooms.getSipNumber() + "@rooms"});
>>>>>>> >> + } catch (IOException e) {
>>>>>>> >> + log.error("Executing asterisk originate error: ", e);
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public synchronized String getSipNumber(Long room_id) {
>>>>>>> >> + Rooms rooms = roommanagement.getRoomById(room_id);
>>>>>>> >> + if(rooms != null) {
>>>>>>> >> + log.debug("getSipNumber: room_id: {}, sipNumber:
>>>>>>> {}", new
>>>>>>> >> Object[]{room_id, rooms.getSipNumber()});
>>>>>>> >> + return rooms.getSipNumber();
>>>>>>> >> + }
>>>>>>> >> + return null;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public synchronized void setSipTransport(Long room_id, String
>>>>>>> >> publicSID, String broadCastId) {
>>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>>> >> + String streamid = current.getClient().getId();
>>>>>>> >> + Rooms room = roommanagement.getRoomById(room_id);
>>>>>>> >> + // Notify all clients of the same scope (room)
>>>>>>> >> + RoomClient currentClient =
>>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>>> >> + currentClient.setRoom_id(room_id);
>>>>>>> >> + currentClient.setRoomEnter(new Date());
>>>>>>> >> + currentClient.setFirstname("SIP Transport");
>>>>>>> >> +
>>>>>>> >>
>>>>>>> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
>>>>>>> >> +
>>>>>>> currentClient.setBroadCastID(Long.parseLong(broadCastId));
>>>>>>> >> + currentClient.setIsBroadcasting(true);
>>>>>>> >> + currentClient.setPublicSID(publicSID);
>>>>>>> >> + currentClient.setAvsettings("av");
>>>>>>> >> + currentClient.setVWidth(120);
>>>>>>> >> + currentClient.setVHeight(90);
>>>>>>> >> + this.clientListManager.updateClientByStreamId(streamid,
>>>>>>> >> currentClient);
>>>>>>> >> +
>>>>>>> >> + Collection<Set<IConnection>> conCollection = current
>>>>>>> >> + .getScope().getConnections();
>>>>>>> >> + for (Set<IConnection> conset : conCollection) {
>>>>>>> >> + for (IConnection conn : conset) {
>>>>>>> >> + if (conn != null) {
>>>>>>> >> + RoomClient rcl =
>>>>>>> >>
>>>>>>> this.clientListManager.getClientByStreamId(conn.getClient().getId());
>>>>>>> >> + if (rcl == null) {
>>>>>>> >> + // continue;
>>>>>>> >> + } else if (rcl.getIsScreenClient() != null
>>>>>>> >> + && rcl.getIsScreenClient()) {
>>>>>>> >> + // continue;
>>>>>>> >> + } else {
>>>>>>> >> + if (!streamid.equals(rcl.getStreamid()))
>>>>>>> {
>>>>>>> >> + // It is not needed to send back
>>>>>>> >> + // that event to the actuall
>>>>>>> >> + // Moderator
>>>>>>> >> + // as it will be already triggered
>>>>>>> >> + // in the result of this Function
>>>>>>> >> + // in the Client
>>>>>>> >> + if (conn instanceof
>>>>>>> >> IServiceCapableConnection) {
>>>>>>> >> + ((IServiceCapableConnection)
>>>>>>> >> conn).invoke("addNewUser", new Object[]{currentClient}, this);
>>>>>>> >> + ((IServiceCapableConnection)
>>>>>>> >> conn).invoke("newStream", new Object[]{currentClient}, this);
>>>>>>> >> + log.debug("sending
>>>>>>> setSipTransport to "
>>>>>>> >> + + conn);
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> + }
>>>>>>> >> }
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,19 @@
>>>>>>> >> +package org.openmeetings.app.sip.api;
>>>>>>> >> +
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>>> >> +import
>>>>>>> >>
>>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>>> >> +
>>>>>>> >> +/**
>>>>>>> >> + * SIP client interface
>>>>>>> >> + */
>>>>>>> >> +public interface ISIPClient {
>>>>>>> >> +
>>>>>>> >> + SIPCreateUserRequestResult createSIPUser(SIPCreateUserRequest
>>>>>>> >> request);
>>>>>>> >> +
>>>>>>> >> + SipCreateConferenceRequestResult
>>>>>>> >> createSIPConference(SIPCreateConferenceRequest request);
>>>>>>> >> +
>>>>>>> >> + Integer getConferenceMembersNumber(String sipNumber);
>>>>>>> >> +
>>>>>>> >> +}
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,58 @@
>>>>>>> >> +package org.openmeetings.app.sip.api.impl.asterisk;
>>>>>>> >> +
>>>>>>> >> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>>> >> +import org.openmeetings.app.sip.api.ISIPClient;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>>> >> +import
>>>>>>> >>
>>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>>>>>> >> +/**
>>>>>>> >> + *
>>>>>>> >> + */
>>>>>>> >> +public class AsteriskDbSipClient implements ISIPClient {
>>>>>>> >> +
>>>>>>> >> + @Autowired
>>>>>>> >> + private AsteriskDAOImpl asteriskDAO;
>>>>>>> >> +
>>>>>>> >> + public SIPCreateUserRequestResult createSIPUser(final
>>>>>>> >> SIPCreateUserRequest request) {
>>>>>>> >> + asteriskDAO.addSipUser(request.getLogin(),
>>>>>>> request.getPassword());
>>>>>>> >> + return new SIPCreateUserRequestResult() {
>>>>>>> >> + @Override
>>>>>>> >> + public UserSipData getUserSipData() {
>>>>>>> >> + UserSipData sipData = new UserSipData();
>>>>>>> >> + sipData.setAuthId(request.getLogin());
>>>>>>> >> + sipData.setUserpass(request.getPassword());
>>>>>>> >> + sipData.setUsername(request.getLogin());
>>>>>>> >> + return sipData;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public boolean hasError() {
>>>>>>> >> + return false;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getErrorMessage() {
>>>>>>> >> + return null;
>>>>>>> >> + }
>>>>>>> >> + };
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public SipCreateConferenceRequestResult
>>>>>>> >> createSIPConference(SIPCreateConferenceRequest request) {
>>>>>>> >> + String confno = asteriskDAO.addMeetMeConference();
>>>>>>> >> + return new SipCreateConferenceRequestResult(confno, "") {
>>>>>>> >> + public boolean hasError() {
>>>>>>> >> + return false;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getErrorMessage() {
>>>>>>> >> + return null;
>>>>>>> >> + }
>>>>>>> >> + };
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public Integer getConferenceMembersNumber(String sipNumber) {
>>>>>>> >> + return asteriskDAO.getConferensMembersNumber(sipNumber);
>>>>>>> >> + }
>>>>>>> >> +}
>>>>>>> >> \ No newline at end of file
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,76 @@
>>>>>>> >> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
>>>>>>> >> +
>>>>>>> >> +import org.openmeetings.app.OpenmeetingsVariables;
>>>>>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.persistence.beans.basic.Configuration;
>>>>>>> >> +import
>>>>>>> >>
>>>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
>>>>>>> >> +import
>>>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
>>>>>>> >> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
>>>>>>> >> +import org.red5.logging.Red5LoggerFactory;
>>>>>>> >> +import org.slf4j.Logger;
>>>>>>> >> +import org.springframework.transaction.annotation.Transactional;
>>>>>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>>>>>> >> +
>>>>>>> >> +import javax.persistence.EntityManager;
>>>>>>> >> +import javax.persistence.PersistenceContext;
>>>>>>> >> +
>>>>>>> >> +@Transactional
>>>>>>> >> +public class AsteriskDAOImpl {
>>>>>>> >> +
>>>>>>> >> + private static final Logger log =
>>>>>>> >> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
>>>>>>> >> OpenmeetingsVariables.webAppRootKey);
>>>>>>> >> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
>>>>>>> >> + @PersistenceContext
>>>>>>> >> + private EntityManager em;
>>>>>>> >> + @Autowired
>>>>>>> >> + private Configurationmanagement cfgManagement;
>>>>>>> >> +
>>>>>>> >> + public void addSipUser(String username, String secret) {
>>>>>>> >> + AsteriskSipUsers u = new AsteriskSipUsers();
>>>>>>> >> + Configuration conf =
>>>>>>> >> cfgManagement.getConfKey(3L,"red5sip.exten_context");
>>>>>>> >> + String defaultRoomContext = "rooms";
>>>>>>> >> + if(conf != null && !conf.getConf_value().isEmpty()) {
>>>>>>> >> + defaultRoomContext = conf.getConf_value();
>>>>>>> >> + }
>>>>>>> >> + u.setName(username);
>>>>>>> >> + u.setSecret(secret);
>>>>>>> >> + u.setContext(defaultRoomContext);
>>>>>>> >> + u.setHost("dynamic");
>>>>>>> >> + Extensions e = new Extensions();
>>>>>>> >> + e.setApp("Dial");
>>>>>>> >> + e.setAppdata("SIP/" + username);
>>>>>>> >> + e.setExten(username);
>>>>>>> >> + e.setContext(defaultRoomContext);
>>>>>>> >> + e.setPriority(1);
>>>>>>> >> + em.persist(u);
>>>>>>> >> + em.persist(e);
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String addMeetMeConference() {
>>>>>>> >> + int count = ((Number)em.createQuery("SELECT
>>>>>>> COUNT(m.confno) FROM
>>>>>>> >> MeetMe AS m").getSingleResult()).intValue();
>>>>>>> >> +
>>>>>>> >> + Configuration conf =
>>>>>>> >> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
>>>>>>> >> + String prefix = DEFAULT_SIP_CONTEXT;
>>>>>>> >> + if(conf != null) {
>>>>>>> >> + prefix = conf.getConf_value();
>>>>>>> >> + }
>>>>>>> >> + String confno = prefix+(count+1);
>>>>>>> >> + MeetMe mm = new MeetMe();
>>>>>>> >> + mm.setConfno(confno);
>>>>>>> >> + Extensions e = new Extensions();
>>>>>>> >> + e.setApp("MeetMe");
>>>>>>> >> + e.setAppdata(confno + ",dM");
>>>>>>> >> + e.setExten(confno);
>>>>>>> >> + e.setContext("rooms");
>>>>>>> >> + e.setPriority(1);
>>>>>>> >> + em.persist(mm);
>>>>>>> >> + em.persist(e);
>>>>>>> >> + return confno;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public Integer getConferensMembersNumber(String confNo) {
>>>>>>> >> + return ((Number)em.createQuery("SELECT m.members FROM
>>>>>>> MeetMe AS m
>>>>>>> >> WHERE m.confno=:confno")
>>>>>>> >> + .setParameter("confno", confNo)
>>>>>>> >> + .getSingleResult()).intValue();
>>>>>>> >> + }
>>>>>>> >> +}
>>>>>>> >> \ No newline at end of file
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,8 @@
>>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>>> >> +
>>>>>>> >> +/**
>>>>>>> >> + * Base interface for SIP API requests
>>>>>>> >> + */
>>>>>>> >> +public interface ISIPRequest {
>>>>>>> >> +
>>>>>>> >> +}
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,17 @@
>>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>>> >> +
>>>>>>> >> +/**
>>>>>>> >> + * Create SIP conferece request
>>>>>>> >> + */
>>>>>>> >> +public class SIPCreateConferenceRequest implements ISIPRequest {
>>>>>>> >> + private String sipNumber;
>>>>>>> >> +
>>>>>>> >> + public SIPCreateConferenceRequest() {
>>>>>>> >> + super(); //To change body of overridden methods use
>>>>>>> File |
>>>>>>> >> Settings | File Templates.
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public SIPCreateConferenceRequest(String sipNumber) {
>>>>>>> >> + super();
>>>>>>> >> + this.sipNumber = sipNumber;
>>>>>>> >> + }
>>>>>>> >> +}
>>>>>>> >> \ No newline at end of file
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,72 @@
>>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>>> >> +
>>>>>>> >> +/**
>>>>>>> >> + * Create User Request
>>>>>>> >> + */
>>>>>>> >> +public class SIPCreateUserRequest implements ISIPRequest {
>>>>>>> >> +
>>>>>>> >> + protected String firstName;
>>>>>>> >> + protected String middleName;
>>>>>>> >> + protected String lastName;
>>>>>>> >> + protected String email;
>>>>>>> >> + protected String login;
>>>>>>> >> + protected String password;
>>>>>>> >> +
>>>>>>> >> +
>>>>>>> >> + public SIPCreateUserRequest(String firstName, String
>>>>>>> middleName,
>>>>>>> >> String lastName, String email, String login, String password) {
>>>>>>> >> + this.firstName = firstName;
>>>>>>> >> + this.middleName = middleName;
>>>>>>> >> + this.lastName = lastName;
>>>>>>> >> + this.email = email;
>>>>>>> >> + this.login = login;
>>>>>>> >> + this.password = password;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public void withFirstName(String firstName) {
>>>>>>> >> + this.firstName = firstName;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public void withMiddleName(String middleName) {
>>>>>>> >> + this.middleName = middleName;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public void withLastName(String lastName) {
>>>>>>> >> + this.lastName = lastName;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public void withEmail(String email) {
>>>>>>> >> + this.email = email;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public void withLogin(String login) {
>>>>>>> >> + this.login = login;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public void withPassword(String password) {
>>>>>>> >> + this.password = password;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getFirstName() {
>>>>>>> >> + return firstName;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getMiddleName() {
>>>>>>> >> + return middleName;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getLastName() {
>>>>>>> >> + return lastName;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getEmail() {
>>>>>>> >> + return email;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getLogin() {
>>>>>>> >> + return login;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getPassword() {
>>>>>>> >> + return password;
>>>>>>> >> + }
>>>>>>> >> +}
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,12 @@
>>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>>> >> +
>>>>>>> >> +/**
>>>>>>> >> + * * Base interface for SIP API request's resuslt
>>>>>>> >> + */
>>>>>>> >> +public interface ISIPRequestResult {
>>>>>>> >> +
>>>>>>> >> + boolean hasError();
>>>>>>> >> +
>>>>>>> >> + String getErrorMessage();
>>>>>>> >> +
>>>>>>> >> +}
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,12 @@
>>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>>> >> +
>>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>>> >> +
>>>>>>> >> +/**
>>>>>>> >> + * TODO
>>>>>>> >> + */
>>>>>>> >> +public abstract class SIPCreateUserRequestResult implements
>>>>>>> >> ISIPRequestResult {
>>>>>>> >> +
>>>>>>> >> + abstract public UserSipData getUserSipData();
>>>>>>> >> +
>>>>>>> >> +}
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Added:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>> >> (added)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -0,0 +1,26 @@
>>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>>> >> +
>>>>>>> >> +/**
>>>>>>> >> + * TODO
>>>>>>> >> + */
>>>>>>> >> +public abstract class SipCreateConferenceRequestResult implements
>>>>>>> >> ISIPRequestResult {
>>>>>>> >> +
>>>>>>> >> + protected String conferenceNumber;
>>>>>>> >> + protected String conferencePin;
>>>>>>> >> +
>>>>>>> >> + protected SipCreateConferenceRequestResult() {
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + protected SipCreateConferenceRequestResult(String
>>>>>>> conferenceNumber,
>>>>>>> >> String conferencePin) {
>>>>>>> >> + this.conferenceNumber = conferenceNumber;
>>>>>>> >> + this.conferencePin = conferencePin;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getConferenceNumber() {
>>>>>>> >> + return conferenceNumber;
>>>>>>> >> + }
>>>>>>> >> +
>>>>>>> >> + public String getConferencePin() {
>>>>>>> >> + return conferencePin;
>>>>>>> >> + }
>>>>>>> >> +}
>>>>>>> >>
>>>>>>> >> Propchange:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>>> >>
>>>>>>> >>
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> >> svn:eol-style = native
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
>>>>>>> >> String screen_viewer =
>>>>>>> >> httpServletRequest
>>>>>>> >>
>>>>>>> >> .getParameter("screen_viewer");
>>>>>>> >>
>>>>>>> >> + // red5sip integration config
>>>>>>> >> + String red5sip_enable = httpServletRequest
>>>>>>> >> +
>>>>>>> >> .getParameter("red5sip_enable");
>>>>>>> >> + String red5sip_room_prefix =
>>>>>>> httpServletRequest
>>>>>>> >> +
>>>>>>> >> .getParameter("red5sip_room_prefix");
>>>>>>> >> + String red5sip_exten_context =
>>>>>>> httpServletRequest
>>>>>>> >> +
>>>>>>> >> .getParameter("red5sip_exten_context");
>>>>>>> >> +
>>>>>>> >> // SIP Applet Configuration
>>>>>>> >> String sip_enable =
>>>>>>> >> httpServletRequest
>>>>>>> >>
>>>>>>> >> .getParameter("sip_enable");
>>>>>>> >> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
>>>>>>> >>
>>>>>>> >> openxg_community_code, openxg_language_code,
>>>>>>> >>
>>>>>>> openxg_adminid,
>>>>>>> >> sip_language_phonecode,
>>>>>>> >>
>>>>>>> >> sip_phonerange_start, sip_phonerange,
>>>>>>> >> - jodPath);
>>>>>>> >> + jodPath,
>>>>>>> >> + red5sip_enable, red5sip_room_prefix,
>>>>>>> >> red5sip_exten_context);
>>>>>>> >>
>>>>>>> >>
>>>>>>> >> getImportInitvalues().loadInitUserAndOrganisation(username,
>>>>>>> >> userpass,
>>>>>>> >> useremail, orgname, timeZone, configdefaultLang);
>>>>>>> >>
>>>>>>> >> Modified:
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>>> >> URL:
>>>>>>> >>
>>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>>> >>
>>>>>>> >>
>>>>>>> ==============================================================================
>>>>>>> >> ---
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>>> >> (original)
>>>>>>> >> +++
>>>>>>> >>
>>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>>> >> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
>>>>>>> >> private static final String sip_phonerange_start = "";
>>>>>>> >> private static final String sip_phonerange = "";
>>>>>>> >> private static final String jodPath = "./jod/lib";
>>>>>>> >> + private static final String red5sip_enable = "no";
>>>>>>> >> + private static final String red5sip_room_prefix = "400";
>>>>>>> >> + private static final String red5sip_exten_context = "rooms";
>>>>>>> >> protected static final String username = "junit";
>>>>>>> >> protected static final String userpass = "test";
>>>>>>> >> private static final String orgname = "smoketest";
>>>>>>> >> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
>>>>>>> >> openxg_client_id,
>>>>>>> openxg_client_secret,
>>>>>>> >> openxg_client_domain,
>>>>>>> >> openxg_community_code,
>>>>>>> >> openxg_language_code, openxg_adminid,
>>>>>>> >> sip_language_phonecode,
>>>>>>> >> sip_phonerange_start, sip_phonerange,
>>>>>>> >> - jodPath);
>>>>>>> >> + jodPath, red5sip_enable,
>>>>>>> >> red5sip_room_prefix, red5sip_exten_context);
>>>>>>> >>
>>>>>>> >>
>>>>>>> importInitvalues.loadInitUserAndOrganisation(username,
>>>>>>> >> userpass,
>>>>>>> >> useremail, orgname, timeZone,
>>>>>>> >> configdefaultLang);
>>>>>>> >>
>>>>>>> >>
>>>>>>> >>
>>>>>>> >
>>>>>>> >
>>>>>>> > --
>>>>>>> > Sebastian Wagner
>>>>>>> > http://www.openmeetings.de
>>>>>>> > http://incubator.apache.org/openmeetings/
>>>>>>> > http://www.webbase-design.de
>>>>>>> > http://www.wagner-sebastian.com
>>>>>>> > seba.wagner@gmail.com
>>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> Timur Tleukenov
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Sebastian Wagner
>>>>> http://www.openmeetings.de
>>>>> http://incubator.apache.org/openmeetings/
>>>>> http://www.webbase-design.de
>>>>> http://www.wagner-sebastian.com
>>>>> seba.wagner@gmail.com
>>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> Sebastian Wagner
>>>> http://www.openmeetings.de
>>>> http://incubator.apache.org/openmeetings/
>>>> http://www.webbase-design.de
>>>> http://www.wagner-sebastian.com
>>>> seba.wagner@gmail.com
>>>>
>>>
>>>
>>>
>>> --
>>> Timur Tleukenov
>>>
>>
>>
>>
>> --
>> Timur Tleukenov
>>
>
>
>
> --
> Timur Tleukenov
>
--
Sebastian Wagner
http://www.openmeetings.de
http://incubator.apache.org/openmeetings/
http://www.webbase-design.de
http://www.wagner-sebastian.com
seba.wagner@gmail.com
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Posted by Тимур Тлеукенов <ti...@gmail.com>.
Yes, currently red5sip integration works works only with mysql. But I think
it possible to make it works with Asterisk ODBC realtime module instead of
mysql realtime.
2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
> Forgot to press "Reply to all" :-)
>
> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>
>> Such tables structure required by Asterisk Realtime module.
>> For MeetMe plugin table structure described here:
>> http://www.voip-info.org/wiki/view/Asterisk+RealTime+MeetMe.
>> May be it will work with other primary key, I will check it.
>>
>> 2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
>>
>>> It is looking great btw ;)
>>>
>>> But I have a question: The table "meetme", its primary key is a varchar
>>> and name is "confno"
>>>
>>> The pattern so far was, example:
>>> Table name: poll_types
>>> Primary Key: poll_type_id <Type bigint or int>
>>>
>>> Even "pure" assoziation tables like: rooms_organisations
>>> => In that table you assign rooms to organisation, so it _could_ have
>>> only two colums:
>>> rooms_id and organisation_id => however I consequently added a primary
>>> key with the table name: rooms_organisation_id to it.
>>>
>>> Now we have some new tables that have the primary_key column name "id"
>>> and the one table that has a varchar as primary key.
>>>
>>> Can we please find a consens together what pattern we use? I think it
>>> makes sense to call the primary key just "id" and not including the table
>>> name in it cause it lead to problems in the past if the column names are
>>> too long.
>>> But what about the "meetme" table? Is there a special reason for having
>>> a varchar primary key here? Is it possible to bring this in-line with the
>>> rest of the database table scheme?
>>>
>>> Thanks!
>>> Sebastian
>>>
>>> 2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
>>>
>>>> Hi Timur,
>>>>
>>>> please don't forget to add the new persistence classes also to the
>>>> other templates:
>>>> db2/derby/oracle/postgres
>>>>
>>>> Thanks!
>>>> Sebastian
>>>>
>>>> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>>>>
>>>>> Hi Sebastian,
>>>>>
>>>>> I added the missing files and license headers.
>>>>>
>>>>> 2012/3/27 Alexei Fedotov <al...@gmail.com>
>>>>>
>>>>>> Ok, I'm here. :-)
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> On Mon, Mar 26, 2012 at 6:03 PM, seba.wagner@gmail.com
>>>>>> <se...@gmail.com> wrote:
>>>>>> > Hi Timur,
>>>>>> >
>>>>>> > nice changeset :)
>>>>>> >
>>>>>> > But it seems like you've missed to checking some of your code:
>>>>>> >
>>>>>> https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
>>>>>> >
>>>>>> > The beans: AsteriskSipUsers, Extens, MeetMe are missing
>>>>>> >
>>>>>> > And you should enable the BackupExport/BackupImport to include and
>>>>>> > re-import the data from the new tables.
>>>>>> >
>>>>>> > We might also add some panels in the Admin UI to have the
>>>>>> possibility to
>>>>>> > save/edit/delete the settings from the OpenMeetings Admin UI in the
>>>>>> future.
>>>>>> >
>>>>>> > Thanks!
>>>>>> > Sebastian
>>>>>> >
>>>>>> > 2012/3/26 <ti...@apache.org>
>>>>>> >
>>>>>> >> Author: timur
>>>>>> >> Date: Mon Mar 26 09:14:15 2012
>>>>>> >> New Revision: 1305274
>>>>>> >>
>>>>>> >> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
>>>>>> >> Log:
>>>>>> >> red5sip integration:
>>>>>> >> - new Asterisk DAO added;
>>>>>> >> - new red5sip configurations added to install step1 template;
>>>>>> >> - new methods added to ScopeApplicationAdapter.java
>>>>>> >> - openjpa.QueryCache temporally disabled to make database changes
>>>>>> from
>>>>>> >> Asterisk visible in OM.
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>> >> (with props)
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>> >> (with props)
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>> >> (with props)
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>> >> (with props)
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>> >> (with props)
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>> >> (with props)
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>> >> (with props)
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>> >> (with props)
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>> >> (with props)
>>>>>> >> Modified:
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>> >> simplified.xml
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>> >> traditional.xml
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>> >> (studIP).xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>> >> brazil.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>> >>
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -204,7 +204,9 @@
>>>>>> >> <!-- No Interface -->
>>>>>> >> <bean id="manageCryptStyle"
>>>>>> >> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
>>>>>> >> <bean id="openXGHttpClient"
>>>>>> >> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
>>>>>> >> - <bean id="generateImage"
>>>>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>>>>> >> + <bean id="asteriskDbSipClient"
>>>>>> >>
>>>>>> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient" />
>>>>>> >> + <bean id="asteriskDAO"
>>>>>> >>
>>>>>> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
>>>>>> >> + <bean id="generateImage"
>>>>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>>>>> >> <bean id="generateThumbs"
>>>>>> >> class="org.openmeetings.app.documents.GenerateThumbs" />
>>>>>> >> <bean id="generatePDF"
>>>>>> >> class="org.openmeetings.app.documents.GeneratePDF" />
>>>>>> >> <bean id="mailHandler"
>>>>>> >> class="org.openmeetings.utils.mail.MailHandler" />
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>> >> simplified.xml (original)
>>>>>> >> +++
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>> >> simplified.xml Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>> >> traditional.xml (original)
>>>>>> >> +++
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>>> >> traditional.xml Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>> >> (studIP).xml (original)
>>>>>> >> +++
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>>> >> (studIP).xml Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>> >> brazil.xml (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>>> >> brazil.xml Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Ромеронабиратель SIP</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Mon
>>>>>> >> Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>>> >> <string id="1446" name="calendar edit button">
>>>>>> >> <value>Edit details</value>
>>>>>> >> </string>
>>>>>> >> + <string id="1447" name="sip show dialer">
>>>>>> >> + <value>Show sip dialer</value>
>>>>>> >> + </string>
>>>>>> >> + <string id="1448" name="sip call">
>>>>>> >> + <value>Call</value>
>>>>>> >> + </string>
>>>>>> >> </language>
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -225,8 +225,9 @@ of the red5-servlet
>>>>>> >> -->
>>>>>> >> <!-- Quality-Modus *normal* -->
>>>>>> >> <microphoneRateNormal>22</microphoneRateNormal>
>>>>>> >> -<!-- Microphone Settings Quality-Modus *best* -->
>>>>>> >> -<microphoneRateBest>44</microphoneRateBest>
>>>>>> >> +<!-- Microphone Settings Quality-Modus *best* -->
>>>>>> >> +<!-- TODO: red5sip support only 8 -->
>>>>>> >> +<microphoneRateBest>44</microphoneRateBest>
>>>>>> >>
>>>>>> >> <!--
>>>>>> >> The Size of the Whiteboard
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -47,7 +47,8 @@
>>>>>> >> <confmenucommand id="cmd_importFile"
>>>>>> >> onselect="canvas.doActionmenu('importFile')"
>>>>>> key="['ALT','Shift','I']"/>
>>>>>> >> <confmenucommand id="cmd_editCamMicSettings"
>>>>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"
>>>>>> >> key="['ALT','Shift','1']"/>
>>>>>> >> <confmenucommand id="cmd_editBoardSettings"
>>>>>> >> onselect="canvas.doActionmenu('editBoardSettings')"
>>>>>> >> key="['ALT','Shift','2']"/>
>>>>>> >> - <confmenucommand id="cmd_quit"
>>>>>> onselect="canvas.doActionmenu('quit')"
>>>>>> >> key="['ALT','Shift','E']"/>
>>>>>> >> + <confmenucommand id="cmd_quit"
>>>>>> onselect="canvas.doActionmenu('quit')"
>>>>>> >> key="['ALT','Shift','E']"/>
>>>>>> >> + <confmenucommand id="cmd_showSipDialer"
>>>>>> >> onselect="canvas.doActionmenu('showSipDialer')"
>>>>>> key="['ALT','Shift','D']" />
>>>>>> >>
>>>>>> >> <confmenucommand id="cmd_applyforMod_nokey"
>>>>>> >> onselect="canvas.doActionmenu('applyForMod')" />
>>>>>> >> <confmenucommand id="cmd_createPoll_nokey"
>>>>>> >> onselect="canvas.doActionmenu('createPoll')" />
>>>>>> >> @@ -56,7 +57,8 @@
>>>>>> >> <confmenucommand id="cmd_importFile_nokey"
>>>>>> >> onselect="canvas.doActionmenu('importFile')" />
>>>>>> >> <confmenucommand id="cmd_editCamMicSettings_nokey"
>>>>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"/>
>>>>>> >> <confmenucommand id="cmd_editBoardSettings_nokey"
>>>>>> >> onselect="canvas.doActionmenu('editBoardSettings')" />
>>>>>> >> - <confmenucommand id="cmd_quit_nokey"
>>>>>> >> onselect="canvas.doActionmenu('quit')" />
>>>>>> >> + <confmenucommand id="cmd_quit_nokey"
>>>>>> >> onselect="canvas.doActionmenu('quit')" />
>>>>>> >> + <confmenucommand id="cmd_showSipDialer_nokey"
>>>>>> >> onselect="canvas.doActionmenu('showSipDialer')" />
>>>>>> >>
>>>>>> >> <!--
>>>>>> >> <command id="cmd_browser_open"
>>>>>> >> onselect="canvas.doActionmenu('browser_open')"
>>>>>> key="['ALT','Shift','B']"/>
>>>>>> >> @@ -402,6 +404,8 @@
>>>>>> >> canvas.thishib.applyForModeration.doCall();
>>>>>> >> } else if (stringSub=='editCamMicSettings') {
>>>>>> >>
>>>>>> >> canvas._videocontainer._videoviewcontent.changeDevice();
>>>>>> >> + } else if (stringSub=='showSipDialer') {
>>>>>> >> + new
>>>>>> lz.sipDialer(canvas.main_content._content.inner);
>>>>>> >> } else if (stringSub=='editBoardSettings') {
>>>>>> >> new
>>>>>> >> lz.editWhiteboardDefault(canvas.main_content._content.inner);
>>>>>> >> } else if (stringSub=='quit') {
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -47,9 +47,9 @@
>>>>>> >> </method>
>>>>>> >> </class>
>>>>>> >>
>>>>>> >> - <!--- Menu for public/private conference and audience
>>>>>> room. This
>>>>>> >> class shows
>>>>>> >> - exit, moderator, file, setteings and poll menu.
>>>>>> Those menu
>>>>>> >> items are connected
>>>>>> >> - to each command that has been declared in
>>>>>> >> base/mainMethods.lzx. May 24 2008
>>>>>> >> + <!--- Menu for public/private conference and audience
>>>>>> room. This
>>>>>> >> class shows
>>>>>> >> + exit, moderator, file, setteings and poll menu.
>>>>>> Those menu
>>>>>> >> items are connected
>>>>>> >> + to each command that has been declared in
>>>>>> >> base/mainMethods.lzx. May 24 2008
>>>>>> >> commented by onokeiji@gmail.com -->
>>>>>> >> <class name="conferenceMenubar" extends="menubar"
>>>>>> height="28"
>>>>>> >> style="itemStyle">
>>>>>> >> @@ -83,7 +83,7 @@
>>>>>> >> parent._exitbtn.destroy();
>>>>>> >> }
>>>>>> >> }
>>>>>> >> -
>>>>>> >> +
>>>>>> >> if(canvas.isrtl == 'true'){
>>>>>> >> if ($debug) Debug.write("onInit :
>>>>>> Setting
>>>>>> >> nokey");
>>>>>> >>
>>>>>> lblImport.setCommand(cmd_importFile_nokey);
>>>>>> >> @@ -92,11 +92,11 @@
>>>>>> >> </handler>
>>>>>> >> <_labelMenuItem id="lblImport" labelid="15"
>>>>>> >> command="cmd_importFile" enabled="${
>>>>>> >> canvas.ismoderator }" />
>>>>>> >> - <!-- <menuseparator/> <_labelMenuItem
>>>>>> >> labelid="561" command="cmd_exportFilePNG"
>>>>>> >> - /> <_labelMenuItem labelid="562"
>>>>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>>>>> >> - labelid="563"
>>>>>> command="cmd_exportFilePDF"
>>>>>> >> /> <_labelMenuItem labelid="560"
>>>>>> >> - command="cmd_exportFileSVG" />
>>>>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>>>>> >> - /> <menuseparator/> <_labelMenuItem
>>>>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>>>>> >> + <!-- <menuseparator/> <_labelMenuItem
>>>>>> >> labelid="561" command="cmd_exportFilePNG"
>>>>>> >> + /> <_labelMenuItem labelid="562"
>>>>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>>>>> >> + labelid="563"
>>>>>> command="cmd_exportFilePDF"
>>>>>> >> /> <_labelMenuItem labelid="560"
>>>>>> >> + command="cmd_exportFileSVG" />
>>>>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>>>>> >> + /> <menuseparator/> <_labelMenuItem
>>>>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>>>>> >> value="quit" /> -->
>>>>>> >> </_labelMenu>
>>>>>> >>
>>>>>> >> @@ -104,7 +104,7 @@
>>>>>> >>
>>>>>> >> <handler name="oninit">
>>>>>> >> <![CDATA[
>>>>>> >> -
>>>>>> >> +
>>>>>> >> if(canvas.isrtl == 'true'){
>>>>>> >> if ($debug) Debug.write("onInit :
>>>>>> Setting
>>>>>> >> nokey");
>>>>>> >>
>>>>>> >> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
>>>>>> >> @@ -112,6 +112,7 @@
>>>>>> >>
>>>>>> lblPoll.setCommand(cmd_createPoll_nokey);
>>>>>> >>
>>>>>> >> lblPollResult.setCommand(cmd_pollResults_nokey);
>>>>>> >>
>>>>>> >> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
>>>>>> >> +
>>>>>> >> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
>>>>>> >> }
>>>>>> >> //hideActionsMenu
>>>>>> >>
>>>>>> if(canvas.currentRoomObj.hideActionsMenu){
>>>>>> >> @@ -133,7 +134,7 @@
>>>>>> >> </handler>
>>>>>> >> </_labelMenuItem>
>>>>>> >> <menuseparator />
>>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>> >> canvas.ismoderator }" />
>>>>>> <menuseparator/>
>>>>>> >> -->
>>>>>> >> <_labelMenuItem id="lblCamMic" labelid="306"
>>>>>> >> command="cmd_editCamMicSettings" />
>>>>>> >> @@ -177,14 +178,17 @@
>>>>>> >> <_labelMenuItem width="250" id="lblPollVote"
>>>>>> >> labelid="42"
>>>>>> >> command="cmd_checkPollVoted" />
>>>>>> >> <menuseparator />
>>>>>> >> + <_labelMenuItem width="250" id="lblShowSipDialer"
>>>>>> >> labelid="1447"
>>>>>> >> + command="cmd_showSipDialer" />
>>>>>> >> + <menuseparator />
>>>>>> >> <_labelMenuItem width="250" labelid="1126"
>>>>>> >> command="cmd_editWhiteboardDefault"
>>>>>> />
>>>>>> >> </_labelMenu>
>>>>>> >> -
>>>>>> >> - <!-- exit room <_labelMenu labelid="308"
>>>>>> width="250">
>>>>>> >> </_labelMenu> <_labelMenu
>>>>>> >> - labelid="301" width="250"> <_labelMenuItem
>>>>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>>>>> >> - /> </_labelMenu> <_labelMenu labelid="305"
>>>>>> >> width="250"> <_labelMenuItem labelid="306"
>>>>>> >> - command="cmd_editCamMicSettings" />
>>>>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>>>>> >> +
>>>>>> >> + <!-- exit room <_labelMenu labelid="308"
>>>>>> width="250">
>>>>>> >> </_labelMenu> <_labelMenu
>>>>>> >> + labelid="301" width="250"> <_labelMenuItem
>>>>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>>>>> >> + /> </_labelMenu> <_labelMenu labelid="305"
>>>>>> >> width="250"> <_labelMenuItem labelid="306"
>>>>>> >> + command="cmd_editCamMicSettings" />
>>>>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>>>>> >> /> </_labelMenu> <_labelMenu labelid="303"
>>>>>> >> width="250"> </_labelMenu> -->
>>>>>> >>
>>>>>> >> </class>
>>>>>> >> @@ -258,7 +262,7 @@
>>>>>> >> </handler>
>>>>>> >> </_labelMenuItem>
>>>>>> >> <menuseparator />
>>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>> >> canvas.ismoderator }" />
>>>>>> >> <menuseparator/> -->
>>>>>> >> <_labelMenuItem labelid="306"
>>>>>> >> command="cmd_editCamMicSettings"
>>>>>> >> enabled="${
>>>>>> canvas.ismoderator }" />
>>>>>> >> @@ -358,7 +362,7 @@
>>>>>> >> </handler>
>>>>>> >> </_labelMenuItem>
>>>>>> >> <menuseparator />
>>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>>> >> command="cmd_coBrowser" enabled="${
>>>>>> >> canvas.ismoderator }" />
>>>>>> >> <menuseparator/> -->
>>>>>> >> <_labelMenuItem labelid="306"
>>>>>> >> command="cmd_editCamMicSettings"
>>>>>> >> enabled="${
>>>>>> canvas.ismoderator }" />
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -65,6 +65,7 @@
>>>>>> >> <include href="restricted/" />
>>>>>> >> <include href="browser/" />
>>>>>> >> <include href="testsetup/" />
>>>>>> >> + <include href="sip/" />
>>>>>> >>
>>>>>> >> <include href="flexibleConferenceRoom/" />
>>>>>> >>
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,6 @@
>>>>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>>>>> >> +<library>
>>>>>> >> +
>>>>>> >> + <include href="sipDialer.lzx" />
>>>>>> >> +
>>>>>> >> +</library>
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,81 @@
>>>>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>>>>> >> +<library>
>>>>>> >> +
>>>>>> >> +<class name="sipDialer" extends="window" bgcolor="gray"
>>>>>> width="200">
>>>>>> >> + <simplelayout axis="y" spacing="5"/>
>>>>>> >> + <labelText labelid="1003"/>
>>>>>> >> + <view name="phoneNumber" width="100%">
>>>>>> >> + <inputtext name="input"
>>>>>> >> width="$once{parent.width-parent.del.width}" height="20"
>>>>>> bgcolor="white"/>
>>>>>> >> + <button name="del" x="$once{parent.input.width}"
>>>>>> width="30"
>>>>>> >> height="20" onclick="this.del();">
>>>>>> >> + â†
>>>>>> >> + <method name="del">
>>>>>> >> + var t = parent.input.text;
>>>>>> >> + if(t.length != 0) {
>>>>>> >> + t = t.substr(0, t.length - 1);
>>>>>> >> + parent.input.setAttribute('text', t);
>>>>>> >> + }
>>>>>> >> + </method>
>>>>>> >> + </button>
>>>>>> >> + </view>
>>>>>> >> +
>>>>>> >> + <view name="dialerButtons" align="center">
>>>>>> >> + <vbox spacing="5">
>>>>>> >> + <hbox spacing="5">
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('1')"
>>>>>> >> width="40">1</button>
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('2')"
>>>>>> >> width="40">2</button>
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('3')"
>>>>>> >> width="40">3</button>
>>>>>> >> + </hbox>
>>>>>> >> + <hbox spacing="5">
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('4')"
>>>>>> >> width="40">4</button>
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('5')"
>>>>>> >> width="40">5</button>
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('6')"
>>>>>> >> width="40">6</button>
>>>>>> >> + </hbox>
>>>>>> >> + <hbox spacing="5">
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('7')"
>>>>>> >> width="40">7</button>
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('8')"
>>>>>> >> width="40">8</button>
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('9')"
>>>>>> >> width="40">9</button>
>>>>>> >> + </hbox>
>>>>>> >> + <hbox spacing="5">
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('*')"
>>>>>> >> width="40">*</button>
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('0')"
>>>>>> >> width="40">0</button>
>>>>>> >> + <button
>>>>>> onclick="parent.parent.parent.parent.dial('#')"
>>>>>> >> width="40">#</button>
>>>>>> >> + </hbox>
>>>>>> >> + </vbox>
>>>>>> >> + </view>
>>>>>> >> + <hbox spacing="10" align="center">
>>>>>> >> + <simpleLabelButton labelid="1448" name="callButton">
>>>>>> >> + <handler name="onclick">
>>>>>> >> + parent.parent.joinToConfCall.doCall();
>>>>>> >> + </handler>
>>>>>> >> + </simpleLabelButton>
>>>>>> >> + <simpleLabelButton labelid="85" name="closeButton">
>>>>>> >> + <handler name="onclick">
>>>>>> >> + canvas.sipDialer = null;
>>>>>> >> + parent.parent.destroy();
>>>>>> >> + </handler>
>>>>>> >> + </simpleLabelButton>
>>>>>> >> + </hbox>
>>>>>> >> + <handler name="oninit">
>>>>>> >> + if(canvas.sipDialer != null) {
>>>>>> >> + canvas.sipDialer.destroy();
>>>>>> >> + }
>>>>>> >> + canvas.setAttribute('sipDialer', this);
>>>>>> >> + this.bringToFront();
>>>>>> >> + </handler>
>>>>>> >> +
>>>>>> >> + <method name="dial" args="digit">
>>>>>> >> + this.phoneNumber.input.setAttribute('text',
>>>>>> >> this.phoneNumber.input.text + digit);
>>>>>> >> + </method>
>>>>>> >> +
>>>>>> >> + <netRemoteCallHib name="joinToConfCall"
>>>>>> funcname="joinToConfCall"
>>>>>> >> remotecontext="$once{ canvas.thishib }">
>>>>>> >> + <netparam><method name="getValue">return
>>>>>> >> parent.parent.phoneNumber.input.text</method></netparam>
>>>>>> >> + <handler name="ondata" args="value">
>>>>>> >> + <![CDATA[
>>>>>> >> + //The onResult-Handler will be called be the
>>>>>> rtmpconnection
>>>>>> >> + if($debug) Debug.write("joinToConfCall : ",value);
>>>>>> >> + ]]>
>>>>>> >> + </handler>
>>>>>> >> + </netRemoteCallHib>
>>>>>> >> +</class>
>>>>>> >> +
>>>>>> >> +</library>
>>>>>> >> \ No newline at end of file
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -67,6 +67,9 @@
>>>>>> >>
>>>>>> >>
>>>>>> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
>>>>>> >>
>>>>>> >> <class>org.openmeetings.app.persistence.beans.user.Users</class>
>>>>>> >>
>>>>>> >>
>>>>>> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
>>>>>> >> +
>>>>>> >>
>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
>>>>>> >> +
>>>>>> >>
>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
>>>>>> >> +
>>>>>> >>
>>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
>>>>>> >>
>>>>>> <exclude-unlisted-classes>false</exclude-unlisted-classes>
>>>>>> >> <properties>
>>>>>> >> <property
>>>>>> >> name="openjpa.ConnectionProperties"
>>>>>> >> @@ -83,7 +86,8 @@
>>>>>> >> <property name="openjpa.Log"
>>>>>> >> value="DefaultLevel=WARN, Tool=INFO" />
>>>>>> >> <property
>>>>>> >> name="openjpa.ConnectionDriverName"
>>>>>> >> value="org.apache.commons.dbcp.BasicDataSource"/>
>>>>>> >> <property name="openjpa.DataCache"
>>>>>> >> value="true"/>
>>>>>> >> - <property name="openjpa.QueryCache"
>>>>>> >> value="true"/>
>>>>>> >> + <!-- QueryCache disabled due to changes outside
>>>>>> of JPA
>>>>>> >> doesn't take effect with caching -->
>>>>>> >> + <property name="openjpa.QueryCache"
>>>>>> >> value="false"/>
>>>>>> >> <property
>>>>>> name="openjpa.jdbc.DBDictionary"
>>>>>> >> value="batchLimit=100,tableType=myisam"/>
>>>>>> >> <property
>>>>>> name="openjpa.jdbc.QuerySQLCache"
>>>>>> >> value="false"/>
>>>>>> >> </properties>
>>>>>> >>
>>>>>> >> Modified:
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Mon
>>>>>> >> Mar 26 09:14:15 2012
>>>>>> >> @@ -331,7 +331,36 @@ function checkEmail()
>>>>>> >>
>>>>>> >> </i></p>
>>>>>> >>
>>>>>> >> - </fieldset>
>>>>>> >> + </fieldset>
>>>>>> >> +
>>>>>> >> + <fieldset id="red5sip">
>>>>>> >> + <legend>red5SIP Configuration</legend>
>>>>>> >> +
>>>>>> >> + <li>
>>>>>> >> + <label for="red5sip_enable">Enable SIP</label>
>>>>>> >> + <select name="red5sip_enable" id="red5sip_enable" size="1">
>>>>>> >> + <option value="yes">Yes</option>
>>>>>> >> + <option value="no" selected>No</option>
>>>>>> >> + </select><br />
>>>>>> >> + </li>
>>>>>> >> + <p><i>
>>>>>> >> + Enable red5SIP integration
>>>>>> >> + </i></p>
>>>>>> >> + <br />
>>>>>> >> +
>>>>>> >> + <li>
>>>>>> >> + <label for="red5sip_room_prefix">SIP rooms prefix</label>
>>>>>> >> + <input name="red5sip_room_prefix" id="red5sip_room_prefix"
>>>>>> >> size="27" title="" type="text" value="400" />
>>>>>> >> + <p><i>Prefix for phone number of conference rooms</i></p>
>>>>>> >> + </li>
>>>>>> >> +
>>>>>> >> + <li>
>>>>>> >> + <label for="red5sip_exten_context">SIP extensions
>>>>>> context</label>
>>>>>> >> + <input name="red5sip_exten_context"
>>>>>> id="red5sip_exten_context"
>>>>>> >> size="27" title="" type="text" value="rooms" />
>>>>>> >> + <p><i>Context of Asterisk extensions</i></p>
>>>>>> >> + </li>
>>>>>> >> +
>>>>>> >> + </fieldset>
>>>>>> >>
>>>>>> >> <fieldset id="sip">
>>>>>> >>
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
>>>>>> >>
>>>>>> >> import org.openmeetings.app.conference.session.RoomClient;
>>>>>> >> import org.openmeetings.app.data.basic.AuthLevelmanagement;
>>>>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>>>>> >> import org.openmeetings.app.data.beans.basic.SearchResult;
>>>>>> >> import
>>>>>> org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
>>>>>> >> import org.openmeetings.app.data.user.Organisationmanagement;
>>>>>> >> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
>>>>>> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>>>>>> >> import
>>>>>> org.openmeetings.app.persistence.beans.domain.Organisation_Users;
>>>>>> >> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
>>>>>> >> import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>>>>> >> import
>>>>>> org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
>>>>>> >> import
>>>>>> org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>> >> import org.openmeetings.app.persistence.beans.user.Users;
>>>>>> >> import org.openmeetings.app.remote.red5.ClientListManager;
>>>>>> >> +import
>>>>>> org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
>>>>>> >> +import
>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>> >> +import
>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>> >> +import
>>>>>> >>
>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>> >> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
>>>>>> >> import org.red5.logging.Red5LoggerFactory;
>>>>>> >> import org.slf4j.Logger;
>>>>>> >> @@ -71,6 +78,8 @@ public class Roommanagement {
>>>>>> >> @Autowired
>>>>>> >> private OpenXGHttpClient openXGHttpClient;
>>>>>> >> @Autowired
>>>>>> >> + private AsteriskDbSipClient asteriskDbSipClient;
>>>>>> >> + @Autowired
>>>>>> >> private RoomModeratorsDaoImpl roomModeratorsDao;
>>>>>> >> @Autowired
>>>>>> >> private UsersDaoImpl usersDao;
>>>>>> >> @@ -78,6 +87,8 @@ public class Roommanagement {
>>>>>> >> private AuthLevelmanagement authLevelManagement;
>>>>>> >> @Autowired
>>>>>> >> private ClientListManager clientListManager;
>>>>>> >> + @Autowired
>>>>>> >> + private Configurationmanagement cfgManagement;
>>>>>> >>
>>>>>> >> /**
>>>>>> >> * add a new Record to the table roomtypes
>>>>>> >> @@ -102,6 +113,20 @@ public class Roommanagement {
>>>>>> >>
>>>>>> >> public Long addRoom(Rooms room) {
>>>>>> >> try {
>>>>>> >> + /* Red5SIP integration
>>>>>> >>
>>>>>> *******************************************************************************/
>>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>>> >> "red5sip.enable");
>>>>>> >> + if(conf != null &&
>>>>>> conf.getConf_value().equals("yes")) {
>>>>>> >> + if(room.getSipNumber() != null &&
>>>>>> >> !room.getSipNumber().isEmpty()) {
>>>>>> >> + asteriskDbSipClient.createSIPConference(new
>>>>>> >> SIPCreateConferenceRequest(room.getSipNumber()));
>>>>>> >> + } else {
>>>>>> >> + SipCreateConferenceRequestResult
>>>>>> requestResult =
>>>>>> >> asteriskDbSipClient.createSIPConference(new
>>>>>> SIPCreateConferenceRequest());
>>>>>> >> + if(!requestResult.hasError()) {
>>>>>> >> +
>>>>>> >> room.setSipNumber(requestResult.getConferenceNumber());
>>>>>> >> +
>>>>>> >> room.setConferencePin(requestResult.getConferencePin());
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> +
>>>>>> >>
>>>>>> /*****************************************************************************************************/
>>>>>> >> room.setStarttime(new Date());
>>>>>> >> room = em.merge(room);
>>>>>> >> long returnId = room.getRooms_id();
>>>>>> >> @@ -719,6 +744,25 @@ public class Roommanagement {
>>>>>> >> return null;
>>>>>> >> }
>>>>>> >>
>>>>>> >> + /**
>>>>>> >> + * Returns number of SIP conference participants
>>>>>> >> + * @param rooms_id id of room
>>>>>> >> + * @return number of participants
>>>>>> >> + */
>>>>>> >> + public Integer getSipConferenceMembersNumber(Long rooms_id) {
>>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>>> >> "red5sip.enable");
>>>>>> >> + if(conf != null && conf.getConf_value().equals("yes")) {
>>>>>> >> + Rooms rooms = this.getRoomById(rooms_id);
>>>>>> >> + if(rooms != null) {
>>>>>> >> + return
>>>>>> >>
>>>>>> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
>>>>>> >> + } else {
>>>>>> >> + return 0;
>>>>>> >> + }
>>>>>> >> + } else {
>>>>>> >> + return null;
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> /**
>>>>>> >> * adds a new Record to the table rooms
>>>>>> >> * @param name
>>>>>> >> @@ -793,6 +837,19 @@ public class Roommanagement {
>>>>>> >>
>>>>>> >> r.setConferencePin(openXGReturnObject.getConferencePin());
>>>>>> >> }
>>>>>> >>
>>>>>> >> + /* Red5SIP integration
>>>>>> >>
>>>>>> *******************************************************************************/
>>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>>> >> "red5sip.enable");
>>>>>> >> + if(conf != null &&
>>>>>> conf.getConf_value().equals("yes")) {
>>>>>> >> + SipCreateConferenceRequestResult
>>>>>> requestResult =
>>>>>> >> asteriskDbSipClient
>>>>>> >> + .createSIPConference(new
>>>>>> >> SIPCreateConferenceRequest());
>>>>>> >> +
>>>>>> >> + if(!requestResult.hasError()) {
>>>>>> >> +
>>>>>> >> r.setSipNumber(requestResult.getConferenceNumber());
>>>>>> >> +
>>>>>> >> r.setConferencePin(requestResult.getConferencePin());
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> +
>>>>>> >>
>>>>>> /*****************************************************************************************************/
>>>>>> >> +
>>>>>> >> r = em.merge(r);
>>>>>> >> long returnId = r.getRooms_id();
>>>>>> >>
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -252,7 +252,8 @@ public class ImportInitvalues {
>>>>>> >> String openxg_client_domain, String
>>>>>> >> openxg_community_code,
>>>>>> >> String openxg_language_code, String
>>>>>> openxg_adminid,
>>>>>> >> String sip_language_phonecode, String
>>>>>> >> sip_phonerange_start,
>>>>>> >> - String sip_phonerange, String jodPath) {
>>>>>> >> + String sip_phonerange, String jodPath,
>>>>>> >> + String red5sip_enable, String
>>>>>> red5sip_room_prefix,String
>>>>>> >> red5sip_exten_context) {
>>>>>> >>
>>>>>> >> cfgManagement
>>>>>> >> .addConfByKey(
>>>>>> >> @@ -349,6 +350,18 @@ public class ImportInitvalues {
>>>>>> >> cfgManagement.addConfByKey(3, "default.rpc.userid",
>>>>>> "" + 1,
>>>>>> >> null,
>>>>>> >> "The User-Id of the Control User in
>>>>>> >> OpenMeetings");
>>>>>> >>
>>>>>> >> + // ***************************************
>>>>>> >> + // ***************************************
>>>>>> >> + // red5SIP Integration Coniguration Values
>>>>>> >> + // ***************************************
>>>>>> >> +
>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.enable",
>>>>>> red5sip_enable,
>>>>>> >> null,
>>>>>> >> + "Enable to enable the red5SIP
>>>>>> integration
>>>>>> >> ");
>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
>>>>>> >> red5sip_room_prefix, null,
>>>>>> >> + "Enable to enable the red5SIP
>>>>>> integration
>>>>>> >> ");
>>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
>>>>>> >> red5sip_exten_context, null,
>>>>>> >> + "Enable to enable the red5SIP
>>>>>> integration
>>>>>> >> ");
>>>>>> >> +
>>>>>> >> // ***************************************
>>>>>> >> // ***************************************
>>>>>> >> // SIP Applet Configuration Values
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -19,6 +19,7 @@
>>>>>> >> package org.openmeetings.app.remote.red5;
>>>>>> >>
>>>>>> >> import java.io.File;
>>>>>> >> +import java.io.IOException;
>>>>>> >> import java.util.ArrayList;
>>>>>> >> import java.util.Collection;
>>>>>> >> import java.util.Date;
>>>>>> >> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
>>>>>> >> return null;
>>>>>> >> }
>>>>>> >>
>>>>>> >> + public synchronized List<Integer> listRoomBroadcast() {
>>>>>> >> + List<Integer> broadcastList = new ArrayList<Integer>();
>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>> >> + String streamid = current.getClient().getId();
>>>>>> >> + Collection<Set<IConnection>> conCollection =
>>>>>> >> current.getScope().getConnections();
>>>>>> >> + for (Set<IConnection> conset : conCollection) {
>>>>>> >> + for (IConnection conn : conset) {
>>>>>> >> + if (conn != null) {
>>>>>> >> + RoomClient rcl = this.clientListManager
>>>>>> >> + .getClientByStreamId(conn
>>>>>> >> + .getClient().getId());
>>>>>> >> + if (rcl == null) {
>>>>>> >> + // continue;
>>>>>> >> + } else if (rcl.getIsScreenClient() != null
>>>>>> >> + && rcl.getIsScreenClient()) {
>>>>>> >> + // continue;
>>>>>> >> + } else {
>>>>>> >> + if (!streamid.equals(rcl.getStreamid())) {
>>>>>> >> + // It is not needed to send back
>>>>>> >> + // that event to the actuall
>>>>>> >> + // Moderator
>>>>>> >> + // as it will be already triggered
>>>>>> >> + // in the result of this Function
>>>>>> >> + // in the Client
>>>>>> >> +
>>>>>> >> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + return broadcastList;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> +
>>>>>> >> /**
>>>>>> >> * this function is invoked directly after initial
>>>>>> connecting
>>>>>> >> *
>>>>>> >> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
>>>>>> >> }
>>>>>> >> return null;
>>>>>> >> }
>>>>>> >> +
>>>>>> >> + /*
>>>>>> >> + * SIP transport methods
>>>>>> >> + */
>>>>>> >> +
>>>>>> >> + public synchronized void updateSipTransport() {
>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>> >> + String streamid = current.getClient().getId();
>>>>>> >> + RoomClient currentClient =
>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>> >> + log.debug("getSipConferenceMembersNumber: " +
>>>>>> >>
>>>>>> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
>>>>>> >> + String newNumber =
>>>>>> >>
>>>>>> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
>>>>>> >> + if(!newNumber.equals(currentClient.getLastname())) {
>>>>>> >> + currentClient.setLastname(newNumber);
>>>>>> >> +
>>>>>> this.clientListManager.updateClientByStreamId(streamid,
>>>>>> >> currentClient);
>>>>>> >> + log.debug("updateSipTransport: {}, {}, {}, {}", new
>>>>>> >> Object[]{currentClient.getPublicSID(),
>>>>>> >> + currentClient.getRoom_id(),
>>>>>> >> currentClient.getFirstname(), currentClient.getLastname()});
>>>>>> >> + sendMessageWithClient(new
>>>>>> >>
>>>>>> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + /**
>>>>>> >> + * Perform call to specified phone number and join to
>>>>>> conference
>>>>>> >> + * @param number to call
>>>>>> >> + */
>>>>>> >> + public synchronized void joinToConfCall(String number) {
>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>> >> + String streamid = current.getClient().getId();
>>>>>> >> + RoomClient currentClient =
>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>> >> + Rooms rooms =
>>>>>> >> roommanagement.getRoomById(currentClient.getRoom_id());
>>>>>> >> + log.debug("asterisk -rx \"originate Local/" + number +
>>>>>> "@rooms
>>>>>> >> extension " + rooms.getSipNumber() + "@rooms\"");
>>>>>> >> + try {
>>>>>> >> + Process proc = Runtime.getRuntime().exec(new
>>>>>> >> String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms
>>>>>> extension
>>>>>> >> " + rooms.getSipNumber() + "@rooms"});
>>>>>> >> + } catch (IOException e) {
>>>>>> >> + log.error("Executing asterisk originate error: ", e);
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public synchronized String getSipNumber(Long room_id) {
>>>>>> >> + Rooms rooms = roommanagement.getRoomById(room_id);
>>>>>> >> + if(rooms != null) {
>>>>>> >> + log.debug("getSipNumber: room_id: {}, sipNumber: {}",
>>>>>> new
>>>>>> >> Object[]{room_id, rooms.getSipNumber()});
>>>>>> >> + return rooms.getSipNumber();
>>>>>> >> + }
>>>>>> >> + return null;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public synchronized void setSipTransport(Long room_id, String
>>>>>> >> publicSID, String broadCastId) {
>>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>>> >> + String streamid = current.getClient().getId();
>>>>>> >> + Rooms room = roommanagement.getRoomById(room_id);
>>>>>> >> + // Notify all clients of the same scope (room)
>>>>>> >> + RoomClient currentClient =
>>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>>> >> + currentClient.setRoom_id(room_id);
>>>>>> >> + currentClient.setRoomEnter(new Date());
>>>>>> >> + currentClient.setFirstname("SIP Transport");
>>>>>> >> +
>>>>>> >>
>>>>>> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
>>>>>> >> + currentClient.setBroadCastID(Long.parseLong(broadCastId));
>>>>>> >> + currentClient.setIsBroadcasting(true);
>>>>>> >> + currentClient.setPublicSID(publicSID);
>>>>>> >> + currentClient.setAvsettings("av");
>>>>>> >> + currentClient.setVWidth(120);
>>>>>> >> + currentClient.setVHeight(90);
>>>>>> >> + this.clientListManager.updateClientByStreamId(streamid,
>>>>>> >> currentClient);
>>>>>> >> +
>>>>>> >> + Collection<Set<IConnection>> conCollection = current
>>>>>> >> + .getScope().getConnections();
>>>>>> >> + for (Set<IConnection> conset : conCollection) {
>>>>>> >> + for (IConnection conn : conset) {
>>>>>> >> + if (conn != null) {
>>>>>> >> + RoomClient rcl =
>>>>>> >>
>>>>>> this.clientListManager.getClientByStreamId(conn.getClient().getId());
>>>>>> >> + if (rcl == null) {
>>>>>> >> + // continue;
>>>>>> >> + } else if (rcl.getIsScreenClient() != null
>>>>>> >> + && rcl.getIsScreenClient()) {
>>>>>> >> + // continue;
>>>>>> >> + } else {
>>>>>> >> + if (!streamid.equals(rcl.getStreamid())) {
>>>>>> >> + // It is not needed to send back
>>>>>> >> + // that event to the actuall
>>>>>> >> + // Moderator
>>>>>> >> + // as it will be already triggered
>>>>>> >> + // in the result of this Function
>>>>>> >> + // in the Client
>>>>>> >> + if (conn instanceof
>>>>>> >> IServiceCapableConnection) {
>>>>>> >> + ((IServiceCapableConnection)
>>>>>> >> conn).invoke("addNewUser", new Object[]{currentClient}, this);
>>>>>> >> + ((IServiceCapableConnection)
>>>>>> >> conn).invoke("newStream", new Object[]{currentClient}, this);
>>>>>> >> + log.debug("sending
>>>>>> setSipTransport to "
>>>>>> >> + + conn);
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> + }
>>>>>> >> }
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,19 @@
>>>>>> >> +package org.openmeetings.app.sip.api;
>>>>>> >> +
>>>>>> >> +import
>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>>>>> >> +import
>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>> >> +import
>>>>>> >>
>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>> >> +
>>>>>> >> +/**
>>>>>> >> + * SIP client interface
>>>>>> >> + */
>>>>>> >> +public interface ISIPClient {
>>>>>> >> +
>>>>>> >> + SIPCreateUserRequestResult createSIPUser(SIPCreateUserRequest
>>>>>> >> request);
>>>>>> >> +
>>>>>> >> + SipCreateConferenceRequestResult
>>>>>> >> createSIPConference(SIPCreateConferenceRequest request);
>>>>>> >> +
>>>>>> >> + Integer getConferenceMembersNumber(String sipNumber);
>>>>>> >> +
>>>>>> >> +}
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,58 @@
>>>>>> >> +package org.openmeetings.app.sip.api.impl.asterisk;
>>>>>> >> +
>>>>>> >> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>> >> +import org.openmeetings.app.sip.api.ISIPClient;
>>>>>> >> +import
>>>>>> org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
>>>>>> >> +import
>>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>>>>> >> +import
>>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>>> >> +import
>>>>>> >>
>>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>>>>> >> +/**
>>>>>> >> + *
>>>>>> >> + */
>>>>>> >> +public class AsteriskDbSipClient implements ISIPClient {
>>>>>> >> +
>>>>>> >> + @Autowired
>>>>>> >> + private AsteriskDAOImpl asteriskDAO;
>>>>>> >> +
>>>>>> >> + public SIPCreateUserRequestResult createSIPUser(final
>>>>>> >> SIPCreateUserRequest request) {
>>>>>> >> + asteriskDAO.addSipUser(request.getLogin(),
>>>>>> request.getPassword());
>>>>>> >> + return new SIPCreateUserRequestResult() {
>>>>>> >> + @Override
>>>>>> >> + public UserSipData getUserSipData() {
>>>>>> >> + UserSipData sipData = new UserSipData();
>>>>>> >> + sipData.setAuthId(request.getLogin());
>>>>>> >> + sipData.setUserpass(request.getPassword());
>>>>>> >> + sipData.setUsername(request.getLogin());
>>>>>> >> + return sipData;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public boolean hasError() {
>>>>>> >> + return false;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getErrorMessage() {
>>>>>> >> + return null;
>>>>>> >> + }
>>>>>> >> + };
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public SipCreateConferenceRequestResult
>>>>>> >> createSIPConference(SIPCreateConferenceRequest request) {
>>>>>> >> + String confno = asteriskDAO.addMeetMeConference();
>>>>>> >> + return new SipCreateConferenceRequestResult(confno, "") {
>>>>>> >> + public boolean hasError() {
>>>>>> >> + return false;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getErrorMessage() {
>>>>>> >> + return null;
>>>>>> >> + }
>>>>>> >> + };
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public Integer getConferenceMembersNumber(String sipNumber) {
>>>>>> >> + return asteriskDAO.getConferensMembersNumber(sipNumber);
>>>>>> >> + }
>>>>>> >> +}
>>>>>> >> \ No newline at end of file
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,76 @@
>>>>>> >> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
>>>>>> >> +
>>>>>> >> +import org.openmeetings.app.OpenmeetingsVariables;
>>>>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>>>>> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>>>>>> >> +import
>>>>>> >>
>>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
>>>>>> >> +import
>>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
>>>>>> >> +import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
>>>>>> >> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
>>>>>> >> +import org.red5.logging.Red5LoggerFactory;
>>>>>> >> +import org.slf4j.Logger;
>>>>>> >> +import org.springframework.transaction.annotation.Transactional;
>>>>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>>>>> >> +
>>>>>> >> +import javax.persistence.EntityManager;
>>>>>> >> +import javax.persistence.PersistenceContext;
>>>>>> >> +
>>>>>> >> +@Transactional
>>>>>> >> +public class AsteriskDAOImpl {
>>>>>> >> +
>>>>>> >> + private static final Logger log =
>>>>>> >> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
>>>>>> >> OpenmeetingsVariables.webAppRootKey);
>>>>>> >> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
>>>>>> >> + @PersistenceContext
>>>>>> >> + private EntityManager em;
>>>>>> >> + @Autowired
>>>>>> >> + private Configurationmanagement cfgManagement;
>>>>>> >> +
>>>>>> >> + public void addSipUser(String username, String secret) {
>>>>>> >> + AsteriskSipUsers u = new AsteriskSipUsers();
>>>>>> >> + Configuration conf =
>>>>>> >> cfgManagement.getConfKey(3L,"red5sip.exten_context");
>>>>>> >> + String defaultRoomContext = "rooms";
>>>>>> >> + if(conf != null && !conf.getConf_value().isEmpty()) {
>>>>>> >> + defaultRoomContext = conf.getConf_value();
>>>>>> >> + }
>>>>>> >> + u.setName(username);
>>>>>> >> + u.setSecret(secret);
>>>>>> >> + u.setContext(defaultRoomContext);
>>>>>> >> + u.setHost("dynamic");
>>>>>> >> + Extensions e = new Extensions();
>>>>>> >> + e.setApp("Dial");
>>>>>> >> + e.setAppdata("SIP/" + username);
>>>>>> >> + e.setExten(username);
>>>>>> >> + e.setContext(defaultRoomContext);
>>>>>> >> + e.setPriority(1);
>>>>>> >> + em.persist(u);
>>>>>> >> + em.persist(e);
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String addMeetMeConference() {
>>>>>> >> + int count = ((Number)em.createQuery("SELECT
>>>>>> COUNT(m.confno) FROM
>>>>>> >> MeetMe AS m").getSingleResult()).intValue();
>>>>>> >> +
>>>>>> >> + Configuration conf =
>>>>>> >> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
>>>>>> >> + String prefix = DEFAULT_SIP_CONTEXT;
>>>>>> >> + if(conf != null) {
>>>>>> >> + prefix = conf.getConf_value();
>>>>>> >> + }
>>>>>> >> + String confno = prefix+(count+1);
>>>>>> >> + MeetMe mm = new MeetMe();
>>>>>> >> + mm.setConfno(confno);
>>>>>> >> + Extensions e = new Extensions();
>>>>>> >> + e.setApp("MeetMe");
>>>>>> >> + e.setAppdata(confno + ",dM");
>>>>>> >> + e.setExten(confno);
>>>>>> >> + e.setContext("rooms");
>>>>>> >> + e.setPriority(1);
>>>>>> >> + em.persist(mm);
>>>>>> >> + em.persist(e);
>>>>>> >> + return confno;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public Integer getConferensMembersNumber(String confNo) {
>>>>>> >> + return ((Number)em.createQuery("SELECT m.members FROM
>>>>>> MeetMe AS m
>>>>>> >> WHERE m.confno=:confno")
>>>>>> >> + .setParameter("confno", confNo)
>>>>>> >> + .getSingleResult()).intValue();
>>>>>> >> + }
>>>>>> >> +}
>>>>>> >> \ No newline at end of file
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,8 @@
>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>> >> +
>>>>>> >> +/**
>>>>>> >> + * Base interface for SIP API requests
>>>>>> >> + */
>>>>>> >> +public interface ISIPRequest {
>>>>>> >> +
>>>>>> >> +}
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,17 @@
>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>> >> +
>>>>>> >> +/**
>>>>>> >> + * Create SIP conferece request
>>>>>> >> + */
>>>>>> >> +public class SIPCreateConferenceRequest implements ISIPRequest {
>>>>>> >> + private String sipNumber;
>>>>>> >> +
>>>>>> >> + public SIPCreateConferenceRequest() {
>>>>>> >> + super(); //To change body of overridden methods use
>>>>>> File |
>>>>>> >> Settings | File Templates.
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public SIPCreateConferenceRequest(String sipNumber) {
>>>>>> >> + super();
>>>>>> >> + this.sipNumber = sipNumber;
>>>>>> >> + }
>>>>>> >> +}
>>>>>> >> \ No newline at end of file
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,72 @@
>>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>>> >> +
>>>>>> >> +/**
>>>>>> >> + * Create User Request
>>>>>> >> + */
>>>>>> >> +public class SIPCreateUserRequest implements ISIPRequest {
>>>>>> >> +
>>>>>> >> + protected String firstName;
>>>>>> >> + protected String middleName;
>>>>>> >> + protected String lastName;
>>>>>> >> + protected String email;
>>>>>> >> + protected String login;
>>>>>> >> + protected String password;
>>>>>> >> +
>>>>>> >> +
>>>>>> >> + public SIPCreateUserRequest(String firstName, String
>>>>>> middleName,
>>>>>> >> String lastName, String email, String login, String password) {
>>>>>> >> + this.firstName = firstName;
>>>>>> >> + this.middleName = middleName;
>>>>>> >> + this.lastName = lastName;
>>>>>> >> + this.email = email;
>>>>>> >> + this.login = login;
>>>>>> >> + this.password = password;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public void withFirstName(String firstName) {
>>>>>> >> + this.firstName = firstName;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public void withMiddleName(String middleName) {
>>>>>> >> + this.middleName = middleName;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public void withLastName(String lastName) {
>>>>>> >> + this.lastName = lastName;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public void withEmail(String email) {
>>>>>> >> + this.email = email;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public void withLogin(String login) {
>>>>>> >> + this.login = login;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public void withPassword(String password) {
>>>>>> >> + this.password = password;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getFirstName() {
>>>>>> >> + return firstName;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getMiddleName() {
>>>>>> >> + return middleName;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getLastName() {
>>>>>> >> + return lastName;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getEmail() {
>>>>>> >> + return email;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getLogin() {
>>>>>> >> + return login;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getPassword() {
>>>>>> >> + return password;
>>>>>> >> + }
>>>>>> >> +}
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,12 @@
>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>> >> +
>>>>>> >> +/**
>>>>>> >> + * * Base interface for SIP API request's resuslt
>>>>>> >> + */
>>>>>> >> +public interface ISIPRequestResult {
>>>>>> >> +
>>>>>> >> + boolean hasError();
>>>>>> >> +
>>>>>> >> + String getErrorMessage();
>>>>>> >> +
>>>>>> >> +}
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,12 @@
>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>> >> +
>>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>>> >> +
>>>>>> >> +/**
>>>>>> >> + * TODO
>>>>>> >> + */
>>>>>> >> +public abstract class SIPCreateUserRequestResult implements
>>>>>> >> ISIPRequestResult {
>>>>>> >> +
>>>>>> >> + abstract public UserSipData getUserSipData();
>>>>>> >> +
>>>>>> >> +}
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Added:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>> >> (added)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -0,0 +1,26 @@
>>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>>> >> +
>>>>>> >> +/**
>>>>>> >> + * TODO
>>>>>> >> + */
>>>>>> >> +public abstract class SipCreateConferenceRequestResult implements
>>>>>> >> ISIPRequestResult {
>>>>>> >> +
>>>>>> >> + protected String conferenceNumber;
>>>>>> >> + protected String conferencePin;
>>>>>> >> +
>>>>>> >> + protected SipCreateConferenceRequestResult() {
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + protected SipCreateConferenceRequestResult(String
>>>>>> conferenceNumber,
>>>>>> >> String conferencePin) {
>>>>>> >> + this.conferenceNumber = conferenceNumber;
>>>>>> >> + this.conferencePin = conferencePin;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getConferenceNumber() {
>>>>>> >> + return conferenceNumber;
>>>>>> >> + }
>>>>>> >> +
>>>>>> >> + public String getConferencePin() {
>>>>>> >> + return conferencePin;
>>>>>> >> + }
>>>>>> >> +}
>>>>>> >>
>>>>>> >> Propchange:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>>> >>
>>>>>> >>
>>>>>> ------------------------------------------------------------------------------
>>>>>> >> svn:eol-style = native
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
>>>>>> >> String screen_viewer =
>>>>>> >> httpServletRequest
>>>>>> >>
>>>>>> >> .getParameter("screen_viewer");
>>>>>> >>
>>>>>> >> + // red5sip integration config
>>>>>> >> + String red5sip_enable = httpServletRequest
>>>>>> >> +
>>>>>> >> .getParameter("red5sip_enable");
>>>>>> >> + String red5sip_room_prefix =
>>>>>> httpServletRequest
>>>>>> >> +
>>>>>> >> .getParameter("red5sip_room_prefix");
>>>>>> >> + String red5sip_exten_context =
>>>>>> httpServletRequest
>>>>>> >> +
>>>>>> >> .getParameter("red5sip_exten_context");
>>>>>> >> +
>>>>>> >> // SIP Applet Configuration
>>>>>> >> String sip_enable =
>>>>>> >> httpServletRequest
>>>>>> >>
>>>>>> >> .getParameter("sip_enable");
>>>>>> >> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
>>>>>> >>
>>>>>> >> openxg_community_code, openxg_language_code,
>>>>>> >>
>>>>>> openxg_adminid,
>>>>>> >> sip_language_phonecode,
>>>>>> >>
>>>>>> >> sip_phonerange_start, sip_phonerange,
>>>>>> >> - jodPath);
>>>>>> >> + jodPath,
>>>>>> >> + red5sip_enable, red5sip_room_prefix,
>>>>>> >> red5sip_exten_context);
>>>>>> >>
>>>>>> >>
>>>>>> >> getImportInitvalues().loadInitUserAndOrganisation(username,
>>>>>> >> userpass,
>>>>>> >> useremail, orgname, timeZone, configdefaultLang);
>>>>>> >>
>>>>>> >> Modified:
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>> >> URL:
>>>>>> >>
>>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>>> >>
>>>>>> >>
>>>>>> ==============================================================================
>>>>>> >> ---
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>> >> (original)
>>>>>> >> +++
>>>>>> >>
>>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>>> >> Mon Mar 26 09:14:15 2012
>>>>>> >> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
>>>>>> >> private static final String sip_phonerange_start = "";
>>>>>> >> private static final String sip_phonerange = "";
>>>>>> >> private static final String jodPath = "./jod/lib";
>>>>>> >> + private static final String red5sip_enable = "no";
>>>>>> >> + private static final String red5sip_room_prefix = "400";
>>>>>> >> + private static final String red5sip_exten_context = "rooms";
>>>>>> >> protected static final String username = "junit";
>>>>>> >> protected static final String userpass = "test";
>>>>>> >> private static final String orgname = "smoketest";
>>>>>> >> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
>>>>>> >> openxg_client_id,
>>>>>> openxg_client_secret,
>>>>>> >> openxg_client_domain,
>>>>>> >> openxg_community_code,
>>>>>> >> openxg_language_code, openxg_adminid,
>>>>>> >> sip_language_phonecode,
>>>>>> >> sip_phonerange_start, sip_phonerange,
>>>>>> >> - jodPath);
>>>>>> >> + jodPath, red5sip_enable,
>>>>>> >> red5sip_room_prefix, red5sip_exten_context);
>>>>>> >>
>>>>>> >>
>>>>>> importInitvalues.loadInitUserAndOrganisation(username,
>>>>>> >> userpass,
>>>>>> >> useremail, orgname, timeZone,
>>>>>> >> configdefaultLang);
>>>>>> >>
>>>>>> >>
>>>>>> >>
>>>>>> >
>>>>>> >
>>>>>> > --
>>>>>> > Sebastian Wagner
>>>>>> > http://www.openmeetings.de
>>>>>> > http://incubator.apache.org/openmeetings/
>>>>>> > http://www.webbase-design.de
>>>>>> > http://www.wagner-sebastian.com
>>>>>> > seba.wagner@gmail.com
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Timur Tleukenov
>>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> Sebastian Wagner
>>>> http://www.openmeetings.de
>>>> http://incubator.apache.org/openmeetings/
>>>> http://www.webbase-design.de
>>>> http://www.wagner-sebastian.com
>>>> seba.wagner@gmail.com
>>>>
>>>
>>>
>>>
>>> --
>>> Sebastian Wagner
>>> http://www.openmeetings.de
>>> http://incubator.apache.org/openmeetings/
>>> http://www.webbase-design.de
>>> http://www.wagner-sebastian.com
>>> seba.wagner@gmail.com
>>>
>>
>>
>>
>> --
>> Timur Tleukenov
>>
>
>
>
> --
> Timur Tleukenov
>
--
Timur Tleukenov
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Posted by Тимур Тлеукенов <ti...@gmail.com>.
Forgot to press "Reply to all" :-)
2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
> Such tables structure required by Asterisk Realtime module.
> For MeetMe plugin table structure described here:
> http://www.voip-info.org/wiki/view/Asterisk+RealTime+MeetMe.
> May be it will work with other primary key, I will check it.
>
> 2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
>
>> It is looking great btw ;)
>>
>> But I have a question: The table "meetme", its primary key is a varchar
>> and name is "confno"
>>
>> The pattern so far was, example:
>> Table name: poll_types
>> Primary Key: poll_type_id <Type bigint or int>
>>
>> Even "pure" assoziation tables like: rooms_organisations
>> => In that table you assign rooms to organisation, so it _could_ have
>> only two colums:
>> rooms_id and organisation_id => however I consequently added a primary
>> key with the table name: rooms_organisation_id to it.
>>
>> Now we have some new tables that have the primary_key column name "id"
>> and the one table that has a varchar as primary key.
>>
>> Can we please find a consens together what pattern we use? I think it
>> makes sense to call the primary key just "id" and not including the table
>> name in it cause it lead to problems in the past if the column names are
>> too long.
>> But what about the "meetme" table? Is there a special reason for having a
>> varchar primary key here? Is it possible to bring this in-line with the
>> rest of the database table scheme?
>>
>> Thanks!
>> Sebastian
>>
>> 2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
>>
>>> Hi Timur,
>>>
>>> please don't forget to add the new persistence classes also to the other
>>> templates:
>>> db2/derby/oracle/postgres
>>>
>>> Thanks!
>>> Sebastian
>>>
>>> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>>>
>>>> Hi Sebastian,
>>>>
>>>> I added the missing files and license headers.
>>>>
>>>> 2012/3/27 Alexei Fedotov <al...@gmail.com>
>>>>
>>>>> Ok, I'm here. :-)
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> On Mon, Mar 26, 2012 at 6:03 PM, seba.wagner@gmail.com
>>>>> <se...@gmail.com> wrote:
>>>>> > Hi Timur,
>>>>> >
>>>>> > nice changeset :)
>>>>> >
>>>>> > But it seems like you've missed to checking some of your code:
>>>>> >
>>>>> https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
>>>>> >
>>>>> > The beans: AsteriskSipUsers, Extens, MeetMe are missing
>>>>> >
>>>>> > And you should enable the BackupExport/BackupImport to include and
>>>>> > re-import the data from the new tables.
>>>>> >
>>>>> > We might also add some panels in the Admin UI to have the
>>>>> possibility to
>>>>> > save/edit/delete the settings from the OpenMeetings Admin UI in the
>>>>> future.
>>>>> >
>>>>> > Thanks!
>>>>> > Sebastian
>>>>> >
>>>>> > 2012/3/26 <ti...@apache.org>
>>>>> >
>>>>> >> Author: timur
>>>>> >> Date: Mon Mar 26 09:14:15 2012
>>>>> >> New Revision: 1305274
>>>>> >>
>>>>> >> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
>>>>> >> Log:
>>>>> >> red5sip integration:
>>>>> >> - new Asterisk DAO added;
>>>>> >> - new red5sip configurations added to install step1 template;
>>>>> >> - new methods added to ScopeApplicationAdapter.java
>>>>> >> - openjpa.QueryCache temporally disabled to make database changes
>>>>> from
>>>>> >> Asterisk visible in OM.
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>> >> (with props)
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>> >> (with props)
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>> >> (with props)
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>> >> (with props)
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>> >> (with props)
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>> >> (with props)
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>> >> (with props)
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>> >> (with props)
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>> >> (with props)
>>>>> >> Modified:
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>> >> simplified.xml
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>> >> traditional.xml
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>> >> (studIP).xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>> >> brazil.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>> >> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>> >>
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -204,7 +204,9 @@
>>>>> >> <!-- No Interface -->
>>>>> >> <bean id="manageCryptStyle"
>>>>> >> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
>>>>> >> <bean id="openXGHttpClient"
>>>>> >> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
>>>>> >> - <bean id="generateImage"
>>>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>>>> >> + <bean id="asteriskDbSipClient"
>>>>> >>
>>>>> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient" />
>>>>> >> + <bean id="asteriskDAO"
>>>>> >>
>>>>> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
>>>>> >> + <bean id="generateImage"
>>>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>>>> >> <bean id="generateThumbs"
>>>>> >> class="org.openmeetings.app.documents.GenerateThumbs" />
>>>>> >> <bean id="generatePDF"
>>>>> >> class="org.openmeetings.app.documents.GeneratePDF" />
>>>>> >> <bean id="mailHandler"
>>>>> >> class="org.openmeetings.utils.mail.MailHandler" />
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>> >> simplified.xml (original)
>>>>> >> +++
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>> >> simplified.xml Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>> >> traditional.xml (original)
>>>>> >> +++
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>>>> >> traditional.xml Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</value>
>>>>> >> + </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>> >> (studIP).xml (original)
>>>>> >> +++
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>>>> >> (studIP).xml Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>> >> brazil.xml (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>>>> >> brazil.xml Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Ромеронабиратель SIP</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Mon
>>>>> >> Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>>>> >> <string id="1446" name="calendar edit button">
>>>>> >> <value>Edit details</value>
>>>>> >> </string>
>>>>> >> + <string id="1447" name="sip show dialer">
>>>>> >> + <value>Show sip dialer</value>
>>>>> >> + </string>
>>>>> >> + <string id="1448" name="sip call">
>>>>> >> + <value>Call</value>
>>>>> >> + </string>
>>>>> >> </language>
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -225,8 +225,9 @@ of the red5-servlet
>>>>> >> -->
>>>>> >> <!-- Quality-Modus *normal* -->
>>>>> >> <microphoneRateNormal>22</microphoneRateNormal>
>>>>> >> -<!-- Microphone Settings Quality-Modus *best* -->
>>>>> >> -<microphoneRateBest>44</microphoneRateBest>
>>>>> >> +<!-- Microphone Settings Quality-Modus *best* -->
>>>>> >> +<!-- TODO: red5sip support only 8 -->
>>>>> >> +<microphoneRateBest>44</microphoneRateBest>
>>>>> >>
>>>>> >> <!--
>>>>> >> The Size of the Whiteboard
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -47,7 +47,8 @@
>>>>> >> <confmenucommand id="cmd_importFile"
>>>>> >> onselect="canvas.doActionmenu('importFile')"
>>>>> key="['ALT','Shift','I']"/>
>>>>> >> <confmenucommand id="cmd_editCamMicSettings"
>>>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"
>>>>> >> key="['ALT','Shift','1']"/>
>>>>> >> <confmenucommand id="cmd_editBoardSettings"
>>>>> >> onselect="canvas.doActionmenu('editBoardSettings')"
>>>>> >> key="['ALT','Shift','2']"/>
>>>>> >> - <confmenucommand id="cmd_quit"
>>>>> onselect="canvas.doActionmenu('quit')"
>>>>> >> key="['ALT','Shift','E']"/>
>>>>> >> + <confmenucommand id="cmd_quit"
>>>>> onselect="canvas.doActionmenu('quit')"
>>>>> >> key="['ALT','Shift','E']"/>
>>>>> >> + <confmenucommand id="cmd_showSipDialer"
>>>>> >> onselect="canvas.doActionmenu('showSipDialer')"
>>>>> key="['ALT','Shift','D']" />
>>>>> >>
>>>>> >> <confmenucommand id="cmd_applyforMod_nokey"
>>>>> >> onselect="canvas.doActionmenu('applyForMod')" />
>>>>> >> <confmenucommand id="cmd_createPoll_nokey"
>>>>> >> onselect="canvas.doActionmenu('createPoll')" />
>>>>> >> @@ -56,7 +57,8 @@
>>>>> >> <confmenucommand id="cmd_importFile_nokey"
>>>>> >> onselect="canvas.doActionmenu('importFile')" />
>>>>> >> <confmenucommand id="cmd_editCamMicSettings_nokey"
>>>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"/>
>>>>> >> <confmenucommand id="cmd_editBoardSettings_nokey"
>>>>> >> onselect="canvas.doActionmenu('editBoardSettings')" />
>>>>> >> - <confmenucommand id="cmd_quit_nokey"
>>>>> >> onselect="canvas.doActionmenu('quit')" />
>>>>> >> + <confmenucommand id="cmd_quit_nokey"
>>>>> >> onselect="canvas.doActionmenu('quit')" />
>>>>> >> + <confmenucommand id="cmd_showSipDialer_nokey"
>>>>> >> onselect="canvas.doActionmenu('showSipDialer')" />
>>>>> >>
>>>>> >> <!--
>>>>> >> <command id="cmd_browser_open"
>>>>> >> onselect="canvas.doActionmenu('browser_open')"
>>>>> key="['ALT','Shift','B']"/>
>>>>> >> @@ -402,6 +404,8 @@
>>>>> >> canvas.thishib.applyForModeration.doCall();
>>>>> >> } else if (stringSub=='editCamMicSettings') {
>>>>> >>
>>>>> >> canvas._videocontainer._videoviewcontent.changeDevice();
>>>>> >> + } else if (stringSub=='showSipDialer') {
>>>>> >> + new
>>>>> lz.sipDialer(canvas.main_content._content.inner);
>>>>> >> } else if (stringSub=='editBoardSettings') {
>>>>> >> new
>>>>> >> lz.editWhiteboardDefault(canvas.main_content._content.inner);
>>>>> >> } else if (stringSub=='quit') {
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -47,9 +47,9 @@
>>>>> >> </method>
>>>>> >> </class>
>>>>> >>
>>>>> >> - <!--- Menu for public/private conference and audience room.
>>>>> This
>>>>> >> class shows
>>>>> >> - exit, moderator, file, setteings and poll menu.
>>>>> Those menu
>>>>> >> items are connected
>>>>> >> - to each command that has been declared in
>>>>> >> base/mainMethods.lzx. May 24 2008
>>>>> >> + <!--- Menu for public/private conference and audience room.
>>>>> This
>>>>> >> class shows
>>>>> >> + exit, moderator, file, setteings and poll menu.
>>>>> Those menu
>>>>> >> items are connected
>>>>> >> + to each command that has been declared in
>>>>> >> base/mainMethods.lzx. May 24 2008
>>>>> >> commented by onokeiji@gmail.com -->
>>>>> >> <class name="conferenceMenubar" extends="menubar" height="28"
>>>>> >> style="itemStyle">
>>>>> >> @@ -83,7 +83,7 @@
>>>>> >> parent._exitbtn.destroy();
>>>>> >> }
>>>>> >> }
>>>>> >> -
>>>>> >> +
>>>>> >> if(canvas.isrtl == 'true'){
>>>>> >> if ($debug) Debug.write("onInit :
>>>>> Setting
>>>>> >> nokey");
>>>>> >>
>>>>> lblImport.setCommand(cmd_importFile_nokey);
>>>>> >> @@ -92,11 +92,11 @@
>>>>> >> </handler>
>>>>> >> <_labelMenuItem id="lblImport" labelid="15"
>>>>> >> command="cmd_importFile" enabled="${
>>>>> >> canvas.ismoderator }" />
>>>>> >> - <!-- <menuseparator/> <_labelMenuItem
>>>>> >> labelid="561" command="cmd_exportFilePNG"
>>>>> >> - /> <_labelMenuItem labelid="562"
>>>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>>>> >> - labelid="563"
>>>>> command="cmd_exportFilePDF"
>>>>> >> /> <_labelMenuItem labelid="560"
>>>>> >> - command="cmd_exportFileSVG" />
>>>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>>>> >> - /> <menuseparator/> <_labelMenuItem
>>>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>>>> >> + <!-- <menuseparator/> <_labelMenuItem
>>>>> >> labelid="561" command="cmd_exportFilePNG"
>>>>> >> + /> <_labelMenuItem labelid="562"
>>>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>>>> >> + labelid="563"
>>>>> command="cmd_exportFilePDF"
>>>>> >> /> <_labelMenuItem labelid="560"
>>>>> >> + command="cmd_exportFileSVG" />
>>>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>>>> >> + /> <menuseparator/> <_labelMenuItem
>>>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>>>> >> value="quit" /> -->
>>>>> >> </_labelMenu>
>>>>> >>
>>>>> >> @@ -104,7 +104,7 @@
>>>>> >>
>>>>> >> <handler name="oninit">
>>>>> >> <![CDATA[
>>>>> >> -
>>>>> >> +
>>>>> >> if(canvas.isrtl == 'true'){
>>>>> >> if ($debug) Debug.write("onInit :
>>>>> Setting
>>>>> >> nokey");
>>>>> >>
>>>>> >> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
>>>>> >> @@ -112,6 +112,7 @@
>>>>> >>
>>>>> lblPoll.setCommand(cmd_createPoll_nokey);
>>>>> >>
>>>>> >> lblPollResult.setCommand(cmd_pollResults_nokey);
>>>>> >>
>>>>> >> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
>>>>> >> +
>>>>> >> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
>>>>> >> }
>>>>> >> //hideActionsMenu
>>>>> >>
>>>>> if(canvas.currentRoomObj.hideActionsMenu){
>>>>> >> @@ -133,7 +134,7 @@
>>>>> >> </handler>
>>>>> >> </_labelMenuItem>
>>>>> >> <menuseparator />
>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>> >> command="cmd_coBrowser" enabled="${
>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>> >> command="cmd_coBrowser" enabled="${
>>>>> >> canvas.ismoderator }" />
>>>>> <menuseparator/>
>>>>> >> -->
>>>>> >> <_labelMenuItem id="lblCamMic" labelid="306"
>>>>> >> command="cmd_editCamMicSettings" />
>>>>> >> @@ -177,14 +178,17 @@
>>>>> >> <_labelMenuItem width="250" id="lblPollVote"
>>>>> >> labelid="42"
>>>>> >> command="cmd_checkPollVoted" />
>>>>> >> <menuseparator />
>>>>> >> + <_labelMenuItem width="250" id="lblShowSipDialer"
>>>>> >> labelid="1447"
>>>>> >> + command="cmd_showSipDialer" />
>>>>> >> + <menuseparator />
>>>>> >> <_labelMenuItem width="250" labelid="1126"
>>>>> >> command="cmd_editWhiteboardDefault"
>>>>> />
>>>>> >> </_labelMenu>
>>>>> >> -
>>>>> >> - <!-- exit room <_labelMenu labelid="308"
>>>>> width="250">
>>>>> >> </_labelMenu> <_labelMenu
>>>>> >> - labelid="301" width="250"> <_labelMenuItem
>>>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>>>> >> - /> </_labelMenu> <_labelMenu labelid="305"
>>>>> >> width="250"> <_labelMenuItem labelid="306"
>>>>> >> - command="cmd_editCamMicSettings" />
>>>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>>>> >> +
>>>>> >> + <!-- exit room <_labelMenu labelid="308"
>>>>> width="250">
>>>>> >> </_labelMenu> <_labelMenu
>>>>> >> + labelid="301" width="250"> <_labelMenuItem
>>>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>>>> >> + /> </_labelMenu> <_labelMenu labelid="305"
>>>>> >> width="250"> <_labelMenuItem labelid="306"
>>>>> >> + command="cmd_editCamMicSettings" />
>>>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>>>> >> /> </_labelMenu> <_labelMenu labelid="303"
>>>>> >> width="250"> </_labelMenu> -->
>>>>> >>
>>>>> >> </class>
>>>>> >> @@ -258,7 +262,7 @@
>>>>> >> </handler>
>>>>> >> </_labelMenuItem>
>>>>> >> <menuseparator />
>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>> >> command="cmd_coBrowser" enabled="${
>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>> >> command="cmd_coBrowser" enabled="${
>>>>> >> canvas.ismoderator }" />
>>>>> >> <menuseparator/> -->
>>>>> >> <_labelMenuItem labelid="306"
>>>>> >> command="cmd_editCamMicSettings"
>>>>> >> enabled="${
>>>>> canvas.ismoderator }" />
>>>>> >> @@ -358,7 +362,7 @@
>>>>> >> </handler>
>>>>> >> </_labelMenuItem>
>>>>> >> <menuseparator />
>>>>> >> - <!-- <_labelMenuItem labelid="749"
>>>>> >> command="cmd_coBrowser" enabled="${
>>>>> >> + <!-- <_labelMenuItem labelid="749"
>>>>> >> command="cmd_coBrowser" enabled="${
>>>>> >> canvas.ismoderator }" />
>>>>> >> <menuseparator/> -->
>>>>> >> <_labelMenuItem labelid="306"
>>>>> >> command="cmd_editCamMicSettings"
>>>>> >> enabled="${
>>>>> canvas.ismoderator }" />
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -65,6 +65,7 @@
>>>>> >> <include href="restricted/" />
>>>>> >> <include href="browser/" />
>>>>> >> <include href="testsetup/" />
>>>>> >> + <include href="sip/" />
>>>>> >>
>>>>> >> <include href="flexibleConferenceRoom/" />
>>>>> >>
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,6 @@
>>>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>>>> >> +<library>
>>>>> >> +
>>>>> >> + <include href="sipDialer.lzx" />
>>>>> >> +
>>>>> >> +</library>
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,81 @@
>>>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>>>> >> +<library>
>>>>> >> +
>>>>> >> +<class name="sipDialer" extends="window" bgcolor="gray"
>>>>> width="200">
>>>>> >> + <simplelayout axis="y" spacing="5"/>
>>>>> >> + <labelText labelid="1003"/>
>>>>> >> + <view name="phoneNumber" width="100%">
>>>>> >> + <inputtext name="input"
>>>>> >> width="$once{parent.width-parent.del.width}" height="20"
>>>>> bgcolor="white"/>
>>>>> >> + <button name="del" x="$once{parent.input.width}" width="30"
>>>>> >> height="20" onclick="this.del();">
>>>>> >> + â†
>>>>> >> + <method name="del">
>>>>> >> + var t = parent.input.text;
>>>>> >> + if(t.length != 0) {
>>>>> >> + t = t.substr(0, t.length - 1);
>>>>> >> + parent.input.setAttribute('text', t);
>>>>> >> + }
>>>>> >> + </method>
>>>>> >> + </button>
>>>>> >> + </view>
>>>>> >> +
>>>>> >> + <view name="dialerButtons" align="center">
>>>>> >> + <vbox spacing="5">
>>>>> >> + <hbox spacing="5">
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('1')"
>>>>> >> width="40">1</button>
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('2')"
>>>>> >> width="40">2</button>
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('3')"
>>>>> >> width="40">3</button>
>>>>> >> + </hbox>
>>>>> >> + <hbox spacing="5">
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('4')"
>>>>> >> width="40">4</button>
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('5')"
>>>>> >> width="40">5</button>
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('6')"
>>>>> >> width="40">6</button>
>>>>> >> + </hbox>
>>>>> >> + <hbox spacing="5">
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('7')"
>>>>> >> width="40">7</button>
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('8')"
>>>>> >> width="40">8</button>
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('9')"
>>>>> >> width="40">9</button>
>>>>> >> + </hbox>
>>>>> >> + <hbox spacing="5">
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('*')"
>>>>> >> width="40">*</button>
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('0')"
>>>>> >> width="40">0</button>
>>>>> >> + <button
>>>>> onclick="parent.parent.parent.parent.dial('#')"
>>>>> >> width="40">#</button>
>>>>> >> + </hbox>
>>>>> >> + </vbox>
>>>>> >> + </view>
>>>>> >> + <hbox spacing="10" align="center">
>>>>> >> + <simpleLabelButton labelid="1448" name="callButton">
>>>>> >> + <handler name="onclick">
>>>>> >> + parent.parent.joinToConfCall.doCall();
>>>>> >> + </handler>
>>>>> >> + </simpleLabelButton>
>>>>> >> + <simpleLabelButton labelid="85" name="closeButton">
>>>>> >> + <handler name="onclick">
>>>>> >> + canvas.sipDialer = null;
>>>>> >> + parent.parent.destroy();
>>>>> >> + </handler>
>>>>> >> + </simpleLabelButton>
>>>>> >> + </hbox>
>>>>> >> + <handler name="oninit">
>>>>> >> + if(canvas.sipDialer != null) {
>>>>> >> + canvas.sipDialer.destroy();
>>>>> >> + }
>>>>> >> + canvas.setAttribute('sipDialer', this);
>>>>> >> + this.bringToFront();
>>>>> >> + </handler>
>>>>> >> +
>>>>> >> + <method name="dial" args="digit">
>>>>> >> + this.phoneNumber.input.setAttribute('text',
>>>>> >> this.phoneNumber.input.text + digit);
>>>>> >> + </method>
>>>>> >> +
>>>>> >> + <netRemoteCallHib name="joinToConfCall"
>>>>> funcname="joinToConfCall"
>>>>> >> remotecontext="$once{ canvas.thishib }">
>>>>> >> + <netparam><method name="getValue">return
>>>>> >> parent.parent.phoneNumber.input.text</method></netparam>
>>>>> >> + <handler name="ondata" args="value">
>>>>> >> + <![CDATA[
>>>>> >> + //The onResult-Handler will be called be the
>>>>> rtmpconnection
>>>>> >> + if($debug) Debug.write("joinToConfCall : ",value);
>>>>> >> + ]]>
>>>>> >> + </handler>
>>>>> >> + </netRemoteCallHib>
>>>>> >> +</class>
>>>>> >> +
>>>>> >> +</library>
>>>>> >> \ No newline at end of file
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -67,6 +67,9 @@
>>>>> >>
>>>>> >>
>>>>> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
>>>>> >>
>>>>> >> <class>org.openmeetings.app.persistence.beans.user.Users</class>
>>>>> >>
>>>>> >>
>>>>> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
>>>>> >> +
>>>>> >>
>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
>>>>> >> +
>>>>> >>
>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
>>>>> >> +
>>>>> >>
>>>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
>>>>> >>
>>>>> <exclude-unlisted-classes>false</exclude-unlisted-classes>
>>>>> >> <properties>
>>>>> >> <property
>>>>> >> name="openjpa.ConnectionProperties"
>>>>> >> @@ -83,7 +86,8 @@
>>>>> >> <property name="openjpa.Log"
>>>>> >> value="DefaultLevel=WARN, Tool=INFO" />
>>>>> >> <property
>>>>> >> name="openjpa.ConnectionDriverName"
>>>>> >> value="org.apache.commons.dbcp.BasicDataSource"/>
>>>>> >> <property name="openjpa.DataCache"
>>>>> >> value="true"/>
>>>>> >> - <property name="openjpa.QueryCache"
>>>>> >> value="true"/>
>>>>> >> + <!-- QueryCache disabled due to changes outside of
>>>>> JPA
>>>>> >> doesn't take effect with caching -->
>>>>> >> + <property name="openjpa.QueryCache"
>>>>> >> value="false"/>
>>>>> >> <property
>>>>> name="openjpa.jdbc.DBDictionary"
>>>>> >> value="batchLimit=100,tableType=myisam"/>
>>>>> >> <property
>>>>> name="openjpa.jdbc.QuerySQLCache"
>>>>> >> value="false"/>
>>>>> >> </properties>
>>>>> >>
>>>>> >> Modified:
>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>>>> >> (original)
>>>>> >> +++
>>>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Mon
>>>>> >> Mar 26 09:14:15 2012
>>>>> >> @@ -331,7 +331,36 @@ function checkEmail()
>>>>> >>
>>>>> >> </i></p>
>>>>> >>
>>>>> >> - </fieldset>
>>>>> >> + </fieldset>
>>>>> >> +
>>>>> >> + <fieldset id="red5sip">
>>>>> >> + <legend>red5SIP Configuration</legend>
>>>>> >> +
>>>>> >> + <li>
>>>>> >> + <label for="red5sip_enable">Enable SIP</label>
>>>>> >> + <select name="red5sip_enable" id="red5sip_enable" size="1">
>>>>> >> + <option value="yes">Yes</option>
>>>>> >> + <option value="no" selected>No</option>
>>>>> >> + </select><br />
>>>>> >> + </li>
>>>>> >> + <p><i>
>>>>> >> + Enable red5SIP integration
>>>>> >> + </i></p>
>>>>> >> + <br />
>>>>> >> +
>>>>> >> + <li>
>>>>> >> + <label for="red5sip_room_prefix">SIP rooms prefix</label>
>>>>> >> + <input name="red5sip_room_prefix" id="red5sip_room_prefix"
>>>>> >> size="27" title="" type="text" value="400" />
>>>>> >> + <p><i>Prefix for phone number of conference rooms</i></p>
>>>>> >> + </li>
>>>>> >> +
>>>>> >> + <li>
>>>>> >> + <label for="red5sip_exten_context">SIP extensions
>>>>> context</label>
>>>>> >> + <input name="red5sip_exten_context"
>>>>> id="red5sip_exten_context"
>>>>> >> size="27" title="" type="text" value="rooms" />
>>>>> >> + <p><i>Context of Asterisk extensions</i></p>
>>>>> >> + </li>
>>>>> >> +
>>>>> >> + </fieldset>
>>>>> >>
>>>>> >> <fieldset id="sip">
>>>>> >>
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
>>>>> >>
>>>>> >> import org.openmeetings.app.conference.session.RoomClient;
>>>>> >> import org.openmeetings.app.data.basic.AuthLevelmanagement;
>>>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>>>> >> import org.openmeetings.app.data.beans.basic.SearchResult;
>>>>> >> import
>>>>> org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
>>>>> >> import org.openmeetings.app.data.user.Organisationmanagement;
>>>>> >> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
>>>>> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>>>>> >> import
>>>>> org.openmeetings.app.persistence.beans.domain.Organisation_Users;
>>>>> >> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
>>>>> >> import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>>>> >> import
>>>>> org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
>>>>> >> import
>>>>> org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>> >> import org.openmeetings.app.persistence.beans.user.Users;
>>>>> >> import org.openmeetings.app.remote.red5.ClientListManager;
>>>>> >> +import
>>>>> org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
>>>>> >> +import
>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>> >> +import
>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>> >> +import
>>>>> >>
>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>> >> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
>>>>> >> import org.red5.logging.Red5LoggerFactory;
>>>>> >> import org.slf4j.Logger;
>>>>> >> @@ -71,6 +78,8 @@ public class Roommanagement {
>>>>> >> @Autowired
>>>>> >> private OpenXGHttpClient openXGHttpClient;
>>>>> >> @Autowired
>>>>> >> + private AsteriskDbSipClient asteriskDbSipClient;
>>>>> >> + @Autowired
>>>>> >> private RoomModeratorsDaoImpl roomModeratorsDao;
>>>>> >> @Autowired
>>>>> >> private UsersDaoImpl usersDao;
>>>>> >> @@ -78,6 +87,8 @@ public class Roommanagement {
>>>>> >> private AuthLevelmanagement authLevelManagement;
>>>>> >> @Autowired
>>>>> >> private ClientListManager clientListManager;
>>>>> >> + @Autowired
>>>>> >> + private Configurationmanagement cfgManagement;
>>>>> >>
>>>>> >> /**
>>>>> >> * add a new Record to the table roomtypes
>>>>> >> @@ -102,6 +113,20 @@ public class Roommanagement {
>>>>> >>
>>>>> >> public Long addRoom(Rooms room) {
>>>>> >> try {
>>>>> >> + /* Red5SIP integration
>>>>> >>
>>>>> *******************************************************************************/
>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>> >> "red5sip.enable");
>>>>> >> + if(conf != null && conf.getConf_value().equals("yes"))
>>>>> {
>>>>> >> + if(room.getSipNumber() != null &&
>>>>> >> !room.getSipNumber().isEmpty()) {
>>>>> >> + asteriskDbSipClient.createSIPConference(new
>>>>> >> SIPCreateConferenceRequest(room.getSipNumber()));
>>>>> >> + } else {
>>>>> >> + SipCreateConferenceRequestResult requestResult
>>>>> =
>>>>> >> asteriskDbSipClient.createSIPConference(new
>>>>> SIPCreateConferenceRequest());
>>>>> >> + if(!requestResult.hasError()) {
>>>>> >> +
>>>>> >> room.setSipNumber(requestResult.getConferenceNumber());
>>>>> >> +
>>>>> >> room.setConferencePin(requestResult.getConferencePin());
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> +
>>>>> >>
>>>>> /*****************************************************************************************************/
>>>>> >> room.setStarttime(new Date());
>>>>> >> room = em.merge(room);
>>>>> >> long returnId = room.getRooms_id();
>>>>> >> @@ -719,6 +744,25 @@ public class Roommanagement {
>>>>> >> return null;
>>>>> >> }
>>>>> >>
>>>>> >> + /**
>>>>> >> + * Returns number of SIP conference participants
>>>>> >> + * @param rooms_id id of room
>>>>> >> + * @return number of participants
>>>>> >> + */
>>>>> >> + public Integer getSipConferenceMembersNumber(Long rooms_id) {
>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>> >> "red5sip.enable");
>>>>> >> + if(conf != null && conf.getConf_value().equals("yes")) {
>>>>> >> + Rooms rooms = this.getRoomById(rooms_id);
>>>>> >> + if(rooms != null) {
>>>>> >> + return
>>>>> >>
>>>>> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
>>>>> >> + } else {
>>>>> >> + return 0;
>>>>> >> + }
>>>>> >> + } else {
>>>>> >> + return null;
>>>>> >> + }
>>>>> >> + }
>>>>> >> +
>>>>> >> /**
>>>>> >> * adds a new Record to the table rooms
>>>>> >> * @param name
>>>>> >> @@ -793,6 +837,19 @@ public class Roommanagement {
>>>>> >>
>>>>> >> r.setConferencePin(openXGReturnObject.getConferencePin());
>>>>> >> }
>>>>> >>
>>>>> >> + /* Red5SIP integration
>>>>> >>
>>>>> *******************************************************************************/
>>>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>>>> >> "red5sip.enable");
>>>>> >> + if(conf != null &&
>>>>> conf.getConf_value().equals("yes")) {
>>>>> >> + SipCreateConferenceRequestResult requestResult
>>>>> =
>>>>> >> asteriskDbSipClient
>>>>> >> + .createSIPConference(new
>>>>> >> SIPCreateConferenceRequest());
>>>>> >> +
>>>>> >> + if(!requestResult.hasError()) {
>>>>> >> +
>>>>> >> r.setSipNumber(requestResult.getConferenceNumber());
>>>>> >> +
>>>>> >> r.setConferencePin(requestResult.getConferencePin());
>>>>> >> + }
>>>>> >> + }
>>>>> >> +
>>>>> >>
>>>>> /*****************************************************************************************************/
>>>>> >> +
>>>>> >> r = em.merge(r);
>>>>> >> long returnId = r.getRooms_id();
>>>>> >>
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -252,7 +252,8 @@ public class ImportInitvalues {
>>>>> >> String openxg_client_domain, String
>>>>> >> openxg_community_code,
>>>>> >> String openxg_language_code, String
>>>>> openxg_adminid,
>>>>> >> String sip_language_phonecode, String
>>>>> >> sip_phonerange_start,
>>>>> >> - String sip_phonerange, String jodPath) {
>>>>> >> + String sip_phonerange, String jodPath,
>>>>> >> + String red5sip_enable, String
>>>>> red5sip_room_prefix,String
>>>>> >> red5sip_exten_context) {
>>>>> >>
>>>>> >> cfgManagement
>>>>> >> .addConfByKey(
>>>>> >> @@ -349,6 +350,18 @@ public class ImportInitvalues {
>>>>> >> cfgManagement.addConfByKey(3, "default.rpc.userid",
>>>>> "" + 1,
>>>>> >> null,
>>>>> >> "The User-Id of the Control User in
>>>>> >> OpenMeetings");
>>>>> >>
>>>>> >> + // ***************************************
>>>>> >> + // ***************************************
>>>>> >> + // red5SIP Integration Coniguration Values
>>>>> >> + // ***************************************
>>>>> >> +
>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.enable",
>>>>> red5sip_enable,
>>>>> >> null,
>>>>> >> + "Enable to enable the red5SIP
>>>>> integration
>>>>> >> ");
>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
>>>>> >> red5sip_room_prefix, null,
>>>>> >> + "Enable to enable the red5SIP
>>>>> integration
>>>>> >> ");
>>>>> >> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
>>>>> >> red5sip_exten_context, null,
>>>>> >> + "Enable to enable the red5SIP
>>>>> integration
>>>>> >> ");
>>>>> >> +
>>>>> >> // ***************************************
>>>>> >> // ***************************************
>>>>> >> // SIP Applet Configuration Values
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -19,6 +19,7 @@
>>>>> >> package org.openmeetings.app.remote.red5;
>>>>> >>
>>>>> >> import java.io.File;
>>>>> >> +import java.io.IOException;
>>>>> >> import java.util.ArrayList;
>>>>> >> import java.util.Collection;
>>>>> >> import java.util.Date;
>>>>> >> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
>>>>> >> return null;
>>>>> >> }
>>>>> >>
>>>>> >> + public synchronized List<Integer> listRoomBroadcast() {
>>>>> >> + List<Integer> broadcastList = new ArrayList<Integer>();
>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>> >> + String streamid = current.getClient().getId();
>>>>> >> + Collection<Set<IConnection>> conCollection =
>>>>> >> current.getScope().getConnections();
>>>>> >> + for (Set<IConnection> conset : conCollection) {
>>>>> >> + for (IConnection conn : conset) {
>>>>> >> + if (conn != null) {
>>>>> >> + RoomClient rcl = this.clientListManager
>>>>> >> + .getClientByStreamId(conn
>>>>> >> + .getClient().getId());
>>>>> >> + if (rcl == null) {
>>>>> >> + // continue;
>>>>> >> + } else if (rcl.getIsScreenClient() != null
>>>>> >> + && rcl.getIsScreenClient()) {
>>>>> >> + // continue;
>>>>> >> + } else {
>>>>> >> + if (!streamid.equals(rcl.getStreamid())) {
>>>>> >> + // It is not needed to send back
>>>>> >> + // that event to the actuall
>>>>> >> + // Moderator
>>>>> >> + // as it will be already triggered
>>>>> >> + // in the result of this Function
>>>>> >> + // in the Client
>>>>> >> +
>>>>> >> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> + return broadcastList;
>>>>> >> + }
>>>>> >> +
>>>>> >> +
>>>>> >> /**
>>>>> >> * this function is invoked directly after initial connecting
>>>>> >> *
>>>>> >> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
>>>>> >> }
>>>>> >> return null;
>>>>> >> }
>>>>> >> +
>>>>> >> + /*
>>>>> >> + * SIP transport methods
>>>>> >> + */
>>>>> >> +
>>>>> >> + public synchronized void updateSipTransport() {
>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>> >> + String streamid = current.getClient().getId();
>>>>> >> + RoomClient currentClient =
>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>> >> + log.debug("getSipConferenceMembersNumber: " +
>>>>> >>
>>>>> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
>>>>> >> + String newNumber =
>>>>> >>
>>>>> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
>>>>> >> + if(!newNumber.equals(currentClient.getLastname())) {
>>>>> >> + currentClient.setLastname(newNumber);
>>>>> >> + this.clientListManager.updateClientByStreamId(streamid,
>>>>> >> currentClient);
>>>>> >> + log.debug("updateSipTransport: {}, {}, {}, {}", new
>>>>> >> Object[]{currentClient.getPublicSID(),
>>>>> >> + currentClient.getRoom_id(),
>>>>> >> currentClient.getFirstname(), currentClient.getLastname()});
>>>>> >> + sendMessageWithClient(new
>>>>> >>
>>>>> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
>>>>> >> + }
>>>>> >> + }
>>>>> >> +
>>>>> >> + /**
>>>>> >> + * Perform call to specified phone number and join to
>>>>> conference
>>>>> >> + * @param number to call
>>>>> >> + */
>>>>> >> + public synchronized void joinToConfCall(String number) {
>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>> >> + String streamid = current.getClient().getId();
>>>>> >> + RoomClient currentClient =
>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>> >> + Rooms rooms =
>>>>> >> roommanagement.getRoomById(currentClient.getRoom_id());
>>>>> >> + log.debug("asterisk -rx \"originate Local/" + number +
>>>>> "@rooms
>>>>> >> extension " + rooms.getSipNumber() + "@rooms\"");
>>>>> >> + try {
>>>>> >> + Process proc = Runtime.getRuntime().exec(new
>>>>> >> String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms
>>>>> extension
>>>>> >> " + rooms.getSipNumber() + "@rooms"});
>>>>> >> + } catch (IOException e) {
>>>>> >> + log.error("Executing asterisk originate error: ", e);
>>>>> >> + }
>>>>> >> + }
>>>>> >> +
>>>>> >> + public synchronized String getSipNumber(Long room_id) {
>>>>> >> + Rooms rooms = roommanagement.getRoomById(room_id);
>>>>> >> + if(rooms != null) {
>>>>> >> + log.debug("getSipNumber: room_id: {}, sipNumber: {}",
>>>>> new
>>>>> >> Object[]{room_id, rooms.getSipNumber()});
>>>>> >> + return rooms.getSipNumber();
>>>>> >> + }
>>>>> >> + return null;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public synchronized void setSipTransport(Long room_id, String
>>>>> >> publicSID, String broadCastId) {
>>>>> >> + IConnection current = Red5.getConnectionLocal();
>>>>> >> + String streamid = current.getClient().getId();
>>>>> >> + Rooms room = roommanagement.getRoomById(room_id);
>>>>> >> + // Notify all clients of the same scope (room)
>>>>> >> + RoomClient currentClient =
>>>>> >> this.clientListManager.getClientByStreamId(streamid);
>>>>> >> + currentClient.setRoom_id(room_id);
>>>>> >> + currentClient.setRoomEnter(new Date());
>>>>> >> + currentClient.setFirstname("SIP Transport");
>>>>> >> +
>>>>> >>
>>>>> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
>>>>> >> + currentClient.setBroadCastID(Long.parseLong(broadCastId));
>>>>> >> + currentClient.setIsBroadcasting(true);
>>>>> >> + currentClient.setPublicSID(publicSID);
>>>>> >> + currentClient.setAvsettings("av");
>>>>> >> + currentClient.setVWidth(120);
>>>>> >> + currentClient.setVHeight(90);
>>>>> >> + this.clientListManager.updateClientByStreamId(streamid,
>>>>> >> currentClient);
>>>>> >> +
>>>>> >> + Collection<Set<IConnection>> conCollection = current
>>>>> >> + .getScope().getConnections();
>>>>> >> + for (Set<IConnection> conset : conCollection) {
>>>>> >> + for (IConnection conn : conset) {
>>>>> >> + if (conn != null) {
>>>>> >> + RoomClient rcl =
>>>>> >>
>>>>> this.clientListManager.getClientByStreamId(conn.getClient().getId());
>>>>> >> + if (rcl == null) {
>>>>> >> + // continue;
>>>>> >> + } else if (rcl.getIsScreenClient() != null
>>>>> >> + && rcl.getIsScreenClient()) {
>>>>> >> + // continue;
>>>>> >> + } else {
>>>>> >> + if (!streamid.equals(rcl.getStreamid())) {
>>>>> >> + // It is not needed to send back
>>>>> >> + // that event to the actuall
>>>>> >> + // Moderator
>>>>> >> + // as it will be already triggered
>>>>> >> + // in the result of this Function
>>>>> >> + // in the Client
>>>>> >> + if (conn instanceof
>>>>> >> IServiceCapableConnection) {
>>>>> >> + ((IServiceCapableConnection)
>>>>> >> conn).invoke("addNewUser", new Object[]{currentClient}, this);
>>>>> >> + ((IServiceCapableConnection)
>>>>> >> conn).invoke("newStream", new Object[]{currentClient}, this);
>>>>> >> + log.debug("sending setSipTransport
>>>>> to "
>>>>> >> + + conn);
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> + }
>>>>> >> }
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,19 @@
>>>>> >> +package org.openmeetings.app.sip.api;
>>>>> >> +
>>>>> >> +import
>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>>>> >> +import
>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>> >> +import
>>>>> >>
>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>> >> +
>>>>> >> +/**
>>>>> >> + * SIP client interface
>>>>> >> + */
>>>>> >> +public interface ISIPClient {
>>>>> >> +
>>>>> >> + SIPCreateUserRequestResult createSIPUser(SIPCreateUserRequest
>>>>> >> request);
>>>>> >> +
>>>>> >> + SipCreateConferenceRequestResult
>>>>> >> createSIPConference(SIPCreateConferenceRequest request);
>>>>> >> +
>>>>> >> + Integer getConferenceMembersNumber(String sipNumber);
>>>>> >> +
>>>>> >> +}
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,58 @@
>>>>> >> +package org.openmeetings.app.sip.api.impl.asterisk;
>>>>> >> +
>>>>> >> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>> >> +import org.openmeetings.app.sip.api.ISIPClient;
>>>>> >> +import
>>>>> org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
>>>>> >> +import
>>>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>>>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>>>> >> +import
>>>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>>>> >> +import
>>>>> >>
>>>>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>>>> >> +/**
>>>>> >> + *
>>>>> >> + */
>>>>> >> +public class AsteriskDbSipClient implements ISIPClient {
>>>>> >> +
>>>>> >> + @Autowired
>>>>> >> + private AsteriskDAOImpl asteriskDAO;
>>>>> >> +
>>>>> >> + public SIPCreateUserRequestResult createSIPUser(final
>>>>> >> SIPCreateUserRequest request) {
>>>>> >> + asteriskDAO.addSipUser(request.getLogin(),
>>>>> request.getPassword());
>>>>> >> + return new SIPCreateUserRequestResult() {
>>>>> >> + @Override
>>>>> >> + public UserSipData getUserSipData() {
>>>>> >> + UserSipData sipData = new UserSipData();
>>>>> >> + sipData.setAuthId(request.getLogin());
>>>>> >> + sipData.setUserpass(request.getPassword());
>>>>> >> + sipData.setUsername(request.getLogin());
>>>>> >> + return sipData;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public boolean hasError() {
>>>>> >> + return false;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getErrorMessage() {
>>>>> >> + return null;
>>>>> >> + }
>>>>> >> + };
>>>>> >> + }
>>>>> >> +
>>>>> >> + public SipCreateConferenceRequestResult
>>>>> >> createSIPConference(SIPCreateConferenceRequest request) {
>>>>> >> + String confno = asteriskDAO.addMeetMeConference();
>>>>> >> + return new SipCreateConferenceRequestResult(confno, "") {
>>>>> >> + public boolean hasError() {
>>>>> >> + return false;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getErrorMessage() {
>>>>> >> + return null;
>>>>> >> + }
>>>>> >> + };
>>>>> >> + }
>>>>> >> +
>>>>> >> + public Integer getConferenceMembersNumber(String sipNumber) {
>>>>> >> + return asteriskDAO.getConferensMembersNumber(sipNumber);
>>>>> >> + }
>>>>> >> +}
>>>>> >> \ No newline at end of file
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,76 @@
>>>>> >> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
>>>>> >> +
>>>>> >> +import org.openmeetings.app.OpenmeetingsVariables;
>>>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>>>> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>>>>> >> +import
>>>>> >>
>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
>>>>> >> +import
>>>>> org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
>>>>> >> +import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
>>>>> >> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
>>>>> >> +import org.red5.logging.Red5LoggerFactory;
>>>>> >> +import org.slf4j.Logger;
>>>>> >> +import org.springframework.transaction.annotation.Transactional;
>>>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>>>> >> +
>>>>> >> +import javax.persistence.EntityManager;
>>>>> >> +import javax.persistence.PersistenceContext;
>>>>> >> +
>>>>> >> +@Transactional
>>>>> >> +public class AsteriskDAOImpl {
>>>>> >> +
>>>>> >> + private static final Logger log =
>>>>> >> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
>>>>> >> OpenmeetingsVariables.webAppRootKey);
>>>>> >> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
>>>>> >> + @PersistenceContext
>>>>> >> + private EntityManager em;
>>>>> >> + @Autowired
>>>>> >> + private Configurationmanagement cfgManagement;
>>>>> >> +
>>>>> >> + public void addSipUser(String username, String secret) {
>>>>> >> + AsteriskSipUsers u = new AsteriskSipUsers();
>>>>> >> + Configuration conf =
>>>>> >> cfgManagement.getConfKey(3L,"red5sip.exten_context");
>>>>> >> + String defaultRoomContext = "rooms";
>>>>> >> + if(conf != null && !conf.getConf_value().isEmpty()) {
>>>>> >> + defaultRoomContext = conf.getConf_value();
>>>>> >> + }
>>>>> >> + u.setName(username);
>>>>> >> + u.setSecret(secret);
>>>>> >> + u.setContext(defaultRoomContext);
>>>>> >> + u.setHost("dynamic");
>>>>> >> + Extensions e = new Extensions();
>>>>> >> + e.setApp("Dial");
>>>>> >> + e.setAppdata("SIP/" + username);
>>>>> >> + e.setExten(username);
>>>>> >> + e.setContext(defaultRoomContext);
>>>>> >> + e.setPriority(1);
>>>>> >> + em.persist(u);
>>>>> >> + em.persist(e);
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String addMeetMeConference() {
>>>>> >> + int count = ((Number)em.createQuery("SELECT
>>>>> COUNT(m.confno) FROM
>>>>> >> MeetMe AS m").getSingleResult()).intValue();
>>>>> >> +
>>>>> >> + Configuration conf =
>>>>> >> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
>>>>> >> + String prefix = DEFAULT_SIP_CONTEXT;
>>>>> >> + if(conf != null) {
>>>>> >> + prefix = conf.getConf_value();
>>>>> >> + }
>>>>> >> + String confno = prefix+(count+1);
>>>>> >> + MeetMe mm = new MeetMe();
>>>>> >> + mm.setConfno(confno);
>>>>> >> + Extensions e = new Extensions();
>>>>> >> + e.setApp("MeetMe");
>>>>> >> + e.setAppdata(confno + ",dM");
>>>>> >> + e.setExten(confno);
>>>>> >> + e.setContext("rooms");
>>>>> >> + e.setPriority(1);
>>>>> >> + em.persist(mm);
>>>>> >> + em.persist(e);
>>>>> >> + return confno;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public Integer getConferensMembersNumber(String confNo) {
>>>>> >> + return ((Number)em.createQuery("SELECT m.members FROM
>>>>> MeetMe AS m
>>>>> >> WHERE m.confno=:confno")
>>>>> >> + .setParameter("confno", confNo)
>>>>> >> + .getSingleResult()).intValue();
>>>>> >> + }
>>>>> >> +}
>>>>> >> \ No newline at end of file
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,8 @@
>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>> >> +
>>>>> >> +/**
>>>>> >> + * Base interface for SIP API requests
>>>>> >> + */
>>>>> >> +public interface ISIPRequest {
>>>>> >> +
>>>>> >> +}
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,17 @@
>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>> >> +
>>>>> >> +/**
>>>>> >> + * Create SIP conferece request
>>>>> >> + */
>>>>> >> +public class SIPCreateConferenceRequest implements ISIPRequest {
>>>>> >> + private String sipNumber;
>>>>> >> +
>>>>> >> + public SIPCreateConferenceRequest() {
>>>>> >> + super(); //To change body of overridden methods use
>>>>> File |
>>>>> >> Settings | File Templates.
>>>>> >> + }
>>>>> >> +
>>>>> >> + public SIPCreateConferenceRequest(String sipNumber) {
>>>>> >> + super();
>>>>> >> + this.sipNumber = sipNumber;
>>>>> >> + }
>>>>> >> +}
>>>>> >> \ No newline at end of file
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,72 @@
>>>>> >> +package org.openmeetings.app.sip.api.request;
>>>>> >> +
>>>>> >> +/**
>>>>> >> + * Create User Request
>>>>> >> + */
>>>>> >> +public class SIPCreateUserRequest implements ISIPRequest {
>>>>> >> +
>>>>> >> + protected String firstName;
>>>>> >> + protected String middleName;
>>>>> >> + protected String lastName;
>>>>> >> + protected String email;
>>>>> >> + protected String login;
>>>>> >> + protected String password;
>>>>> >> +
>>>>> >> +
>>>>> >> + public SIPCreateUserRequest(String firstName, String
>>>>> middleName,
>>>>> >> String lastName, String email, String login, String password) {
>>>>> >> + this.firstName = firstName;
>>>>> >> + this.middleName = middleName;
>>>>> >> + this.lastName = lastName;
>>>>> >> + this.email = email;
>>>>> >> + this.login = login;
>>>>> >> + this.password = password;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public void withFirstName(String firstName) {
>>>>> >> + this.firstName = firstName;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public void withMiddleName(String middleName) {
>>>>> >> + this.middleName = middleName;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public void withLastName(String lastName) {
>>>>> >> + this.lastName = lastName;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public void withEmail(String email) {
>>>>> >> + this.email = email;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public void withLogin(String login) {
>>>>> >> + this.login = login;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public void withPassword(String password) {
>>>>> >> + this.password = password;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getFirstName() {
>>>>> >> + return firstName;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getMiddleName() {
>>>>> >> + return middleName;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getLastName() {
>>>>> >> + return lastName;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getEmail() {
>>>>> >> + return email;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getLogin() {
>>>>> >> + return login;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getPassword() {
>>>>> >> + return password;
>>>>> >> + }
>>>>> >> +}
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,12 @@
>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>> >> +
>>>>> >> +/**
>>>>> >> + * * Base interface for SIP API request's resuslt
>>>>> >> + */
>>>>> >> +public interface ISIPRequestResult {
>>>>> >> +
>>>>> >> + boolean hasError();
>>>>> >> +
>>>>> >> + String getErrorMessage();
>>>>> >> +
>>>>> >> +}
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,12 @@
>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>> >> +
>>>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>>>> >> +
>>>>> >> +/**
>>>>> >> + * TODO
>>>>> >> + */
>>>>> >> +public abstract class SIPCreateUserRequestResult implements
>>>>> >> ISIPRequestResult {
>>>>> >> +
>>>>> >> + abstract public UserSipData getUserSipData();
>>>>> >> +
>>>>> >> +}
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Added:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>> >> (added)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -0,0 +1,26 @@
>>>>> >> +package org.openmeetings.app.sip.api.result;
>>>>> >> +
>>>>> >> +/**
>>>>> >> + * TODO
>>>>> >> + */
>>>>> >> +public abstract class SipCreateConferenceRequestResult implements
>>>>> >> ISIPRequestResult {
>>>>> >> +
>>>>> >> + protected String conferenceNumber;
>>>>> >> + protected String conferencePin;
>>>>> >> +
>>>>> >> + protected SipCreateConferenceRequestResult() {
>>>>> >> + }
>>>>> >> +
>>>>> >> + protected SipCreateConferenceRequestResult(String
>>>>> conferenceNumber,
>>>>> >> String conferencePin) {
>>>>> >> + this.conferenceNumber = conferenceNumber;
>>>>> >> + this.conferencePin = conferencePin;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getConferenceNumber() {
>>>>> >> + return conferenceNumber;
>>>>> >> + }
>>>>> >> +
>>>>> >> + public String getConferencePin() {
>>>>> >> + return conferencePin;
>>>>> >> + }
>>>>> >> +}
>>>>> >>
>>>>> >> Propchange:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>>>> >>
>>>>> >>
>>>>> ------------------------------------------------------------------------------
>>>>> >> svn:eol-style = native
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
>>>>> >> String screen_viewer =
>>>>> >> httpServletRequest
>>>>> >>
>>>>> >> .getParameter("screen_viewer");
>>>>> >>
>>>>> >> + // red5sip integration config
>>>>> >> + String red5sip_enable = httpServletRequest
>>>>> >> +
>>>>> >> .getParameter("red5sip_enable");
>>>>> >> + String red5sip_room_prefix = httpServletRequest
>>>>> >> +
>>>>> >> .getParameter("red5sip_room_prefix");
>>>>> >> + String red5sip_exten_context =
>>>>> httpServletRequest
>>>>> >> +
>>>>> >> .getParameter("red5sip_exten_context");
>>>>> >> +
>>>>> >> // SIP Applet Configuration
>>>>> >> String sip_enable =
>>>>> >> httpServletRequest
>>>>> >>
>>>>> >> .getParameter("sip_enable");
>>>>> >> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
>>>>> >>
>>>>> >> openxg_community_code, openxg_language_code,
>>>>> >>
>>>>> openxg_adminid,
>>>>> >> sip_language_phonecode,
>>>>> >>
>>>>> >> sip_phonerange_start, sip_phonerange,
>>>>> >> - jodPath);
>>>>> >> + jodPath,
>>>>> >> + red5sip_enable, red5sip_room_prefix,
>>>>> >> red5sip_exten_context);
>>>>> >>
>>>>> >>
>>>>> >> getImportInitvalues().loadInitUserAndOrganisation(username,
>>>>> >> userpass,
>>>>> >> useremail, orgname, timeZone, configdefaultLang);
>>>>> >>
>>>>> >> Modified:
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>> >> URL:
>>>>> >>
>>>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>>>> >>
>>>>> >>
>>>>> ==============================================================================
>>>>> >> ---
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>> >> (original)
>>>>> >> +++
>>>>> >>
>>>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>>>> >> Mon Mar 26 09:14:15 2012
>>>>> >> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
>>>>> >> private static final String sip_phonerange_start = "";
>>>>> >> private static final String sip_phonerange = "";
>>>>> >> private static final String jodPath = "./jod/lib";
>>>>> >> + private static final String red5sip_enable = "no";
>>>>> >> + private static final String red5sip_room_prefix = "400";
>>>>> >> + private static final String red5sip_exten_context = "rooms";
>>>>> >> protected static final String username = "junit";
>>>>> >> protected static final String userpass = "test";
>>>>> >> private static final String orgname = "smoketest";
>>>>> >> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
>>>>> >> openxg_client_id,
>>>>> openxg_client_secret,
>>>>> >> openxg_client_domain,
>>>>> >> openxg_community_code,
>>>>> >> openxg_language_code, openxg_adminid,
>>>>> >> sip_language_phonecode,
>>>>> >> sip_phonerange_start, sip_phonerange,
>>>>> >> - jodPath);
>>>>> >> + jodPath, red5sip_enable,
>>>>> >> red5sip_room_prefix, red5sip_exten_context);
>>>>> >>
>>>>> >>
>>>>> importInitvalues.loadInitUserAndOrganisation(username,
>>>>> >> userpass,
>>>>> >> useremail, orgname, timeZone,
>>>>> >> configdefaultLang);
>>>>> >>
>>>>> >>
>>>>> >>
>>>>> >
>>>>> >
>>>>> > --
>>>>> > Sebastian Wagner
>>>>> > http://www.openmeetings.de
>>>>> > http://incubator.apache.org/openmeetings/
>>>>> > http://www.webbase-design.de
>>>>> > http://www.wagner-sebastian.com
>>>>> > seba.wagner@gmail.com
>>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> Timur Tleukenov
>>>>
>>>
>>>
>>>
>>> --
>>> Sebastian Wagner
>>> http://www.openmeetings.de
>>> http://incubator.apache.org/openmeetings/
>>> http://www.webbase-design.de
>>> http://www.wagner-sebastian.com
>>> seba.wagner@gmail.com
>>>
>>
>>
>>
>> --
>> Sebastian Wagner
>> http://www.openmeetings.de
>> http://incubator.apache.org/openmeetings/
>> http://www.webbase-design.de
>> http://www.wagner-sebastian.com
>> seba.wagner@gmail.com
>>
>
>
>
> --
> Timur Tleukenov
>
--
Timur Tleukenov
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Posted by "seba.wagner@gmail.com" <se...@gmail.com>.
It is looking great btw ;)
But I have a question: The table "meetme", its primary key is a varchar and
name is "confno"
The pattern so far was, example:
Table name: poll_types
Primary Key: poll_type_id <Type bigint or int>
Even "pure" assoziation tables like: rooms_organisations
=> In that table you assign rooms to organisation, so it _could_ have only
two colums:
rooms_id and organisation_id => however I consequently added a primary key
with the table name: rooms_organisation_id to it.
Now we have some new tables that have the primary_key column name "id" and
the one table that has a varchar as primary key.
Can we please find a consens together what pattern we use? I think it makes
sense to call the primary key just "id" and not including the table name in
it cause it lead to problems in the past if the column names are too long.
But what about the "meetme" table? Is there a special reason for having a
varchar primary key here? Is it possible to bring this in-line with the
rest of the database table scheme?
Thanks!
Sebastian
2012/3/27 seba.wagner@gmail.com <se...@gmail.com>
> Hi Timur,
>
> please don't forget to add the new persistence classes also to the other
> templates:
> db2/derby/oracle/postgres
>
> Thanks!
> Sebastian
>
> 2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
>
>> Hi Sebastian,
>>
>> I added the missing files and license headers.
>>
>> 2012/3/27 Alexei Fedotov <al...@gmail.com>
>>
>>> Ok, I'm here. :-)
>>>
>>>
>>>
>>>
>>> On Mon, Mar 26, 2012 at 6:03 PM, seba.wagner@gmail.com
>>> <se...@gmail.com> wrote:
>>> > Hi Timur,
>>> >
>>> > nice changeset :)
>>> >
>>> > But it seems like you've missed to checking some of your code:
>>> >
>>> https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
>>> >
>>> > The beans: AsteriskSipUsers, Extens, MeetMe are missing
>>> >
>>> > And you should enable the BackupExport/BackupImport to include and
>>> > re-import the data from the new tables.
>>> >
>>> > We might also add some panels in the Admin UI to have the possibility
>>> to
>>> > save/edit/delete the settings from the OpenMeetings Admin UI in the
>>> future.
>>> >
>>> > Thanks!
>>> > Sebastian
>>> >
>>> > 2012/3/26 <ti...@apache.org>
>>> >
>>> >> Author: timur
>>> >> Date: Mon Mar 26 09:14:15 2012
>>> >> New Revision: 1305274
>>> >>
>>> >> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
>>> >> Log:
>>> >> red5sip integration:
>>> >> - new Asterisk DAO added;
>>> >> - new red5sip configurations added to install step1 template;
>>> >> - new methods added to ScopeApplicationAdapter.java
>>> >> - openjpa.QueryCache temporally disabled to make database changes
>>> from
>>> >> Asterisk visible in OM.
>>> >>
>>> >> Added:
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>> >> (with props)
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>> >> (with props)
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>> >> (with props)
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>> >> (with props)
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>> >> (with props)
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>> >> (with props)
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>> >> (with props)
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>> >> (with props)
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>> >> (with props)
>>> >> Modified:
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>> >> simplified.xml
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>> >> traditional.xml
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>> >> (studIP).xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>> >> brazil.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>> >> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>> >>
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -204,7 +204,9 @@
>>> >> <!-- No Interface -->
>>> >> <bean id="manageCryptStyle"
>>> >> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
>>> >> <bean id="openXGHttpClient"
>>> >> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
>>> >> - <bean id="generateImage"
>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>> >> + <bean id="asteriskDbSipClient"
>>> >>
>>> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient" />
>>> >> + <bean id="asteriskDAO"
>>> >>
>>> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
>>> >> + <bean id="generateImage"
>>> >> class="org.openmeetings.app.documents.GenerateImage" />
>>> >> <bean id="generateThumbs"
>>> >> class="org.openmeetings.app.documents.GenerateThumbs" />
>>> >> <bean id="generatePDF"
>>> >> class="org.openmeetings.app.documents.GeneratePDF" />
>>> >> <bean id="mailHandler"
>>> >> class="org.openmeetings.utils.mail.MailHandler" />
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>> >> simplified.xml (original)
>>> >> +++
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>> >> simplified.xml Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>> >> traditional.xml (original)
>>> >> +++
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>>> >> traditional.xml Mon Mar 26 09:14:15 2012
>>> >> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</value>
>>> >> + </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>> >> (studIP).xml (original)
>>> >> +++
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>>> >> (studIP).xml Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>> >> brazil.xml (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>>> >> brazil.xml Mon Mar 26 09:14:15 2012
>>> >> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Ромеронабиратель SIP</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Mon
>>> >> Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>>> >> <string id="1446" name="calendar edit button">
>>> >> <value>Edit details</value>
>>> >> </string>
>>> >> + <string id="1447" name="sip show dialer">
>>> >> + <value>Show sip dialer</value>
>>> >> + </string>
>>> >> + <string id="1448" name="sip call">
>>> >> + <value>Call</value>
>>> >> + </string>
>>> >> </language>
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -225,8 +225,9 @@ of the red5-servlet
>>> >> -->
>>> >> <!-- Quality-Modus *normal* -->
>>> >> <microphoneRateNormal>22</microphoneRateNormal>
>>> >> -<!-- Microphone Settings Quality-Modus *best* -->
>>> >> -<microphoneRateBest>44</microphoneRateBest>
>>> >> +<!-- Microphone Settings Quality-Modus *best* -->
>>> >> +<!-- TODO: red5sip support only 8 -->
>>> >> +<microphoneRateBest>44</microphoneRateBest>
>>> >>
>>> >> <!--
>>> >> The Size of the Whiteboard
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -47,7 +47,8 @@
>>> >> <confmenucommand id="cmd_importFile"
>>> >> onselect="canvas.doActionmenu('importFile')"
>>> key="['ALT','Shift','I']"/>
>>> >> <confmenucommand id="cmd_editCamMicSettings"
>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"
>>> >> key="['ALT','Shift','1']"/>
>>> >> <confmenucommand id="cmd_editBoardSettings"
>>> >> onselect="canvas.doActionmenu('editBoardSettings')"
>>> >> key="['ALT','Shift','2']"/>
>>> >> - <confmenucommand id="cmd_quit"
>>> onselect="canvas.doActionmenu('quit')"
>>> >> key="['ALT','Shift','E']"/>
>>> >> + <confmenucommand id="cmd_quit"
>>> onselect="canvas.doActionmenu('quit')"
>>> >> key="['ALT','Shift','E']"/>
>>> >> + <confmenucommand id="cmd_showSipDialer"
>>> >> onselect="canvas.doActionmenu('showSipDialer')"
>>> key="['ALT','Shift','D']" />
>>> >>
>>> >> <confmenucommand id="cmd_applyforMod_nokey"
>>> >> onselect="canvas.doActionmenu('applyForMod')" />
>>> >> <confmenucommand id="cmd_createPoll_nokey"
>>> >> onselect="canvas.doActionmenu('createPoll')" />
>>> >> @@ -56,7 +57,8 @@
>>> >> <confmenucommand id="cmd_importFile_nokey"
>>> >> onselect="canvas.doActionmenu('importFile')" />
>>> >> <confmenucommand id="cmd_editCamMicSettings_nokey"
>>> >> onselect="canvas.doActionmenu('editCamMicSettings')"/>
>>> >> <confmenucommand id="cmd_editBoardSettings_nokey"
>>> >> onselect="canvas.doActionmenu('editBoardSettings')" />
>>> >> - <confmenucommand id="cmd_quit_nokey"
>>> >> onselect="canvas.doActionmenu('quit')" />
>>> >> + <confmenucommand id="cmd_quit_nokey"
>>> >> onselect="canvas.doActionmenu('quit')" />
>>> >> + <confmenucommand id="cmd_showSipDialer_nokey"
>>> >> onselect="canvas.doActionmenu('showSipDialer')" />
>>> >>
>>> >> <!--
>>> >> <command id="cmd_browser_open"
>>> >> onselect="canvas.doActionmenu('browser_open')"
>>> key="['ALT','Shift','B']"/>
>>> >> @@ -402,6 +404,8 @@
>>> >> canvas.thishib.applyForModeration.doCall();
>>> >> } else if (stringSub=='editCamMicSettings') {
>>> >>
>>> >> canvas._videocontainer._videoviewcontent.changeDevice();
>>> >> + } else if (stringSub=='showSipDialer') {
>>> >> + new
>>> lz.sipDialer(canvas.main_content._content.inner);
>>> >> } else if (stringSub=='editBoardSettings') {
>>> >> new
>>> >> lz.editWhiteboardDefault(canvas.main_content._content.inner);
>>> >> } else if (stringSub=='quit') {
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -47,9 +47,9 @@
>>> >> </method>
>>> >> </class>
>>> >>
>>> >> - <!--- Menu for public/private conference and audience room.
>>> This
>>> >> class shows
>>> >> - exit, moderator, file, setteings and poll menu. Those
>>> menu
>>> >> items are connected
>>> >> - to each command that has been declared in
>>> >> base/mainMethods.lzx. May 24 2008
>>> >> + <!--- Menu for public/private conference and audience room.
>>> This
>>> >> class shows
>>> >> + exit, moderator, file, setteings and poll menu. Those
>>> menu
>>> >> items are connected
>>> >> + to each command that has been declared in
>>> >> base/mainMethods.lzx. May 24 2008
>>> >> commented by onokeiji@gmail.com -->
>>> >> <class name="conferenceMenubar" extends="menubar" height="28"
>>> >> style="itemStyle">
>>> >> @@ -83,7 +83,7 @@
>>> >> parent._exitbtn.destroy();
>>> >> }
>>> >> }
>>> >> -
>>> >> +
>>> >> if(canvas.isrtl == 'true'){
>>> >> if ($debug) Debug.write("onInit :
>>> Setting
>>> >> nokey");
>>> >>
>>> lblImport.setCommand(cmd_importFile_nokey);
>>> >> @@ -92,11 +92,11 @@
>>> >> </handler>
>>> >> <_labelMenuItem id="lblImport" labelid="15"
>>> >> command="cmd_importFile" enabled="${
>>> >> canvas.ismoderator }" />
>>> >> - <!-- <menuseparator/> <_labelMenuItem
>>> >> labelid="561" command="cmd_exportFilePNG"
>>> >> - /> <_labelMenuItem labelid="562"
>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>> >> - labelid="563"
>>> command="cmd_exportFilePDF"
>>> >> /> <_labelMenuItem labelid="560"
>>> >> - command="cmd_exportFileSVG" />
>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>> >> - /> <menuseparator/> <_labelMenuItem
>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>> >> + <!-- <menuseparator/> <_labelMenuItem
>>> >> labelid="561" command="cmd_exportFilePNG"
>>> >> + /> <_labelMenuItem labelid="562"
>>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>>> >> + labelid="563"
>>> command="cmd_exportFilePDF"
>>> >> /> <_labelMenuItem labelid="560"
>>> >> + command="cmd_exportFileSVG" />
>>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>>> >> + /> <menuseparator/> <_labelMenuItem
>>> >> name="_exitItem" labelid="309" command="cmd_quit"
>>> >> value="quit" /> -->
>>> >> </_labelMenu>
>>> >>
>>> >> @@ -104,7 +104,7 @@
>>> >>
>>> >> <handler name="oninit">
>>> >> <![CDATA[
>>> >> -
>>> >> +
>>> >> if(canvas.isrtl == 'true'){
>>> >> if ($debug) Debug.write("onInit :
>>> Setting
>>> >> nokey");
>>> >>
>>> >> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
>>> >> @@ -112,6 +112,7 @@
>>> >>
>>> lblPoll.setCommand(cmd_createPoll_nokey);
>>> >>
>>> >> lblPollResult.setCommand(cmd_pollResults_nokey);
>>> >>
>>> >> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
>>> >> +
>>> >> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
>>> >> }
>>> >> //hideActionsMenu
>>> >> if(canvas.currentRoomObj.hideActionsMenu){
>>> >> @@ -133,7 +134,7 @@
>>> >> </handler>
>>> >> </_labelMenuItem>
>>> >> <menuseparator />
>>> >> - <!-- <_labelMenuItem labelid="749"
>>> >> command="cmd_coBrowser" enabled="${
>>> >> + <!-- <_labelMenuItem labelid="749"
>>> >> command="cmd_coBrowser" enabled="${
>>> >> canvas.ismoderator }" />
>>> <menuseparator/>
>>> >> -->
>>> >> <_labelMenuItem id="lblCamMic" labelid="306"
>>> >> command="cmd_editCamMicSettings" />
>>> >> @@ -177,14 +178,17 @@
>>> >> <_labelMenuItem width="250" id="lblPollVote"
>>> >> labelid="42"
>>> >> command="cmd_checkPollVoted" />
>>> >> <menuseparator />
>>> >> + <_labelMenuItem width="250" id="lblShowSipDialer"
>>> >> labelid="1447"
>>> >> + command="cmd_showSipDialer" />
>>> >> + <menuseparator />
>>> >> <_labelMenuItem width="250" labelid="1126"
>>> >> command="cmd_editWhiteboardDefault" />
>>> >> </_labelMenu>
>>> >> -
>>> >> - <!-- exit room <_labelMenu labelid="308" width="250">
>>> >> </_labelMenu> <_labelMenu
>>> >> - labelid="301" width="250"> <_labelMenuItem
>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>> >> - /> </_labelMenu> <_labelMenu labelid="305"
>>> >> width="250"> <_labelMenuItem labelid="306"
>>> >> - command="cmd_editCamMicSettings" />
>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>> >> +
>>> >> + <!-- exit room <_labelMenu labelid="308" width="250">
>>> >> </_labelMenu> <_labelMenu
>>> >> + labelid="301" width="250"> <_labelMenuItem
>>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>>> >> + /> </_labelMenu> <_labelMenu labelid="305"
>>> >> width="250"> <_labelMenuItem labelid="306"
>>> >> + command="cmd_editCamMicSettings" />
>>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>>> >> /> </_labelMenu> <_labelMenu labelid="303"
>>> >> width="250"> </_labelMenu> -->
>>> >>
>>> >> </class>
>>> >> @@ -258,7 +262,7 @@
>>> >> </handler>
>>> >> </_labelMenuItem>
>>> >> <menuseparator />
>>> >> - <!-- <_labelMenuItem labelid="749"
>>> >> command="cmd_coBrowser" enabled="${
>>> >> + <!-- <_labelMenuItem labelid="749"
>>> >> command="cmd_coBrowser" enabled="${
>>> >> canvas.ismoderator }" />
>>> >> <menuseparator/> -->
>>> >> <_labelMenuItem labelid="306"
>>> >> command="cmd_editCamMicSettings"
>>> >> enabled="${ canvas.ismoderator
>>> }" />
>>> >> @@ -358,7 +362,7 @@
>>> >> </handler>
>>> >> </_labelMenuItem>
>>> >> <menuseparator />
>>> >> - <!-- <_labelMenuItem labelid="749"
>>> >> command="cmd_coBrowser" enabled="${
>>> >> + <!-- <_labelMenuItem labelid="749"
>>> >> command="cmd_coBrowser" enabled="${
>>> >> canvas.ismoderator }" />
>>> >> <menuseparator/> -->
>>> >> <_labelMenuItem labelid="306"
>>> >> command="cmd_editCamMicSettings"
>>> >> enabled="${ canvas.ismoderator
>>> }" />
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -65,6 +65,7 @@
>>> >> <include href="restricted/" />
>>> >> <include href="browser/" />
>>> >> <include href="testsetup/" />
>>> >> + <include href="sip/" />
>>> >>
>>> >> <include href="flexibleConferenceRoom/" />
>>> >>
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,6 @@
>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>> >> +<library>
>>> >> +
>>> >> + <include href="sipDialer.lzx" />
>>> >> +
>>> >> +</library>
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,81 @@
>>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>>> >> +<library>
>>> >> +
>>> >> +<class name="sipDialer" extends="window" bgcolor="gray" width="200">
>>> >> + <simplelayout axis="y" spacing="5"/>
>>> >> + <labelText labelid="1003"/>
>>> >> + <view name="phoneNumber" width="100%">
>>> >> + <inputtext name="input"
>>> >> width="$once{parent.width-parent.del.width}" height="20"
>>> bgcolor="white"/>
>>> >> + <button name="del" x="$once{parent.input.width}" width="30"
>>> >> height="20" onclick="this.del();">
>>> >> + â†
>>> >> + <method name="del">
>>> >> + var t = parent.input.text;
>>> >> + if(t.length != 0) {
>>> >> + t = t.substr(0, t.length - 1);
>>> >> + parent.input.setAttribute('text', t);
>>> >> + }
>>> >> + </method>
>>> >> + </button>
>>> >> + </view>
>>> >> +
>>> >> + <view name="dialerButtons" align="center">
>>> >> + <vbox spacing="5">
>>> >> + <hbox spacing="5">
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('1')"
>>> >> width="40">1</button>
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('2')"
>>> >> width="40">2</button>
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('3')"
>>> >> width="40">3</button>
>>> >> + </hbox>
>>> >> + <hbox spacing="5">
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('4')"
>>> >> width="40">4</button>
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('5')"
>>> >> width="40">5</button>
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('6')"
>>> >> width="40">6</button>
>>> >> + </hbox>
>>> >> + <hbox spacing="5">
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('7')"
>>> >> width="40">7</button>
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('8')"
>>> >> width="40">8</button>
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('9')"
>>> >> width="40">9</button>
>>> >> + </hbox>
>>> >> + <hbox spacing="5">
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('*')"
>>> >> width="40">*</button>
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('0')"
>>> >> width="40">0</button>
>>> >> + <button
>>> onclick="parent.parent.parent.parent.dial('#')"
>>> >> width="40">#</button>
>>> >> + </hbox>
>>> >> + </vbox>
>>> >> + </view>
>>> >> + <hbox spacing="10" align="center">
>>> >> + <simpleLabelButton labelid="1448" name="callButton">
>>> >> + <handler name="onclick">
>>> >> + parent.parent.joinToConfCall.doCall();
>>> >> + </handler>
>>> >> + </simpleLabelButton>
>>> >> + <simpleLabelButton labelid="85" name="closeButton">
>>> >> + <handler name="onclick">
>>> >> + canvas.sipDialer = null;
>>> >> + parent.parent.destroy();
>>> >> + </handler>
>>> >> + </simpleLabelButton>
>>> >> + </hbox>
>>> >> + <handler name="oninit">
>>> >> + if(canvas.sipDialer != null) {
>>> >> + canvas.sipDialer.destroy();
>>> >> + }
>>> >> + canvas.setAttribute('sipDialer', this);
>>> >> + this.bringToFront();
>>> >> + </handler>
>>> >> +
>>> >> + <method name="dial" args="digit">
>>> >> + this.phoneNumber.input.setAttribute('text',
>>> >> this.phoneNumber.input.text + digit);
>>> >> + </method>
>>> >> +
>>> >> + <netRemoteCallHib name="joinToConfCall" funcname="joinToConfCall"
>>> >> remotecontext="$once{ canvas.thishib }">
>>> >> + <netparam><method name="getValue">return
>>> >> parent.parent.phoneNumber.input.text</method></netparam>
>>> >> + <handler name="ondata" args="value">
>>> >> + <![CDATA[
>>> >> + //The onResult-Handler will be called be the
>>> rtmpconnection
>>> >> + if($debug) Debug.write("joinToConfCall : ",value);
>>> >> + ]]>
>>> >> + </handler>
>>> >> + </netRemoteCallHib>
>>> >> +</class>
>>> >> +
>>> >> +</library>
>>> >> \ No newline at end of file
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -67,6 +67,9 @@
>>> >>
>>> >>
>>> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
>>> >>
>>> >> <class>org.openmeetings.app.persistence.beans.user.Users</class>
>>> >>
>>> >>
>>> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
>>> >> +
>>> >>
>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
>>> >> +
>>> >>
>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
>>> >> +
>>> >>
>>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
>>> >>
>>> <exclude-unlisted-classes>false</exclude-unlisted-classes>
>>> >> <properties>
>>> >> <property
>>> >> name="openjpa.ConnectionProperties"
>>> >> @@ -83,7 +86,8 @@
>>> >> <property name="openjpa.Log"
>>> >> value="DefaultLevel=WARN, Tool=INFO" />
>>> >> <property
>>> >> name="openjpa.ConnectionDriverName"
>>> >> value="org.apache.commons.dbcp.BasicDataSource"/>
>>> >> <property name="openjpa.DataCache"
>>> >> value="true"/>
>>> >> - <property name="openjpa.QueryCache"
>>> >> value="true"/>
>>> >> + <!-- QueryCache disabled due to changes outside of
>>> JPA
>>> >> doesn't take effect with caching -->
>>> >> + <property name="openjpa.QueryCache"
>>> >> value="false"/>
>>> >> <property
>>> name="openjpa.jdbc.DBDictionary"
>>> >> value="batchLimit=100,tableType=myisam"/>
>>> >> <property
>>> name="openjpa.jdbc.QuerySQLCache"
>>> >> value="false"/>
>>> >> </properties>
>>> >>
>>> >> Modified:
>>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> --- incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>> >> (original)
>>> >> +++ incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>> Mon
>>> >> Mar 26 09:14:15 2012
>>> >> @@ -331,7 +331,36 @@ function checkEmail()
>>> >>
>>> >> </i></p>
>>> >>
>>> >> - </fieldset>
>>> >> + </fieldset>
>>> >> +
>>> >> + <fieldset id="red5sip">
>>> >> + <legend>red5SIP Configuration</legend>
>>> >> +
>>> >> + <li>
>>> >> + <label for="red5sip_enable">Enable SIP</label>
>>> >> + <select name="red5sip_enable" id="red5sip_enable" size="1">
>>> >> + <option value="yes">Yes</option>
>>> >> + <option value="no" selected>No</option>
>>> >> + </select><br />
>>> >> + </li>
>>> >> + <p><i>
>>> >> + Enable red5SIP integration
>>> >> + </i></p>
>>> >> + <br />
>>> >> +
>>> >> + <li>
>>> >> + <label for="red5sip_room_prefix">SIP rooms prefix</label>
>>> >> + <input name="red5sip_room_prefix" id="red5sip_room_prefix"
>>> >> size="27" title="" type="text" value="400" />
>>> >> + <p><i>Prefix for phone number of conference rooms</i></p>
>>> >> + </li>
>>> >> +
>>> >> + <li>
>>> >> + <label for="red5sip_exten_context">SIP extensions
>>> context</label>
>>> >> + <input name="red5sip_exten_context"
>>> id="red5sip_exten_context"
>>> >> size="27" title="" type="text" value="rooms" />
>>> >> + <p><i>Context of Asterisk extensions</i></p>
>>> >> + </li>
>>> >> +
>>> >> + </fieldset>
>>> >>
>>> >> <fieldset id="sip">
>>> >>
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
>>> >>
>>> >> import org.openmeetings.app.conference.session.RoomClient;
>>> >> import org.openmeetings.app.data.basic.AuthLevelmanagement;
>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>> >> import org.openmeetings.app.data.beans.basic.SearchResult;
>>> >> import
>>> org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
>>> >> import org.openmeetings.app.data.user.Organisationmanagement;
>>> >> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
>>> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>>> >> import
>>> org.openmeetings.app.persistence.beans.domain.Organisation_Users;
>>> >> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
>>> >> import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>> >> import
>>> org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
>>> >> import org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>> >> import org.openmeetings.app.persistence.beans.user.Users;
>>> >> import org.openmeetings.app.remote.red5.ClientListManager;
>>> >> +import
>>> org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
>>> >> +import
>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>> >> +import
>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>> >> +import
>>> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>> >> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
>>> >> import org.red5.logging.Red5LoggerFactory;
>>> >> import org.slf4j.Logger;
>>> >> @@ -71,6 +78,8 @@ public class Roommanagement {
>>> >> @Autowired
>>> >> private OpenXGHttpClient openXGHttpClient;
>>> >> @Autowired
>>> >> + private AsteriskDbSipClient asteriskDbSipClient;
>>> >> + @Autowired
>>> >> private RoomModeratorsDaoImpl roomModeratorsDao;
>>> >> @Autowired
>>> >> private UsersDaoImpl usersDao;
>>> >> @@ -78,6 +87,8 @@ public class Roommanagement {
>>> >> private AuthLevelmanagement authLevelManagement;
>>> >> @Autowired
>>> >> private ClientListManager clientListManager;
>>> >> + @Autowired
>>> >> + private Configurationmanagement cfgManagement;
>>> >>
>>> >> /**
>>> >> * add a new Record to the table roomtypes
>>> >> @@ -102,6 +113,20 @@ public class Roommanagement {
>>> >>
>>> >> public Long addRoom(Rooms room) {
>>> >> try {
>>> >> + /* Red5SIP integration
>>> >>
>>> *******************************************************************************/
>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>> >> "red5sip.enable");
>>> >> + if(conf != null && conf.getConf_value().equals("yes")) {
>>> >> + if(room.getSipNumber() != null &&
>>> >> !room.getSipNumber().isEmpty()) {
>>> >> + asteriskDbSipClient.createSIPConference(new
>>> >> SIPCreateConferenceRequest(room.getSipNumber()));
>>> >> + } else {
>>> >> + SipCreateConferenceRequestResult requestResult =
>>> >> asteriskDbSipClient.createSIPConference(new
>>> SIPCreateConferenceRequest());
>>> >> + if(!requestResult.hasError()) {
>>> >> +
>>> >> room.setSipNumber(requestResult.getConferenceNumber());
>>> >> +
>>> >> room.setConferencePin(requestResult.getConferencePin());
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> +
>>> >>
>>> /*****************************************************************************************************/
>>> >> room.setStarttime(new Date());
>>> >> room = em.merge(room);
>>> >> long returnId = room.getRooms_id();
>>> >> @@ -719,6 +744,25 @@ public class Roommanagement {
>>> >> return null;
>>> >> }
>>> >>
>>> >> + /**
>>> >> + * Returns number of SIP conference participants
>>> >> + * @param rooms_id id of room
>>> >> + * @return number of participants
>>> >> + */
>>> >> + public Integer getSipConferenceMembersNumber(Long rooms_id) {
>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>> >> "red5sip.enable");
>>> >> + if(conf != null && conf.getConf_value().equals("yes")) {
>>> >> + Rooms rooms = this.getRoomById(rooms_id);
>>> >> + if(rooms != null) {
>>> >> + return
>>> >> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
>>> >> + } else {
>>> >> + return 0;
>>> >> + }
>>> >> + } else {
>>> >> + return null;
>>> >> + }
>>> >> + }
>>> >> +
>>> >> /**
>>> >> * adds a new Record to the table rooms
>>> >> * @param name
>>> >> @@ -793,6 +837,19 @@ public class Roommanagement {
>>> >>
>>> >> r.setConferencePin(openXGReturnObject.getConferencePin());
>>> >> }
>>> >>
>>> >> + /* Red5SIP integration
>>> >>
>>> *******************************************************************************/
>>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>>> >> "red5sip.enable");
>>> >> + if(conf != null &&
>>> conf.getConf_value().equals("yes")) {
>>> >> + SipCreateConferenceRequestResult requestResult =
>>> >> asteriskDbSipClient
>>> >> + .createSIPConference(new
>>> >> SIPCreateConferenceRequest());
>>> >> +
>>> >> + if(!requestResult.hasError()) {
>>> >> +
>>> >> r.setSipNumber(requestResult.getConferenceNumber());
>>> >> +
>>> >> r.setConferencePin(requestResult.getConferencePin());
>>> >> + }
>>> >> + }
>>> >> +
>>> >>
>>> /*****************************************************************************************************/
>>> >> +
>>> >> r = em.merge(r);
>>> >> long returnId = r.getRooms_id();
>>> >>
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -252,7 +252,8 @@ public class ImportInitvalues {
>>> >> String openxg_client_domain, String
>>> >> openxg_community_code,
>>> >> String openxg_language_code, String
>>> openxg_adminid,
>>> >> String sip_language_phonecode, String
>>> >> sip_phonerange_start,
>>> >> - String sip_phonerange, String jodPath) {
>>> >> + String sip_phonerange, String jodPath,
>>> >> + String red5sip_enable, String red5sip_room_prefix,String
>>> >> red5sip_exten_context) {
>>> >>
>>> >> cfgManagement
>>> >> .addConfByKey(
>>> >> @@ -349,6 +350,18 @@ public class ImportInitvalues {
>>> >> cfgManagement.addConfByKey(3, "default.rpc.userid", ""
>>> + 1,
>>> >> null,
>>> >> "The User-Id of the Control User in
>>> >> OpenMeetings");
>>> >>
>>> >> + // ***************************************
>>> >> + // ***************************************
>>> >> + // red5SIP Integration Coniguration Values
>>> >> + // ***************************************
>>> >> +
>>> >> + cfgManagement.addConfByKey(3, "red5sip.enable",
>>> red5sip_enable,
>>> >> null,
>>> >> + "Enable to enable the red5SIP
>>> integration
>>> >> ");
>>> >> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
>>> >> red5sip_room_prefix, null,
>>> >> + "Enable to enable the red5SIP
>>> integration
>>> >> ");
>>> >> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
>>> >> red5sip_exten_context, null,
>>> >> + "Enable to enable the red5SIP
>>> integration
>>> >> ");
>>> >> +
>>> >> // ***************************************
>>> >> // ***************************************
>>> >> // SIP Applet Configuration Values
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -19,6 +19,7 @@
>>> >> package org.openmeetings.app.remote.red5;
>>> >>
>>> >> import java.io.File;
>>> >> +import java.io.IOException;
>>> >> import java.util.ArrayList;
>>> >> import java.util.Collection;
>>> >> import java.util.Date;
>>> >> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
>>> >> return null;
>>> >> }
>>> >>
>>> >> + public synchronized List<Integer> listRoomBroadcast() {
>>> >> + List<Integer> broadcastList = new ArrayList<Integer>();
>>> >> + IConnection current = Red5.getConnectionLocal();
>>> >> + String streamid = current.getClient().getId();
>>> >> + Collection<Set<IConnection>> conCollection =
>>> >> current.getScope().getConnections();
>>> >> + for (Set<IConnection> conset : conCollection) {
>>> >> + for (IConnection conn : conset) {
>>> >> + if (conn != null) {
>>> >> + RoomClient rcl = this.clientListManager
>>> >> + .getClientByStreamId(conn
>>> >> + .getClient().getId());
>>> >> + if (rcl == null) {
>>> >> + // continue;
>>> >> + } else if (rcl.getIsScreenClient() != null
>>> >> + && rcl.getIsScreenClient()) {
>>> >> + // continue;
>>> >> + } else {
>>> >> + if (!streamid.equals(rcl.getStreamid())) {
>>> >> + // It is not needed to send back
>>> >> + // that event to the actuall
>>> >> + // Moderator
>>> >> + // as it will be already triggered
>>> >> + // in the result of this Function
>>> >> + // in the Client
>>> >> +
>>> >> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> + return broadcastList;
>>> >> + }
>>> >> +
>>> >> +
>>> >> /**
>>> >> * this function is invoked directly after initial connecting
>>> >> *
>>> >> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
>>> >> }
>>> >> return null;
>>> >> }
>>> >> +
>>> >> + /*
>>> >> + * SIP transport methods
>>> >> + */
>>> >> +
>>> >> + public synchronized void updateSipTransport() {
>>> >> + IConnection current = Red5.getConnectionLocal();
>>> >> + String streamid = current.getClient().getId();
>>> >> + RoomClient currentClient =
>>> >> this.clientListManager.getClientByStreamId(streamid);
>>> >> + log.debug("getSipConferenceMembersNumber: " +
>>> >>
>>> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
>>> >> + String newNumber =
>>> >>
>>> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
>>> >> + if(!newNumber.equals(currentClient.getLastname())) {
>>> >> + currentClient.setLastname(newNumber);
>>> >> + this.clientListManager.updateClientByStreamId(streamid,
>>> >> currentClient);
>>> >> + log.debug("updateSipTransport: {}, {}, {}, {}", new
>>> >> Object[]{currentClient.getPublicSID(),
>>> >> + currentClient.getRoom_id(),
>>> >> currentClient.getFirstname(), currentClient.getLastname()});
>>> >> + sendMessageWithClient(new
>>> >>
>>> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
>>> >> + }
>>> >> + }
>>> >> +
>>> >> + /**
>>> >> + * Perform call to specified phone number and join to conference
>>> >> + * @param number to call
>>> >> + */
>>> >> + public synchronized void joinToConfCall(String number) {
>>> >> + IConnection current = Red5.getConnectionLocal();
>>> >> + String streamid = current.getClient().getId();
>>> >> + RoomClient currentClient =
>>> >> this.clientListManager.getClientByStreamId(streamid);
>>> >> + Rooms rooms =
>>> >> roommanagement.getRoomById(currentClient.getRoom_id());
>>> >> + log.debug("asterisk -rx \"originate Local/" + number +
>>> "@rooms
>>> >> extension " + rooms.getSipNumber() + "@rooms\"");
>>> >> + try {
>>> >> + Process proc = Runtime.getRuntime().exec(new
>>> >> String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms
>>> extension
>>> >> " + rooms.getSipNumber() + "@rooms"});
>>> >> + } catch (IOException e) {
>>> >> + log.error("Executing asterisk originate error: ", e);
>>> >> + }
>>> >> + }
>>> >> +
>>> >> + public synchronized String getSipNumber(Long room_id) {
>>> >> + Rooms rooms = roommanagement.getRoomById(room_id);
>>> >> + if(rooms != null) {
>>> >> + log.debug("getSipNumber: room_id: {}, sipNumber: {}", new
>>> >> Object[]{room_id, rooms.getSipNumber()});
>>> >> + return rooms.getSipNumber();
>>> >> + }
>>> >> + return null;
>>> >> + }
>>> >> +
>>> >> + public synchronized void setSipTransport(Long room_id, String
>>> >> publicSID, String broadCastId) {
>>> >> + IConnection current = Red5.getConnectionLocal();
>>> >> + String streamid = current.getClient().getId();
>>> >> + Rooms room = roommanagement.getRoomById(room_id);
>>> >> + // Notify all clients of the same scope (room)
>>> >> + RoomClient currentClient =
>>> >> this.clientListManager.getClientByStreamId(streamid);
>>> >> + currentClient.setRoom_id(room_id);
>>> >> + currentClient.setRoomEnter(new Date());
>>> >> + currentClient.setFirstname("SIP Transport");
>>> >> +
>>> >>
>>> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
>>> >> + currentClient.setBroadCastID(Long.parseLong(broadCastId));
>>> >> + currentClient.setIsBroadcasting(true);
>>> >> + currentClient.setPublicSID(publicSID);
>>> >> + currentClient.setAvsettings("av");
>>> >> + currentClient.setVWidth(120);
>>> >> + currentClient.setVHeight(90);
>>> >> + this.clientListManager.updateClientByStreamId(streamid,
>>> >> currentClient);
>>> >> +
>>> >> + Collection<Set<IConnection>> conCollection = current
>>> >> + .getScope().getConnections();
>>> >> + for (Set<IConnection> conset : conCollection) {
>>> >> + for (IConnection conn : conset) {
>>> >> + if (conn != null) {
>>> >> + RoomClient rcl =
>>> >> this.clientListManager.getClientByStreamId(conn.getClient().getId());
>>> >> + if (rcl == null) {
>>> >> + // continue;
>>> >> + } else if (rcl.getIsScreenClient() != null
>>> >> + && rcl.getIsScreenClient()) {
>>> >> + // continue;
>>> >> + } else {
>>> >> + if (!streamid.equals(rcl.getStreamid())) {
>>> >> + // It is not needed to send back
>>> >> + // that event to the actuall
>>> >> + // Moderator
>>> >> + // as it will be already triggered
>>> >> + // in the result of this Function
>>> >> + // in the Client
>>> >> + if (conn instanceof
>>> >> IServiceCapableConnection) {
>>> >> + ((IServiceCapableConnection)
>>> >> conn).invoke("addNewUser", new Object[]{currentClient}, this);
>>> >> + ((IServiceCapableConnection)
>>> >> conn).invoke("newStream", new Object[]{currentClient}, this);
>>> >> + log.debug("sending setSipTransport
>>> to "
>>> >> + + conn);
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> + }
>>> >> }
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,19 @@
>>> >> +package org.openmeetings.app.sip.api;
>>> >> +
>>> >> +import
>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>> >> +import
>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>> >> +import
>>> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>> >> +
>>> >> +/**
>>> >> + * SIP client interface
>>> >> + */
>>> >> +public interface ISIPClient {
>>> >> +
>>> >> + SIPCreateUserRequestResult createSIPUser(SIPCreateUserRequest
>>> >> request);
>>> >> +
>>> >> + SipCreateConferenceRequestResult
>>> >> createSIPConference(SIPCreateConferenceRequest request);
>>> >> +
>>> >> + Integer getConferenceMembersNumber(String sipNumber);
>>> >> +
>>> >> +}
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,58 @@
>>> >> +package org.openmeetings.app.sip.api.impl.asterisk;
>>> >> +
>>> >> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>> >> +import org.openmeetings.app.sip.api.ISIPClient;
>>> >> +import
>>> org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
>>> >> +import
>>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>>> >> +import
>>> org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>>> >> +import
>>> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>> >> +/**
>>> >> + *
>>> >> + */
>>> >> +public class AsteriskDbSipClient implements ISIPClient {
>>> >> +
>>> >> + @Autowired
>>> >> + private AsteriskDAOImpl asteriskDAO;
>>> >> +
>>> >> + public SIPCreateUserRequestResult createSIPUser(final
>>> >> SIPCreateUserRequest request) {
>>> >> + asteriskDAO.addSipUser(request.getLogin(),
>>> request.getPassword());
>>> >> + return new SIPCreateUserRequestResult() {
>>> >> + @Override
>>> >> + public UserSipData getUserSipData() {
>>> >> + UserSipData sipData = new UserSipData();
>>> >> + sipData.setAuthId(request.getLogin());
>>> >> + sipData.setUserpass(request.getPassword());
>>> >> + sipData.setUsername(request.getLogin());
>>> >> + return sipData;
>>> >> + }
>>> >> +
>>> >> + public boolean hasError() {
>>> >> + return false;
>>> >> + }
>>> >> +
>>> >> + public String getErrorMessage() {
>>> >> + return null;
>>> >> + }
>>> >> + };
>>> >> + }
>>> >> +
>>> >> + public SipCreateConferenceRequestResult
>>> >> createSIPConference(SIPCreateConferenceRequest request) {
>>> >> + String confno = asteriskDAO.addMeetMeConference();
>>> >> + return new SipCreateConferenceRequestResult(confno, "") {
>>> >> + public boolean hasError() {
>>> >> + return false;
>>> >> + }
>>> >> +
>>> >> + public String getErrorMessage() {
>>> >> + return null;
>>> >> + }
>>> >> + };
>>> >> + }
>>> >> +
>>> >> + public Integer getConferenceMembersNumber(String sipNumber) {
>>> >> + return asteriskDAO.getConferensMembersNumber(sipNumber);
>>> >> + }
>>> >> +}
>>> >> \ No newline at end of file
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,76 @@
>>> >> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
>>> >> +
>>> >> +import org.openmeetings.app.OpenmeetingsVariables;
>>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>>> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>>> >> +import
>>> >> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
>>> >> +import
>>> org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
>>> >> +import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
>>> >> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
>>> >> +import org.red5.logging.Red5LoggerFactory;
>>> >> +import org.slf4j.Logger;
>>> >> +import org.springframework.transaction.annotation.Transactional;
>>> >> +import org.springframework.beans.factory.annotation.Autowired;
>>> >> +
>>> >> +import javax.persistence.EntityManager;
>>> >> +import javax.persistence.PersistenceContext;
>>> >> +
>>> >> +@Transactional
>>> >> +public class AsteriskDAOImpl {
>>> >> +
>>> >> + private static final Logger log =
>>> >> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
>>> >> OpenmeetingsVariables.webAppRootKey);
>>> >> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
>>> >> + @PersistenceContext
>>> >> + private EntityManager em;
>>> >> + @Autowired
>>> >> + private Configurationmanagement cfgManagement;
>>> >> +
>>> >> + public void addSipUser(String username, String secret) {
>>> >> + AsteriskSipUsers u = new AsteriskSipUsers();
>>> >> + Configuration conf =
>>> >> cfgManagement.getConfKey(3L,"red5sip.exten_context");
>>> >> + String defaultRoomContext = "rooms";
>>> >> + if(conf != null && !conf.getConf_value().isEmpty()) {
>>> >> + defaultRoomContext = conf.getConf_value();
>>> >> + }
>>> >> + u.setName(username);
>>> >> + u.setSecret(secret);
>>> >> + u.setContext(defaultRoomContext);
>>> >> + u.setHost("dynamic");
>>> >> + Extensions e = new Extensions();
>>> >> + e.setApp("Dial");
>>> >> + e.setAppdata("SIP/" + username);
>>> >> + e.setExten(username);
>>> >> + e.setContext(defaultRoomContext);
>>> >> + e.setPriority(1);
>>> >> + em.persist(u);
>>> >> + em.persist(e);
>>> >> + }
>>> >> +
>>> >> + public String addMeetMeConference() {
>>> >> + int count = ((Number)em.createQuery("SELECT COUNT(m.confno)
>>> FROM
>>> >> MeetMe AS m").getSingleResult()).intValue();
>>> >> +
>>> >> + Configuration conf =
>>> >> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
>>> >> + String prefix = DEFAULT_SIP_CONTEXT;
>>> >> + if(conf != null) {
>>> >> + prefix = conf.getConf_value();
>>> >> + }
>>> >> + String confno = prefix+(count+1);
>>> >> + MeetMe mm = new MeetMe();
>>> >> + mm.setConfno(confno);
>>> >> + Extensions e = new Extensions();
>>> >> + e.setApp("MeetMe");
>>> >> + e.setAppdata(confno + ",dM");
>>> >> + e.setExten(confno);
>>> >> + e.setContext("rooms");
>>> >> + e.setPriority(1);
>>> >> + em.persist(mm);
>>> >> + em.persist(e);
>>> >> + return confno;
>>> >> + }
>>> >> +
>>> >> + public Integer getConferensMembersNumber(String confNo) {
>>> >> + return ((Number)em.createQuery("SELECT m.members FROM MeetMe
>>> AS m
>>> >> WHERE m.confno=:confno")
>>> >> + .setParameter("confno", confNo)
>>> >> + .getSingleResult()).intValue();
>>> >> + }
>>> >> +}
>>> >> \ No newline at end of file
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,8 @@
>>> >> +package org.openmeetings.app.sip.api.request;
>>> >> +
>>> >> +/**
>>> >> + * Base interface for SIP API requests
>>> >> + */
>>> >> +public interface ISIPRequest {
>>> >> +
>>> >> +}
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,17 @@
>>> >> +package org.openmeetings.app.sip.api.request;
>>> >> +
>>> >> +/**
>>> >> + * Create SIP conferece request
>>> >> + */
>>> >> +public class SIPCreateConferenceRequest implements ISIPRequest {
>>> >> + private String sipNumber;
>>> >> +
>>> >> + public SIPCreateConferenceRequest() {
>>> >> + super(); //To change body of overridden methods use File |
>>> >> Settings | File Templates.
>>> >> + }
>>> >> +
>>> >> + public SIPCreateConferenceRequest(String sipNumber) {
>>> >> + super();
>>> >> + this.sipNumber = sipNumber;
>>> >> + }
>>> >> +}
>>> >> \ No newline at end of file
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,72 @@
>>> >> +package org.openmeetings.app.sip.api.request;
>>> >> +
>>> >> +/**
>>> >> + * Create User Request
>>> >> + */
>>> >> +public class SIPCreateUserRequest implements ISIPRequest {
>>> >> +
>>> >> + protected String firstName;
>>> >> + protected String middleName;
>>> >> + protected String lastName;
>>> >> + protected String email;
>>> >> + protected String login;
>>> >> + protected String password;
>>> >> +
>>> >> +
>>> >> + public SIPCreateUserRequest(String firstName, String middleName,
>>> >> String lastName, String email, String login, String password) {
>>> >> + this.firstName = firstName;
>>> >> + this.middleName = middleName;
>>> >> + this.lastName = lastName;
>>> >> + this.email = email;
>>> >> + this.login = login;
>>> >> + this.password = password;
>>> >> + }
>>> >> +
>>> >> + public void withFirstName(String firstName) {
>>> >> + this.firstName = firstName;
>>> >> + }
>>> >> +
>>> >> + public void withMiddleName(String middleName) {
>>> >> + this.middleName = middleName;
>>> >> + }
>>> >> +
>>> >> + public void withLastName(String lastName) {
>>> >> + this.lastName = lastName;
>>> >> + }
>>> >> +
>>> >> + public void withEmail(String email) {
>>> >> + this.email = email;
>>> >> + }
>>> >> +
>>> >> + public void withLogin(String login) {
>>> >> + this.login = login;
>>> >> + }
>>> >> +
>>> >> + public void withPassword(String password) {
>>> >> + this.password = password;
>>> >> + }
>>> >> +
>>> >> + public String getFirstName() {
>>> >> + return firstName;
>>> >> + }
>>> >> +
>>> >> + public String getMiddleName() {
>>> >> + return middleName;
>>> >> + }
>>> >> +
>>> >> + public String getLastName() {
>>> >> + return lastName;
>>> >> + }
>>> >> +
>>> >> + public String getEmail() {
>>> >> + return email;
>>> >> + }
>>> >> +
>>> >> + public String getLogin() {
>>> >> + return login;
>>> >> + }
>>> >> +
>>> >> + public String getPassword() {
>>> >> + return password;
>>> >> + }
>>> >> +}
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,12 @@
>>> >> +package org.openmeetings.app.sip.api.result;
>>> >> +
>>> >> +/**
>>> >> + * * Base interface for SIP API request's resuslt
>>> >> + */
>>> >> +public interface ISIPRequestResult {
>>> >> +
>>> >> + boolean hasError();
>>> >> +
>>> >> + String getErrorMessage();
>>> >> +
>>> >> +}
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,12 @@
>>> >> +package org.openmeetings.app.sip.api.result;
>>> >> +
>>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>>> >> +
>>> >> +/**
>>> >> + * TODO
>>> >> + */
>>> >> +public abstract class SIPCreateUserRequestResult implements
>>> >> ISIPRequestResult {
>>> >> +
>>> >> + abstract public UserSipData getUserSipData();
>>> >> +
>>> >> +}
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Added:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>> >> (added)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -0,0 +1,26 @@
>>> >> +package org.openmeetings.app.sip.api.result;
>>> >> +
>>> >> +/**
>>> >> + * TODO
>>> >> + */
>>> >> +public abstract class SipCreateConferenceRequestResult implements
>>> >> ISIPRequestResult {
>>> >> +
>>> >> + protected String conferenceNumber;
>>> >> + protected String conferencePin;
>>> >> +
>>> >> + protected SipCreateConferenceRequestResult() {
>>> >> + }
>>> >> +
>>> >> + protected SipCreateConferenceRequestResult(String
>>> conferenceNumber,
>>> >> String conferencePin) {
>>> >> + this.conferenceNumber = conferenceNumber;
>>> >> + this.conferencePin = conferencePin;
>>> >> + }
>>> >> +
>>> >> + public String getConferenceNumber() {
>>> >> + return conferenceNumber;
>>> >> + }
>>> >> +
>>> >> + public String getConferencePin() {
>>> >> + return conferencePin;
>>> >> + }
>>> >> +}
>>> >>
>>> >> Propchange:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>> >>
>>> >>
>>> ------------------------------------------------------------------------------
>>> >> svn:eol-style = native
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
>>> >> String screen_viewer =
>>> >> httpServletRequest
>>> >>
>>> >> .getParameter("screen_viewer");
>>> >>
>>> >> + // red5sip integration config
>>> >> + String red5sip_enable = httpServletRequest
>>> >> +
>>> >> .getParameter("red5sip_enable");
>>> >> + String red5sip_room_prefix = httpServletRequest
>>> >> +
>>> >> .getParameter("red5sip_room_prefix");
>>> >> + String red5sip_exten_context = httpServletRequest
>>> >> +
>>> >> .getParameter("red5sip_exten_context");
>>> >> +
>>> >> // SIP Applet Configuration
>>> >> String sip_enable =
>>> >> httpServletRequest
>>> >>
>>> >> .getParameter("sip_enable");
>>> >> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
>>> >>
>>> >> openxg_community_code, openxg_language_code,
>>> >> openxg_adminid,
>>> >> sip_language_phonecode,
>>> >>
>>> >> sip_phonerange_start, sip_phonerange,
>>> >> - jodPath);
>>> >> + jodPath,
>>> >> + red5sip_enable, red5sip_room_prefix,
>>> >> red5sip_exten_context);
>>> >>
>>> >>
>>> >> getImportInitvalues().loadInitUserAndOrganisation(username,
>>> >> userpass,
>>> >> useremail, orgname, timeZone, configdefaultLang);
>>> >>
>>> >> Modified:
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>> >> URL:
>>> >>
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>> >>
>>> >>
>>> ==============================================================================
>>> >> ---
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>> >> (original)
>>> >> +++
>>> >>
>>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>> >> Mon Mar 26 09:14:15 2012
>>> >> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
>>> >> private static final String sip_phonerange_start = "";
>>> >> private static final String sip_phonerange = "";
>>> >> private static final String jodPath = "./jod/lib";
>>> >> + private static final String red5sip_enable = "no";
>>> >> + private static final String red5sip_room_prefix = "400";
>>> >> + private static final String red5sip_exten_context = "rooms";
>>> >> protected static final String username = "junit";
>>> >> protected static final String userpass = "test";
>>> >> private static final String orgname = "smoketest";
>>> >> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
>>> >> openxg_client_id, openxg_client_secret,
>>> >> openxg_client_domain,
>>> >> openxg_community_code,
>>> >> openxg_language_code, openxg_adminid,
>>> >> sip_language_phonecode,
>>> >> sip_phonerange_start, sip_phonerange,
>>> >> - jodPath);
>>> >> + jodPath, red5sip_enable,
>>> >> red5sip_room_prefix, red5sip_exten_context);
>>> >>
>>> >> importInitvalues.loadInitUserAndOrganisation(username,
>>> >> userpass,
>>> >> useremail, orgname, timeZone,
>>> >> configdefaultLang);
>>> >>
>>> >>
>>> >>
>>> >
>>> >
>>> > --
>>> > Sebastian Wagner
>>> > http://www.openmeetings.de
>>> > http://incubator.apache.org/openmeetings/
>>> > http://www.webbase-design.de
>>> > http://www.wagner-sebastian.com
>>> > seba.wagner@gmail.com
>>>
>>
>>
>>
>> --
>> Timur Tleukenov
>>
>
>
>
> --
> Sebastian Wagner
> http://www.openmeetings.de
> http://incubator.apache.org/openmeetings/
> http://www.webbase-design.de
> http://www.wagner-sebastian.com
> seba.wagner@gmail.com
>
--
Sebastian Wagner
http://www.openmeetings.de
http://incubator.apache.org/openmeetings/
http://www.webbase-design.de
http://www.wagner-sebastian.com
seba.wagner@gmail.com
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Posted by "seba.wagner@gmail.com" <se...@gmail.com>.
Hi Timur,
please don't forget to add the new persistence classes also to the other
templates:
db2/derby/oracle/postgres
Thanks!
Sebastian
2012/3/27 Тимур Тлеукенов <ti...@gmail.com>
> Hi Sebastian,
>
> I added the missing files and license headers.
>
> 2012/3/27 Alexei Fedotov <al...@gmail.com>
>
>> Ok, I'm here. :-)
>>
>>
>>
>>
>> On Mon, Mar 26, 2012 at 6:03 PM, seba.wagner@gmail.com
>> <se...@gmail.com> wrote:
>> > Hi Timur,
>> >
>> > nice changeset :)
>> >
>> > But it seems like you've missed to checking some of your code:
>> >
>> https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
>> >
>> > The beans: AsteriskSipUsers, Extens, MeetMe are missing
>> >
>> > And you should enable the BackupExport/BackupImport to include and
>> > re-import the data from the new tables.
>> >
>> > We might also add some panels in the Admin UI to have the possibility to
>> > save/edit/delete the settings from the OpenMeetings Admin UI in the
>> future.
>> >
>> > Thanks!
>> > Sebastian
>> >
>> > 2012/3/26 <ti...@apache.org>
>> >
>> >> Author: timur
>> >> Date: Mon Mar 26 09:14:15 2012
>> >> New Revision: 1305274
>> >>
>> >> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
>> >> Log:
>> >> red5sip integration:
>> >> - new Asterisk DAO added;
>> >> - new red5sip configurations added to install step1 template;
>> >> - new methods added to ScopeApplicationAdapter.java
>> >> - openjpa.QueryCache temporally disabled to make database changes from
>> >> Asterisk visible in OM.
>> >>
>> >> Added:
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> >> (with props)
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> >> (with props)
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> >> (with props)
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> >> (with props)
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> >> (with props)
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> >> (with props)
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> >> (with props)
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> >> (with props)
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> >> (with props)
>> >> Modified:
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> >> simplified.xml
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> >> traditional.xml
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>> >> (studIP).xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>> >> brazil.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>> >> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>> >>
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -204,7 +204,9 @@
>> >> <!-- No Interface -->
>> >> <bean id="manageCryptStyle"
>> >> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
>> >> <bean id="openXGHttpClient"
>> >> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
>> >> - <bean id="generateImage"
>> >> class="org.openmeetings.app.documents.GenerateImage" />
>> >> + <bean id="asteriskDbSipClient"
>> >> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient"
>> />
>> >> + <bean id="asteriskDAO"
>> >> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl"
>> />
>> >> + <bean id="generateImage"
>> >> class="org.openmeetings.app.documents.GenerateImage" />
>> >> <bean id="generateThumbs"
>> >> class="org.openmeetings.app.documents.GenerateThumbs" />
>> >> <bean id="generatePDF"
>> >> class="org.openmeetings.app.documents.GeneratePDF" />
>> >> <bean id="mailHandler"
>> >> class="org.openmeetings.utils.mail.MailHandler" />
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> >> simplified.xml (original)
>> >> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> >> simplified.xml Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> >> traditional.xml (original)
>> >> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> >> traditional.xml Mon Mar 26 09:14:15 2012
>> >> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</value>
>> >> + </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>> >> (studIP).xml (original)
>> >> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>> >> (studIP).xml Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>> >> brazil.xml (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>> >> brazil.xml Mon Mar 26 09:14:15 2012
>> >> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Ромеронабиратель SIP</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Mon
>> >> Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> >> <string id="1446" name="calendar edit button">
>> >> <value>Edit details</value>
>> >> </string>
>> >> + <string id="1447" name="sip show dialer">
>> >> + <value>Show sip dialer</value>
>> >> + </string>
>> >> + <string id="1448" name="sip call">
>> >> + <value>Call</value>
>> >> + </string>
>> >> </language>
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -225,8 +225,9 @@ of the red5-servlet
>> >> -->
>> >> <!-- Quality-Modus *normal* -->
>> >> <microphoneRateNormal>22</microphoneRateNormal>
>> >> -<!-- Microphone Settings Quality-Modus *best* -->
>> >> -<microphoneRateBest>44</microphoneRateBest>
>> >> +<!-- Microphone Settings Quality-Modus *best* -->
>> >> +<!-- TODO: red5sip support only 8 -->
>> >> +<microphoneRateBest>44</microphoneRateBest>
>> >>
>> >> <!--
>> >> The Size of the Whiteboard
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -47,7 +47,8 @@
>> >> <confmenucommand id="cmd_importFile"
>> >> onselect="canvas.doActionmenu('importFile')"
>> key="['ALT','Shift','I']"/>
>> >> <confmenucommand id="cmd_editCamMicSettings"
>> >> onselect="canvas.doActionmenu('editCamMicSettings')"
>> >> key="['ALT','Shift','1']"/>
>> >> <confmenucommand id="cmd_editBoardSettings"
>> >> onselect="canvas.doActionmenu('editBoardSettings')"
>> >> key="['ALT','Shift','2']"/>
>> >> - <confmenucommand id="cmd_quit"
>> onselect="canvas.doActionmenu('quit')"
>> >> key="['ALT','Shift','E']"/>
>> >> + <confmenucommand id="cmd_quit"
>> onselect="canvas.doActionmenu('quit')"
>> >> key="['ALT','Shift','E']"/>
>> >> + <confmenucommand id="cmd_showSipDialer"
>> >> onselect="canvas.doActionmenu('showSipDialer')"
>> key="['ALT','Shift','D']" />
>> >>
>> >> <confmenucommand id="cmd_applyforMod_nokey"
>> >> onselect="canvas.doActionmenu('applyForMod')" />
>> >> <confmenucommand id="cmd_createPoll_nokey"
>> >> onselect="canvas.doActionmenu('createPoll')" />
>> >> @@ -56,7 +57,8 @@
>> >> <confmenucommand id="cmd_importFile_nokey"
>> >> onselect="canvas.doActionmenu('importFile')" />
>> >> <confmenucommand id="cmd_editCamMicSettings_nokey"
>> >> onselect="canvas.doActionmenu('editCamMicSettings')"/>
>> >> <confmenucommand id="cmd_editBoardSettings_nokey"
>> >> onselect="canvas.doActionmenu('editBoardSettings')" />
>> >> - <confmenucommand id="cmd_quit_nokey"
>> >> onselect="canvas.doActionmenu('quit')" />
>> >> + <confmenucommand id="cmd_quit_nokey"
>> >> onselect="canvas.doActionmenu('quit')" />
>> >> + <confmenucommand id="cmd_showSipDialer_nokey"
>> >> onselect="canvas.doActionmenu('showSipDialer')" />
>> >>
>> >> <!--
>> >> <command id="cmd_browser_open"
>> >> onselect="canvas.doActionmenu('browser_open')"
>> key="['ALT','Shift','B']"/>
>> >> @@ -402,6 +404,8 @@
>> >> canvas.thishib.applyForModeration.doCall();
>> >> } else if (stringSub=='editCamMicSettings') {
>> >>
>> >> canvas._videocontainer._videoviewcontent.changeDevice();
>> >> + } else if (stringSub=='showSipDialer') {
>> >> + new
>> lz.sipDialer(canvas.main_content._content.inner);
>> >> } else if (stringSub=='editBoardSettings') {
>> >> new
>> >> lz.editWhiteboardDefault(canvas.main_content._content.inner);
>> >> } else if (stringSub=='quit') {
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -47,9 +47,9 @@
>> >> </method>
>> >> </class>
>> >>
>> >> - <!--- Menu for public/private conference and audience room.
>> This
>> >> class shows
>> >> - exit, moderator, file, setteings and poll menu. Those
>> menu
>> >> items are connected
>> >> - to each command that has been declared in
>> >> base/mainMethods.lzx. May 24 2008
>> >> + <!--- Menu for public/private conference and audience room.
>> This
>> >> class shows
>> >> + exit, moderator, file, setteings and poll menu. Those
>> menu
>> >> items are connected
>> >> + to each command that has been declared in
>> >> base/mainMethods.lzx. May 24 2008
>> >> commented by onokeiji@gmail.com -->
>> >> <class name="conferenceMenubar" extends="menubar" height="28"
>> >> style="itemStyle">
>> >> @@ -83,7 +83,7 @@
>> >> parent._exitbtn.destroy();
>> >> }
>> >> }
>> >> -
>> >> +
>> >> if(canvas.isrtl == 'true'){
>> >> if ($debug) Debug.write("onInit :
>> Setting
>> >> nokey");
>> >>
>> lblImport.setCommand(cmd_importFile_nokey);
>> >> @@ -92,11 +92,11 @@
>> >> </handler>
>> >> <_labelMenuItem id="lblImport" labelid="15"
>> >> command="cmd_importFile" enabled="${
>> >> canvas.ismoderator }" />
>> >> - <!-- <menuseparator/> <_labelMenuItem
>> >> labelid="561" command="cmd_exportFilePNG"
>> >> - /> <_labelMenuItem labelid="562"
>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>> >> - labelid="563"
>> command="cmd_exportFilePDF"
>> >> /> <_labelMenuItem labelid="560"
>> >> - command="cmd_exportFileSVG" />
>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>> >> - /> <menuseparator/> <_labelMenuItem
>> >> name="_exitItem" labelid="309" command="cmd_quit"
>> >> + <!-- <menuseparator/> <_labelMenuItem
>> >> labelid="561" command="cmd_exportFilePNG"
>> >> + /> <_labelMenuItem labelid="562"
>> >> command="cmd_exportFileJPG" /> <_labelMenuItem
>> >> + labelid="563"
>> command="cmd_exportFilePDF"
>> >> /> <_labelMenuItem labelid="560"
>> >> + command="cmd_exportFileSVG" />
>> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>> >> + /> <menuseparator/> <_labelMenuItem
>> >> name="_exitItem" labelid="309" command="cmd_quit"
>> >> value="quit" /> -->
>> >> </_labelMenu>
>> >>
>> >> @@ -104,7 +104,7 @@
>> >>
>> >> <handler name="oninit">
>> >> <![CDATA[
>> >> -
>> >> +
>> >> if(canvas.isrtl == 'true'){
>> >> if ($debug) Debug.write("onInit :
>> Setting
>> >> nokey");
>> >>
>> >> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
>> >> @@ -112,6 +112,7 @@
>> >>
>> lblPoll.setCommand(cmd_createPoll_nokey);
>> >>
>> >> lblPollResult.setCommand(cmd_pollResults_nokey);
>> >>
>> >> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
>> >> +
>> >> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
>> >> }
>> >> //hideActionsMenu
>> >> if(canvas.currentRoomObj.hideActionsMenu){
>> >> @@ -133,7 +134,7 @@
>> >> </handler>
>> >> </_labelMenuItem>
>> >> <menuseparator />
>> >> - <!-- <_labelMenuItem labelid="749"
>> >> command="cmd_coBrowser" enabled="${
>> >> + <!-- <_labelMenuItem labelid="749"
>> >> command="cmd_coBrowser" enabled="${
>> >> canvas.ismoderator }" />
>> <menuseparator/>
>> >> -->
>> >> <_labelMenuItem id="lblCamMic" labelid="306"
>> >> command="cmd_editCamMicSettings" />
>> >> @@ -177,14 +178,17 @@
>> >> <_labelMenuItem width="250" id="lblPollVote"
>> >> labelid="42"
>> >> command="cmd_checkPollVoted" />
>> >> <menuseparator />
>> >> + <_labelMenuItem width="250" id="lblShowSipDialer"
>> >> labelid="1447"
>> >> + command="cmd_showSipDialer" />
>> >> + <menuseparator />
>> >> <_labelMenuItem width="250" labelid="1126"
>> >> command="cmd_editWhiteboardDefault" />
>> >> </_labelMenu>
>> >> -
>> >> - <!-- exit room <_labelMenu labelid="308" width="250">
>> >> </_labelMenu> <_labelMenu
>> >> - labelid="301" width="250"> <_labelMenuItem
>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>> >> - /> </_labelMenu> <_labelMenu labelid="305"
>> >> width="250"> <_labelMenuItem labelid="306"
>> >> - command="cmd_editCamMicSettings" />
>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>> >> +
>> >> + <!-- exit room <_labelMenu labelid="308" width="250">
>> >> </_labelMenu> <_labelMenu
>> >> + labelid="301" width="250"> <_labelMenuItem
>> >> id="lblMod" labelid="302" command="cmd_applyforMod"
>> >> + /> </_labelMenu> <_labelMenu labelid="305"
>> >> width="250"> <_labelMenuItem labelid="306"
>> >> + command="cmd_editCamMicSettings" />
>> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>> >> /> </_labelMenu> <_labelMenu labelid="303"
>> >> width="250"> </_labelMenu> -->
>> >>
>> >> </class>
>> >> @@ -258,7 +262,7 @@
>> >> </handler>
>> >> </_labelMenuItem>
>> >> <menuseparator />
>> >> - <!-- <_labelMenuItem labelid="749"
>> >> command="cmd_coBrowser" enabled="${
>> >> + <!-- <_labelMenuItem labelid="749"
>> >> command="cmd_coBrowser" enabled="${
>> >> canvas.ismoderator }" />
>> >> <menuseparator/> -->
>> >> <_labelMenuItem labelid="306"
>> >> command="cmd_editCamMicSettings"
>> >> enabled="${ canvas.ismoderator
>> }" />
>> >> @@ -358,7 +362,7 @@
>> >> </handler>
>> >> </_labelMenuItem>
>> >> <menuseparator />
>> >> - <!-- <_labelMenuItem labelid="749"
>> >> command="cmd_coBrowser" enabled="${
>> >> + <!-- <_labelMenuItem labelid="749"
>> >> command="cmd_coBrowser" enabled="${
>> >> canvas.ismoderator }" />
>> >> <menuseparator/> -->
>> >> <_labelMenuItem labelid="306"
>> >> command="cmd_editCamMicSettings"
>> >> enabled="${ canvas.ismoderator
>> }" />
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -65,6 +65,7 @@
>> >> <include href="restricted/" />
>> >> <include href="browser/" />
>> >> <include href="testsetup/" />
>> >> + <include href="sip/" />
>> >>
>> >> <include href="flexibleConferenceRoom/" />
>> >>
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,6 @@
>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>> >> +<library>
>> >> +
>> >> + <include href="sipDialer.lzx" />
>> >> +
>> >> +</library>
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,81 @@
>> >> +<?xml version="1.0" encoding="UTF-8" ?>
>> >> +<library>
>> >> +
>> >> +<class name="sipDialer" extends="window" bgcolor="gray" width="200">
>> >> + <simplelayout axis="y" spacing="5"/>
>> >> + <labelText labelid="1003"/>
>> >> + <view name="phoneNumber" width="100%">
>> >> + <inputtext name="input"
>> >> width="$once{parent.width-parent.del.width}" height="20"
>> bgcolor="white"/>
>> >> + <button name="del" x="$once{parent.input.width}" width="30"
>> >> height="20" onclick="this.del();">
>> >> + â†
>> >> + <method name="del">
>> >> + var t = parent.input.text;
>> >> + if(t.length != 0) {
>> >> + t = t.substr(0, t.length - 1);
>> >> + parent.input.setAttribute('text', t);
>> >> + }
>> >> + </method>
>> >> + </button>
>> >> + </view>
>> >> +
>> >> + <view name="dialerButtons" align="center">
>> >> + <vbox spacing="5">
>> >> + <hbox spacing="5">
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('1')"
>> >> width="40">1</button>
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('2')"
>> >> width="40">2</button>
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('3')"
>> >> width="40">3</button>
>> >> + </hbox>
>> >> + <hbox spacing="5">
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('4')"
>> >> width="40">4</button>
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('5')"
>> >> width="40">5</button>
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('6')"
>> >> width="40">6</button>
>> >> + </hbox>
>> >> + <hbox spacing="5">
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('7')"
>> >> width="40">7</button>
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('8')"
>> >> width="40">8</button>
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('9')"
>> >> width="40">9</button>
>> >> + </hbox>
>> >> + <hbox spacing="5">
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('*')"
>> >> width="40">*</button>
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('0')"
>> >> width="40">0</button>
>> >> + <button
>> onclick="parent.parent.parent.parent.dial('#')"
>> >> width="40">#</button>
>> >> + </hbox>
>> >> + </vbox>
>> >> + </view>
>> >> + <hbox spacing="10" align="center">
>> >> + <simpleLabelButton labelid="1448" name="callButton">
>> >> + <handler name="onclick">
>> >> + parent.parent.joinToConfCall.doCall();
>> >> + </handler>
>> >> + </simpleLabelButton>
>> >> + <simpleLabelButton labelid="85" name="closeButton">
>> >> + <handler name="onclick">
>> >> + canvas.sipDialer = null;
>> >> + parent.parent.destroy();
>> >> + </handler>
>> >> + </simpleLabelButton>
>> >> + </hbox>
>> >> + <handler name="oninit">
>> >> + if(canvas.sipDialer != null) {
>> >> + canvas.sipDialer.destroy();
>> >> + }
>> >> + canvas.setAttribute('sipDialer', this);
>> >> + this.bringToFront();
>> >> + </handler>
>> >> +
>> >> + <method name="dial" args="digit">
>> >> + this.phoneNumber.input.setAttribute('text',
>> >> this.phoneNumber.input.text + digit);
>> >> + </method>
>> >> +
>> >> + <netRemoteCallHib name="joinToConfCall" funcname="joinToConfCall"
>> >> remotecontext="$once{ canvas.thishib }">
>> >> + <netparam><method name="getValue">return
>> >> parent.parent.phoneNumber.input.text</method></netparam>
>> >> + <handler name="ondata" args="value">
>> >> + <![CDATA[
>> >> + //The onResult-Handler will be called be the
>> rtmpconnection
>> >> + if($debug) Debug.write("joinToConfCall : ",value);
>> >> + ]]>
>> >> + </handler>
>> >> + </netRemoteCallHib>
>> >> +</class>
>> >> +
>> >> +</library>
>> >> \ No newline at end of file
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -67,6 +67,9 @@
>> >>
>> >> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
>> >>
>> >> <class>org.openmeetings.app.persistence.beans.user.Users</class>
>> >>
>> >>
>> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
>> >> +
>> >>
>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
>> >> +
>> >>
>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
>> >> +
>> >>
>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
>> >>
>> <exclude-unlisted-classes>false</exclude-unlisted-classes>
>> >> <properties>
>> >> <property
>> >> name="openjpa.ConnectionProperties"
>> >> @@ -83,7 +86,8 @@
>> >> <property name="openjpa.Log"
>> >> value="DefaultLevel=WARN, Tool=INFO" />
>> >> <property
>> >> name="openjpa.ConnectionDriverName"
>> >> value="org.apache.commons.dbcp.BasicDataSource"/>
>> >> <property name="openjpa.DataCache"
>> >> value="true"/>
>> >> - <property name="openjpa.QueryCache"
>> >> value="true"/>
>> >> + <!-- QueryCache disabled due to changes outside of JPA
>> >> doesn't take effect with caching -->
>> >> + <property name="openjpa.QueryCache"
>> >> value="false"/>
>> >> <property
>> name="openjpa.jdbc.DBDictionary"
>> >> value="batchLimit=100,tableType=myisam"/>
>> >> <property
>> name="openjpa.jdbc.QuerySQLCache"
>> >> value="false"/>
>> >> </properties>
>> >>
>> >> Modified:
>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> --- incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>> >> (original)
>> >> +++ incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>> Mon
>> >> Mar 26 09:14:15 2012
>> >> @@ -331,7 +331,36 @@ function checkEmail()
>> >>
>> >> </i></p>
>> >>
>> >> - </fieldset>
>> >> + </fieldset>
>> >> +
>> >> + <fieldset id="red5sip">
>> >> + <legend>red5SIP Configuration</legend>
>> >> +
>> >> + <li>
>> >> + <label for="red5sip_enable">Enable SIP</label>
>> >> + <select name="red5sip_enable" id="red5sip_enable" size="1">
>> >> + <option value="yes">Yes</option>
>> >> + <option value="no" selected>No</option>
>> >> + </select><br />
>> >> + </li>
>> >> + <p><i>
>> >> + Enable red5SIP integration
>> >> + </i></p>
>> >> + <br />
>> >> +
>> >> + <li>
>> >> + <label for="red5sip_room_prefix">SIP rooms prefix</label>
>> >> + <input name="red5sip_room_prefix" id="red5sip_room_prefix"
>> >> size="27" title="" type="text" value="400" />
>> >> + <p><i>Prefix for phone number of conference rooms</i></p>
>> >> + </li>
>> >> +
>> >> + <li>
>> >> + <label for="red5sip_exten_context">SIP extensions
>> context</label>
>> >> + <input name="red5sip_exten_context" id="red5sip_exten_context"
>> >> size="27" title="" type="text" value="rooms" />
>> >> + <p><i>Context of Asterisk extensions</i></p>
>> >> + </li>
>> >> +
>> >> + </fieldset>
>> >>
>> >> <fieldset id="sip">
>> >>
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
>> >>
>> >> import org.openmeetings.app.conference.session.RoomClient;
>> >> import org.openmeetings.app.data.basic.AuthLevelmanagement;
>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>> >> import org.openmeetings.app.data.beans.basic.SearchResult;
>> >> import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
>> >> import org.openmeetings.app.data.user.Organisationmanagement;
>> >> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
>> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>> >> import
>> org.openmeetings.app.persistence.beans.domain.Organisation_Users;
>> >> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
>> >> import org.openmeetings.app.persistence.beans.rooms.Rooms;
>> >> import
>> org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
>> >> import org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>> >> import org.openmeetings.app.persistence.beans.user.Users;
>> >> import org.openmeetings.app.remote.red5.ClientListManager;
>> >> +import org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
>> >> +import
>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>> >> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>> >> +import
>> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>> >> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
>> >> import org.red5.logging.Red5LoggerFactory;
>> >> import org.slf4j.Logger;
>> >> @@ -71,6 +78,8 @@ public class Roommanagement {
>> >> @Autowired
>> >> private OpenXGHttpClient openXGHttpClient;
>> >> @Autowired
>> >> + private AsteriskDbSipClient asteriskDbSipClient;
>> >> + @Autowired
>> >> private RoomModeratorsDaoImpl roomModeratorsDao;
>> >> @Autowired
>> >> private UsersDaoImpl usersDao;
>> >> @@ -78,6 +87,8 @@ public class Roommanagement {
>> >> private AuthLevelmanagement authLevelManagement;
>> >> @Autowired
>> >> private ClientListManager clientListManager;
>> >> + @Autowired
>> >> + private Configurationmanagement cfgManagement;
>> >>
>> >> /**
>> >> * add a new Record to the table roomtypes
>> >> @@ -102,6 +113,20 @@ public class Roommanagement {
>> >>
>> >> public Long addRoom(Rooms room) {
>> >> try {
>> >> + /* Red5SIP integration
>> >>
>> *******************************************************************************/
>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>> >> "red5sip.enable");
>> >> + if(conf != null && conf.getConf_value().equals("yes")) {
>> >> + if(room.getSipNumber() != null &&
>> >> !room.getSipNumber().isEmpty()) {
>> >> + asteriskDbSipClient.createSIPConference(new
>> >> SIPCreateConferenceRequest(room.getSipNumber()));
>> >> + } else {
>> >> + SipCreateConferenceRequestResult requestResult =
>> >> asteriskDbSipClient.createSIPConference(new
>> SIPCreateConferenceRequest());
>> >> + if(!requestResult.hasError()) {
>> >> +
>> >> room.setSipNumber(requestResult.getConferenceNumber());
>> >> +
>> >> room.setConferencePin(requestResult.getConferencePin());
>> >> + }
>> >> + }
>> >> + }
>> >> +
>> >>
>> /*****************************************************************************************************/
>> >> room.setStarttime(new Date());
>> >> room = em.merge(room);
>> >> long returnId = room.getRooms_id();
>> >> @@ -719,6 +744,25 @@ public class Roommanagement {
>> >> return null;
>> >> }
>> >>
>> >> + /**
>> >> + * Returns number of SIP conference participants
>> >> + * @param rooms_id id of room
>> >> + * @return number of participants
>> >> + */
>> >> + public Integer getSipConferenceMembersNumber(Long rooms_id) {
>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>> >> "red5sip.enable");
>> >> + if(conf != null && conf.getConf_value().equals("yes")) {
>> >> + Rooms rooms = this.getRoomById(rooms_id);
>> >> + if(rooms != null) {
>> >> + return
>> >> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
>> >> + } else {
>> >> + return 0;
>> >> + }
>> >> + } else {
>> >> + return null;
>> >> + }
>> >> + }
>> >> +
>> >> /**
>> >> * adds a new Record to the table rooms
>> >> * @param name
>> >> @@ -793,6 +837,19 @@ public class Roommanagement {
>> >>
>> >> r.setConferencePin(openXGReturnObject.getConferencePin());
>> >> }
>> >>
>> >> + /* Red5SIP integration
>> >>
>> *******************************************************************************/
>> >> + Configuration conf = cfgManagement.getConfKey(3L,
>> >> "red5sip.enable");
>> >> + if(conf != null &&
>> conf.getConf_value().equals("yes")) {
>> >> + SipCreateConferenceRequestResult requestResult =
>> >> asteriskDbSipClient
>> >> + .createSIPConference(new
>> >> SIPCreateConferenceRequest());
>> >> +
>> >> + if(!requestResult.hasError()) {
>> >> +
>> >> r.setSipNumber(requestResult.getConferenceNumber());
>> >> +
>> >> r.setConferencePin(requestResult.getConferencePin());
>> >> + }
>> >> + }
>> >> +
>> >>
>> /*****************************************************************************************************/
>> >> +
>> >> r = em.merge(r);
>> >> long returnId = r.getRooms_id();
>> >>
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -252,7 +252,8 @@ public class ImportInitvalues {
>> >> String openxg_client_domain, String
>> >> openxg_community_code,
>> >> String openxg_language_code, String
>> openxg_adminid,
>> >> String sip_language_phonecode, String
>> >> sip_phonerange_start,
>> >> - String sip_phonerange, String jodPath) {
>> >> + String sip_phonerange, String jodPath,
>> >> + String red5sip_enable, String red5sip_room_prefix,String
>> >> red5sip_exten_context) {
>> >>
>> >> cfgManagement
>> >> .addConfByKey(
>> >> @@ -349,6 +350,18 @@ public class ImportInitvalues {
>> >> cfgManagement.addConfByKey(3, "default.rpc.userid", ""
>> + 1,
>> >> null,
>> >> "The User-Id of the Control User in
>> >> OpenMeetings");
>> >>
>> >> + // ***************************************
>> >> + // ***************************************
>> >> + // red5SIP Integration Coniguration Values
>> >> + // ***************************************
>> >> +
>> >> + cfgManagement.addConfByKey(3, "red5sip.enable",
>> red5sip_enable,
>> >> null,
>> >> + "Enable to enable the red5SIP
>> integration
>> >> ");
>> >> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
>> >> red5sip_room_prefix, null,
>> >> + "Enable to enable the red5SIP
>> integration
>> >> ");
>> >> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
>> >> red5sip_exten_context, null,
>> >> + "Enable to enable the red5SIP
>> integration
>> >> ");
>> >> +
>> >> // ***************************************
>> >> // ***************************************
>> >> // SIP Applet Configuration Values
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -19,6 +19,7 @@
>> >> package org.openmeetings.app.remote.red5;
>> >>
>> >> import java.io.File;
>> >> +import java.io.IOException;
>> >> import java.util.ArrayList;
>> >> import java.util.Collection;
>> >> import java.util.Date;
>> >> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
>> >> return null;
>> >> }
>> >>
>> >> + public synchronized List<Integer> listRoomBroadcast() {
>> >> + List<Integer> broadcastList = new ArrayList<Integer>();
>> >> + IConnection current = Red5.getConnectionLocal();
>> >> + String streamid = current.getClient().getId();
>> >> + Collection<Set<IConnection>> conCollection =
>> >> current.getScope().getConnections();
>> >> + for (Set<IConnection> conset : conCollection) {
>> >> + for (IConnection conn : conset) {
>> >> + if (conn != null) {
>> >> + RoomClient rcl = this.clientListManager
>> >> + .getClientByStreamId(conn
>> >> + .getClient().getId());
>> >> + if (rcl == null) {
>> >> + // continue;
>> >> + } else if (rcl.getIsScreenClient() != null
>> >> + && rcl.getIsScreenClient()) {
>> >> + // continue;
>> >> + } else {
>> >> + if (!streamid.equals(rcl.getStreamid())) {
>> >> + // It is not needed to send back
>> >> + // that event to the actuall
>> >> + // Moderator
>> >> + // as it will be already triggered
>> >> + // in the result of this Function
>> >> + // in the Client
>> >> +
>> >> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
>> >> + }
>> >> + }
>> >> + }
>> >> + }
>> >> + }
>> >> + return broadcastList;
>> >> + }
>> >> +
>> >> +
>> >> /**
>> >> * this function is invoked directly after initial connecting
>> >> *
>> >> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
>> >> }
>> >> return null;
>> >> }
>> >> +
>> >> + /*
>> >> + * SIP transport methods
>> >> + */
>> >> +
>> >> + public synchronized void updateSipTransport() {
>> >> + IConnection current = Red5.getConnectionLocal();
>> >> + String streamid = current.getClient().getId();
>> >> + RoomClient currentClient =
>> >> this.clientListManager.getClientByStreamId(streamid);
>> >> + log.debug("getSipConferenceMembersNumber: " +
>> >>
>> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
>> >> + String newNumber =
>> >>
>> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
>> >> + if(!newNumber.equals(currentClient.getLastname())) {
>> >> + currentClient.setLastname(newNumber);
>> >> + this.clientListManager.updateClientByStreamId(streamid,
>> >> currentClient);
>> >> + log.debug("updateSipTransport: {}, {}, {}, {}", new
>> >> Object[]{currentClient.getPublicSID(),
>> >> + currentClient.getRoom_id(),
>> >> currentClient.getFirstname(), currentClient.getLastname()});
>> >> + sendMessageWithClient(new
>> >>
>> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
>> >> + }
>> >> + }
>> >> +
>> >> + /**
>> >> + * Perform call to specified phone number and join to conference
>> >> + * @param number to call
>> >> + */
>> >> + public synchronized void joinToConfCall(String number) {
>> >> + IConnection current = Red5.getConnectionLocal();
>> >> + String streamid = current.getClient().getId();
>> >> + RoomClient currentClient =
>> >> this.clientListManager.getClientByStreamId(streamid);
>> >> + Rooms rooms =
>> >> roommanagement.getRoomById(currentClient.getRoom_id());
>> >> + log.debug("asterisk -rx \"originate Local/" + number + "@rooms
>> >> extension " + rooms.getSipNumber() + "@rooms\"");
>> >> + try {
>> >> + Process proc = Runtime.getRuntime().exec(new
>> >> String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms
>> extension
>> >> " + rooms.getSipNumber() + "@rooms"});
>> >> + } catch (IOException e) {
>> >> + log.error("Executing asterisk originate error: ", e);
>> >> + }
>> >> + }
>> >> +
>> >> + public synchronized String getSipNumber(Long room_id) {
>> >> + Rooms rooms = roommanagement.getRoomById(room_id);
>> >> + if(rooms != null) {
>> >> + log.debug("getSipNumber: room_id: {}, sipNumber: {}", new
>> >> Object[]{room_id, rooms.getSipNumber()});
>> >> + return rooms.getSipNumber();
>> >> + }
>> >> + return null;
>> >> + }
>> >> +
>> >> + public synchronized void setSipTransport(Long room_id, String
>> >> publicSID, String broadCastId) {
>> >> + IConnection current = Red5.getConnectionLocal();
>> >> + String streamid = current.getClient().getId();
>> >> + Rooms room = roommanagement.getRoomById(room_id);
>> >> + // Notify all clients of the same scope (room)
>> >> + RoomClient currentClient =
>> >> this.clientListManager.getClientByStreamId(streamid);
>> >> + currentClient.setRoom_id(room_id);
>> >> + currentClient.setRoomEnter(new Date());
>> >> + currentClient.setFirstname("SIP Transport");
>> >> +
>> >>
>> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
>> >> + currentClient.setBroadCastID(Long.parseLong(broadCastId));
>> >> + currentClient.setIsBroadcasting(true);
>> >> + currentClient.setPublicSID(publicSID);
>> >> + currentClient.setAvsettings("av");
>> >> + currentClient.setVWidth(120);
>> >> + currentClient.setVHeight(90);
>> >> + this.clientListManager.updateClientByStreamId(streamid,
>> >> currentClient);
>> >> +
>> >> + Collection<Set<IConnection>> conCollection = current
>> >> + .getScope().getConnections();
>> >> + for (Set<IConnection> conset : conCollection) {
>> >> + for (IConnection conn : conset) {
>> >> + if (conn != null) {
>> >> + RoomClient rcl =
>> >> this.clientListManager.getClientByStreamId(conn.getClient().getId());
>> >> + if (rcl == null) {
>> >> + // continue;
>> >> + } else if (rcl.getIsScreenClient() != null
>> >> + && rcl.getIsScreenClient()) {
>> >> + // continue;
>> >> + } else {
>> >> + if (!streamid.equals(rcl.getStreamid())) {
>> >> + // It is not needed to send back
>> >> + // that event to the actuall
>> >> + // Moderator
>> >> + // as it will be already triggered
>> >> + // in the result of this Function
>> >> + // in the Client
>> >> + if (conn instanceof
>> >> IServiceCapableConnection) {
>> >> + ((IServiceCapableConnection)
>> >> conn).invoke("addNewUser", new Object[]{currentClient}, this);
>> >> + ((IServiceCapableConnection)
>> >> conn).invoke("newStream", new Object[]{currentClient}, this);
>> >> + log.debug("sending setSipTransport to
>> "
>> >> + + conn);
>> >> + }
>> >> + }
>> >> + }
>> >> + }
>> >> + }
>> >> + }
>> >> + }
>> >> }
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,19 @@
>> >> +package org.openmeetings.app.sip.api;
>> >> +
>> >> +import
>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>> >> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>> >> +import
>> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>> >> +
>> >> +/**
>> >> + * SIP client interface
>> >> + */
>> >> +public interface ISIPClient {
>> >> +
>> >> + SIPCreateUserRequestResult createSIPUser(SIPCreateUserRequest
>> >> request);
>> >> +
>> >> + SipCreateConferenceRequestResult
>> >> createSIPConference(SIPCreateConferenceRequest request);
>> >> +
>> >> + Integer getConferenceMembersNumber(String sipNumber);
>> >> +
>> >> +}
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,58 @@
>> >> +package org.openmeetings.app.sip.api.impl.asterisk;
>> >> +
>> >> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>> >> +import org.openmeetings.app.sip.api.ISIPClient;
>> >> +import org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
>> >> +import
>> org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>> >> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>> >> +import
>> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>> >> +import org.springframework.beans.factory.annotation.Autowired;
>> >> +/**
>> >> + *
>> >> + */
>> >> +public class AsteriskDbSipClient implements ISIPClient {
>> >> +
>> >> + @Autowired
>> >> + private AsteriskDAOImpl asteriskDAO;
>> >> +
>> >> + public SIPCreateUserRequestResult createSIPUser(final
>> >> SIPCreateUserRequest request) {
>> >> + asteriskDAO.addSipUser(request.getLogin(),
>> request.getPassword());
>> >> + return new SIPCreateUserRequestResult() {
>> >> + @Override
>> >> + public UserSipData getUserSipData() {
>> >> + UserSipData sipData = new UserSipData();
>> >> + sipData.setAuthId(request.getLogin());
>> >> + sipData.setUserpass(request.getPassword());
>> >> + sipData.setUsername(request.getLogin());
>> >> + return sipData;
>> >> + }
>> >> +
>> >> + public boolean hasError() {
>> >> + return false;
>> >> + }
>> >> +
>> >> + public String getErrorMessage() {
>> >> + return null;
>> >> + }
>> >> + };
>> >> + }
>> >> +
>> >> + public SipCreateConferenceRequestResult
>> >> createSIPConference(SIPCreateConferenceRequest request) {
>> >> + String confno = asteriskDAO.addMeetMeConference();
>> >> + return new SipCreateConferenceRequestResult(confno, "") {
>> >> + public boolean hasError() {
>> >> + return false;
>> >> + }
>> >> +
>> >> + public String getErrorMessage() {
>> >> + return null;
>> >> + }
>> >> + };
>> >> + }
>> >> +
>> >> + public Integer getConferenceMembersNumber(String sipNumber) {
>> >> + return asteriskDAO.getConferensMembersNumber(sipNumber);
>> >> + }
>> >> +}
>> >> \ No newline at end of file
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,76 @@
>> >> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
>> >> +
>> >> +import org.openmeetings.app.OpenmeetingsVariables;
>> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
>> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>> >> +import
>> >> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
>> >> +import org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
>> >> +import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
>> >> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
>> >> +import org.red5.logging.Red5LoggerFactory;
>> >> +import org.slf4j.Logger;
>> >> +import org.springframework.transaction.annotation.Transactional;
>> >> +import org.springframework.beans.factory.annotation.Autowired;
>> >> +
>> >> +import javax.persistence.EntityManager;
>> >> +import javax.persistence.PersistenceContext;
>> >> +
>> >> +@Transactional
>> >> +public class AsteriskDAOImpl {
>> >> +
>> >> + private static final Logger log =
>> >> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
>> >> OpenmeetingsVariables.webAppRootKey);
>> >> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
>> >> + @PersistenceContext
>> >> + private EntityManager em;
>> >> + @Autowired
>> >> + private Configurationmanagement cfgManagement;
>> >> +
>> >> + public void addSipUser(String username, String secret) {
>> >> + AsteriskSipUsers u = new AsteriskSipUsers();
>> >> + Configuration conf =
>> >> cfgManagement.getConfKey(3L,"red5sip.exten_context");
>> >> + String defaultRoomContext = "rooms";
>> >> + if(conf != null && !conf.getConf_value().isEmpty()) {
>> >> + defaultRoomContext = conf.getConf_value();
>> >> + }
>> >> + u.setName(username);
>> >> + u.setSecret(secret);
>> >> + u.setContext(defaultRoomContext);
>> >> + u.setHost("dynamic");
>> >> + Extensions e = new Extensions();
>> >> + e.setApp("Dial");
>> >> + e.setAppdata("SIP/" + username);
>> >> + e.setExten(username);
>> >> + e.setContext(defaultRoomContext);
>> >> + e.setPriority(1);
>> >> + em.persist(u);
>> >> + em.persist(e);
>> >> + }
>> >> +
>> >> + public String addMeetMeConference() {
>> >> + int count = ((Number)em.createQuery("SELECT COUNT(m.confno)
>> FROM
>> >> MeetMe AS m").getSingleResult()).intValue();
>> >> +
>> >> + Configuration conf =
>> >> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
>> >> + String prefix = DEFAULT_SIP_CONTEXT;
>> >> + if(conf != null) {
>> >> + prefix = conf.getConf_value();
>> >> + }
>> >> + String confno = prefix+(count+1);
>> >> + MeetMe mm = new MeetMe();
>> >> + mm.setConfno(confno);
>> >> + Extensions e = new Extensions();
>> >> + e.setApp("MeetMe");
>> >> + e.setAppdata(confno + ",dM");
>> >> + e.setExten(confno);
>> >> + e.setContext("rooms");
>> >> + e.setPriority(1);
>> >> + em.persist(mm);
>> >> + em.persist(e);
>> >> + return confno;
>> >> + }
>> >> +
>> >> + public Integer getConferensMembersNumber(String confNo) {
>> >> + return ((Number)em.createQuery("SELECT m.members FROM MeetMe
>> AS m
>> >> WHERE m.confno=:confno")
>> >> + .setParameter("confno", confNo)
>> >> + .getSingleResult()).intValue();
>> >> + }
>> >> +}
>> >> \ No newline at end of file
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,8 @@
>> >> +package org.openmeetings.app.sip.api.request;
>> >> +
>> >> +/**
>> >> + * Base interface for SIP API requests
>> >> + */
>> >> +public interface ISIPRequest {
>> >> +
>> >> +}
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,17 @@
>> >> +package org.openmeetings.app.sip.api.request;
>> >> +
>> >> +/**
>> >> + * Create SIP conferece request
>> >> + */
>> >> +public class SIPCreateConferenceRequest implements ISIPRequest {
>> >> + private String sipNumber;
>> >> +
>> >> + public SIPCreateConferenceRequest() {
>> >> + super(); //To change body of overridden methods use File |
>> >> Settings | File Templates.
>> >> + }
>> >> +
>> >> + public SIPCreateConferenceRequest(String sipNumber) {
>> >> + super();
>> >> + this.sipNumber = sipNumber;
>> >> + }
>> >> +}
>> >> \ No newline at end of file
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,72 @@
>> >> +package org.openmeetings.app.sip.api.request;
>> >> +
>> >> +/**
>> >> + * Create User Request
>> >> + */
>> >> +public class SIPCreateUserRequest implements ISIPRequest {
>> >> +
>> >> + protected String firstName;
>> >> + protected String middleName;
>> >> + protected String lastName;
>> >> + protected String email;
>> >> + protected String login;
>> >> + protected String password;
>> >> +
>> >> +
>> >> + public SIPCreateUserRequest(String firstName, String middleName,
>> >> String lastName, String email, String login, String password) {
>> >> + this.firstName = firstName;
>> >> + this.middleName = middleName;
>> >> + this.lastName = lastName;
>> >> + this.email = email;
>> >> + this.login = login;
>> >> + this.password = password;
>> >> + }
>> >> +
>> >> + public void withFirstName(String firstName) {
>> >> + this.firstName = firstName;
>> >> + }
>> >> +
>> >> + public void withMiddleName(String middleName) {
>> >> + this.middleName = middleName;
>> >> + }
>> >> +
>> >> + public void withLastName(String lastName) {
>> >> + this.lastName = lastName;
>> >> + }
>> >> +
>> >> + public void withEmail(String email) {
>> >> + this.email = email;
>> >> + }
>> >> +
>> >> + public void withLogin(String login) {
>> >> + this.login = login;
>> >> + }
>> >> +
>> >> + public void withPassword(String password) {
>> >> + this.password = password;
>> >> + }
>> >> +
>> >> + public String getFirstName() {
>> >> + return firstName;
>> >> + }
>> >> +
>> >> + public String getMiddleName() {
>> >> + return middleName;
>> >> + }
>> >> +
>> >> + public String getLastName() {
>> >> + return lastName;
>> >> + }
>> >> +
>> >> + public String getEmail() {
>> >> + return email;
>> >> + }
>> >> +
>> >> + public String getLogin() {
>> >> + return login;
>> >> + }
>> >> +
>> >> + public String getPassword() {
>> >> + return password;
>> >> + }
>> >> +}
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,12 @@
>> >> +package org.openmeetings.app.sip.api.result;
>> >> +
>> >> +/**
>> >> + * * Base interface for SIP API request's resuslt
>> >> + */
>> >> +public interface ISIPRequestResult {
>> >> +
>> >> + boolean hasError();
>> >> +
>> >> + String getErrorMessage();
>> >> +
>> >> +}
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,12 @@
>> >> +package org.openmeetings.app.sip.api.result;
>> >> +
>> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>> >> +
>> >> +/**
>> >> + * TODO
>> >> + */
>> >> +public abstract class SIPCreateUserRequestResult implements
>> >> ISIPRequestResult {
>> >> +
>> >> + abstract public UserSipData getUserSipData();
>> >> +
>> >> +}
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Added:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> >> (added)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -0,0 +1,26 @@
>> >> +package org.openmeetings.app.sip.api.result;
>> >> +
>> >> +/**
>> >> + * TODO
>> >> + */
>> >> +public abstract class SipCreateConferenceRequestResult implements
>> >> ISIPRequestResult {
>> >> +
>> >> + protected String conferenceNumber;
>> >> + protected String conferencePin;
>> >> +
>> >> + protected SipCreateConferenceRequestResult() {
>> >> + }
>> >> +
>> >> + protected SipCreateConferenceRequestResult(String
>> conferenceNumber,
>> >> String conferencePin) {
>> >> + this.conferenceNumber = conferenceNumber;
>> >> + this.conferencePin = conferencePin;
>> >> + }
>> >> +
>> >> + public String getConferenceNumber() {
>> >> + return conferenceNumber;
>> >> + }
>> >> +
>> >> + public String getConferencePin() {
>> >> + return conferencePin;
>> >> + }
>> >> +}
>> >>
>> >> Propchange:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> >>
>> >>
>> ------------------------------------------------------------------------------
>> >> svn:eol-style = native
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
>> >> String screen_viewer =
>> >> httpServletRequest
>> >>
>> >> .getParameter("screen_viewer");
>> >>
>> >> + // red5sip integration config
>> >> + String red5sip_enable = httpServletRequest
>> >> +
>> >> .getParameter("red5sip_enable");
>> >> + String red5sip_room_prefix = httpServletRequest
>> >> +
>> >> .getParameter("red5sip_room_prefix");
>> >> + String red5sip_exten_context = httpServletRequest
>> >> +
>> >> .getParameter("red5sip_exten_context");
>> >> +
>> >> // SIP Applet Configuration
>> >> String sip_enable =
>> >> httpServletRequest
>> >>
>> >> .getParameter("sip_enable");
>> >> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
>> >>
>> >> openxg_community_code, openxg_language_code,
>> >> openxg_adminid,
>> >> sip_language_phonecode,
>> >>
>> >> sip_phonerange_start, sip_phonerange,
>> >> - jodPath);
>> >> + jodPath,
>> >> + red5sip_enable, red5sip_room_prefix,
>> >> red5sip_exten_context);
>> >>
>> >>
>> >> getImportInitvalues().loadInitUserAndOrganisation(username,
>> >> userpass,
>> >> useremail, orgname, timeZone, configdefaultLang);
>> >>
>> >> Modified:
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>> >>
>> >>
>> ==============================================================================
>> >> ---
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>> >> (original)
>> >> +++
>> >>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>> >> Mon Mar 26 09:14:15 2012
>> >> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
>> >> private static final String sip_phonerange_start = "";
>> >> private static final String sip_phonerange = "";
>> >> private static final String jodPath = "./jod/lib";
>> >> + private static final String red5sip_enable = "no";
>> >> + private static final String red5sip_room_prefix = "400";
>> >> + private static final String red5sip_exten_context = "rooms";
>> >> protected static final String username = "junit";
>> >> protected static final String userpass = "test";
>> >> private static final String orgname = "smoketest";
>> >> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
>> >> openxg_client_id, openxg_client_secret,
>> >> openxg_client_domain,
>> >> openxg_community_code,
>> >> openxg_language_code, openxg_adminid,
>> >> sip_language_phonecode,
>> >> sip_phonerange_start, sip_phonerange,
>> >> - jodPath);
>> >> + jodPath, red5sip_enable,
>> >> red5sip_room_prefix, red5sip_exten_context);
>> >>
>> >> importInitvalues.loadInitUserAndOrganisation(username,
>> >> userpass,
>> >> useremail, orgname, timeZone,
>> >> configdefaultLang);
>> >>
>> >>
>> >>
>> >
>> >
>> > --
>> > Sebastian Wagner
>> > http://www.openmeetings.de
>> > http://incubator.apache.org/openmeetings/
>> > http://www.webbase-design.de
>> > http://www.wagner-sebastian.com
>> > seba.wagner@gmail.com
>>
>
>
>
> --
> Timur Tleukenov
>
--
Sebastian Wagner
http://www.openmeetings.de
http://incubator.apache.org/openmeetings/
http://www.webbase-design.de
http://www.wagner-sebastian.com
seba.wagner@gmail.com
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Posted by Тимур Тлеукенов <ti...@gmail.com>.
Hi Sebastian,
I added the missing files and license headers.
2012/3/27 Alexei Fedotov <al...@gmail.com>
> Ok, I'm here. :-)
>
>
>
>
> On Mon, Mar 26, 2012 at 6:03 PM, seba.wagner@gmail.com
> <se...@gmail.com> wrote:
> > Hi Timur,
> >
> > nice changeset :)
> >
> > But it seems like you've missed to checking some of your code:
> >
> https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
> >
> > The beans: AsteriskSipUsers, Extens, MeetMe are missing
> >
> > And you should enable the BackupExport/BackupImport to include and
> > re-import the data from the new tables.
> >
> > We might also add some panels in the Admin UI to have the possibility to
> > save/edit/delete the settings from the OpenMeetings Admin UI in the
> future.
> >
> > Thanks!
> > Sebastian
> >
> > 2012/3/26 <ti...@apache.org>
> >
> >> Author: timur
> >> Date: Mon Mar 26 09:14:15 2012
> >> New Revision: 1305274
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
> >> Log:
> >> red5sip integration:
> >> - new Asterisk DAO added;
> >> - new red5sip configurations added to install step1 template;
> >> - new methods added to ScopeApplicationAdapter.java
> >> - openjpa.QueryCache temporally disabled to make database changes from
> >> Asterisk visible in OM.
> >>
> >> Added:
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> >> (with props)
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> >> (with props)
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> >> (with props)
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> >> (with props)
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> >> (with props)
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> >> (with props)
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> >> (with props)
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> >> (with props)
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> >> (with props)
> >> Modified:
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> >> simplified.xml
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> >> traditional.xml
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
> >> (studIP).xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
> >> brazil.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> >> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
> >>
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -204,7 +204,9 @@
> >> <!-- No Interface -->
> >> <bean id="manageCryptStyle"
> >> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
> >> <bean id="openXGHttpClient"
> >> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
> >> - <bean id="generateImage"
> >> class="org.openmeetings.app.documents.GenerateImage" />
> >> + <bean id="asteriskDbSipClient"
> >> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient"
> />
> >> + <bean id="asteriskDAO"
> >> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl"
> />
> >> + <bean id="generateImage"
> >> class="org.openmeetings.app.documents.GenerateImage" />
> >> <bean id="generateThumbs"
> >> class="org.openmeetings.app.documents.GenerateThumbs" />
> >> <bean id="generatePDF"
> >> class="org.openmeetings.app.documents.GeneratePDF" />
> >> <bean id="mailHandler"
> >> class="org.openmeetings.utils.mail.MailHandler" />
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> >> simplified.xml (original)
> >> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> >> simplified.xml Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> >> traditional.xml (original)
> >> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
> >> traditional.xml Mon Mar 26 09:14:15 2012
> >> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</value>
> >> + </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
> >> (original)
> >> +++
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
> >> (studIP).xml (original)
> >> +++
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
> >> (studIP).xml Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
> >> (original)
> >> +++
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
> >> (original)
> >> +++
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
> >> brazil.xml (original)
> >> +++
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
> >> brazil.xml Mon Mar 26 09:14:15 2012
> >> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Ромеронабиратель SIP</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
> >> (original)
> >> +++
> >> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
> Mon
> >> Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
> >> <string id="1446" name="calendar edit button">
> >> <value>Edit details</value>
> >> </string>
> >> + <string id="1447" name="sip show dialer">
> >> + <value>Show sip dialer</value>
> >> + </string>
> >> + <string id="1448" name="sip call">
> >> + <value>Call</value>
> >> + </string>
> >> </language>
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -225,8 +225,9 @@ of the red5-servlet
> >> -->
> >> <!-- Quality-Modus *normal* -->
> >> <microphoneRateNormal>22</microphoneRateNormal>
> >> -<!-- Microphone Settings Quality-Modus *best* -->
> >> -<microphoneRateBest>44</microphoneRateBest>
> >> +<!-- Microphone Settings Quality-Modus *best* -->
> >> +<!-- TODO: red5sip support only 8 -->
> >> +<microphoneRateBest>44</microphoneRateBest>
> >>
> >> <!--
> >> The Size of the Whiteboard
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
> >> Mon Mar 26 09:14:15 2012
> >> @@ -47,7 +47,8 @@
> >> <confmenucommand id="cmd_importFile"
> >> onselect="canvas.doActionmenu('importFile')" key="['ALT','Shift','I']"/>
> >> <confmenucommand id="cmd_editCamMicSettings"
> >> onselect="canvas.doActionmenu('editCamMicSettings')"
> >> key="['ALT','Shift','1']"/>
> >> <confmenucommand id="cmd_editBoardSettings"
> >> onselect="canvas.doActionmenu('editBoardSettings')"
> >> key="['ALT','Shift','2']"/>
> >> - <confmenucommand id="cmd_quit"
> onselect="canvas.doActionmenu('quit')"
> >> key="['ALT','Shift','E']"/>
> >> + <confmenucommand id="cmd_quit"
> onselect="canvas.doActionmenu('quit')"
> >> key="['ALT','Shift','E']"/>
> >> + <confmenucommand id="cmd_showSipDialer"
> >> onselect="canvas.doActionmenu('showSipDialer')"
> key="['ALT','Shift','D']" />
> >>
> >> <confmenucommand id="cmd_applyforMod_nokey"
> >> onselect="canvas.doActionmenu('applyForMod')" />
> >> <confmenucommand id="cmd_createPoll_nokey"
> >> onselect="canvas.doActionmenu('createPoll')" />
> >> @@ -56,7 +57,8 @@
> >> <confmenucommand id="cmd_importFile_nokey"
> >> onselect="canvas.doActionmenu('importFile')" />
> >> <confmenucommand id="cmd_editCamMicSettings_nokey"
> >> onselect="canvas.doActionmenu('editCamMicSettings')"/>
> >> <confmenucommand id="cmd_editBoardSettings_nokey"
> >> onselect="canvas.doActionmenu('editBoardSettings')" />
> >> - <confmenucommand id="cmd_quit_nokey"
> >> onselect="canvas.doActionmenu('quit')" />
> >> + <confmenucommand id="cmd_quit_nokey"
> >> onselect="canvas.doActionmenu('quit')" />
> >> + <confmenucommand id="cmd_showSipDialer_nokey"
> >> onselect="canvas.doActionmenu('showSipDialer')" />
> >>
> >> <!--
> >> <command id="cmd_browser_open"
> >> onselect="canvas.doActionmenu('browser_open')"
> key="['ALT','Shift','B']"/>
> >> @@ -402,6 +404,8 @@
> >> canvas.thishib.applyForModeration.doCall();
> >> } else if (stringSub=='editCamMicSettings') {
> >>
> >> canvas._videocontainer._videoviewcontent.changeDevice();
> >> + } else if (stringSub=='showSipDialer') {
> >> + new
> lz.sipDialer(canvas.main_content._content.inner);
> >> } else if (stringSub=='editBoardSettings') {
> >> new
> >> lz.editWhiteboardDefault(canvas.main_content._content.inner);
> >> } else if (stringSub=='quit') {
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
> >> Mon Mar 26 09:14:15 2012
> >> @@ -47,9 +47,9 @@
> >> </method>
> >> </class>
> >>
> >> - <!--- Menu for public/private conference and audience room. This
> >> class shows
> >> - exit, moderator, file, setteings and poll menu. Those
> menu
> >> items are connected
> >> - to each command that has been declared in
> >> base/mainMethods.lzx. May 24 2008
> >> + <!--- Menu for public/private conference and audience room. This
> >> class shows
> >> + exit, moderator, file, setteings and poll menu. Those
> menu
> >> items are connected
> >> + to each command that has been declared in
> >> base/mainMethods.lzx. May 24 2008
> >> commented by onokeiji@gmail.com -->
> >> <class name="conferenceMenubar" extends="menubar" height="28"
> >> style="itemStyle">
> >> @@ -83,7 +83,7 @@
> >> parent._exitbtn.destroy();
> >> }
> >> }
> >> -
> >> +
> >> if(canvas.isrtl == 'true'){
> >> if ($debug) Debug.write("onInit : Setting
> >> nokey");
> >>
> lblImport.setCommand(cmd_importFile_nokey);
> >> @@ -92,11 +92,11 @@
> >> </handler>
> >> <_labelMenuItem id="lblImport" labelid="15"
> >> command="cmd_importFile" enabled="${
> >> canvas.ismoderator }" />
> >> - <!-- <menuseparator/> <_labelMenuItem
> >> labelid="561" command="cmd_exportFilePNG"
> >> - /> <_labelMenuItem labelid="562"
> >> command="cmd_exportFileJPG" /> <_labelMenuItem
> >> - labelid="563"
> command="cmd_exportFilePDF"
> >> /> <_labelMenuItem labelid="560"
> >> - command="cmd_exportFileSVG" />
> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
> >> - /> <menuseparator/> <_labelMenuItem
> >> name="_exitItem" labelid="309" command="cmd_quit"
> >> + <!-- <menuseparator/> <_labelMenuItem
> >> labelid="561" command="cmd_exportFilePNG"
> >> + /> <_labelMenuItem labelid="562"
> >> command="cmd_exportFileJPG" /> <_labelMenuItem
> >> + labelid="563"
> command="cmd_exportFilePDF"
> >> /> <_labelMenuItem labelid="560"
> >> + command="cmd_exportFileSVG" />
> >> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
> >> + /> <menuseparator/> <_labelMenuItem
> >> name="_exitItem" labelid="309" command="cmd_quit"
> >> value="quit" /> -->
> >> </_labelMenu>
> >>
> >> @@ -104,7 +104,7 @@
> >>
> >> <handler name="oninit">
> >> <![CDATA[
> >> -
> >> +
> >> if(canvas.isrtl == 'true'){
> >> if ($debug) Debug.write("onInit : Setting
> >> nokey");
> >>
> >> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
> >> @@ -112,6 +112,7 @@
> >> lblPoll.setCommand(cmd_createPoll_nokey);
> >>
> >> lblPollResult.setCommand(cmd_pollResults_nokey);
> >>
> >> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
> >> +
> >> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
> >> }
> >> //hideActionsMenu
> >> if(canvas.currentRoomObj.hideActionsMenu){
> >> @@ -133,7 +134,7 @@
> >> </handler>
> >> </_labelMenuItem>
> >> <menuseparator />
> >> - <!-- <_labelMenuItem labelid="749"
> >> command="cmd_coBrowser" enabled="${
> >> + <!-- <_labelMenuItem labelid="749"
> >> command="cmd_coBrowser" enabled="${
> >> canvas.ismoderator }" /> <menuseparator/>
> >> -->
> >> <_labelMenuItem id="lblCamMic" labelid="306"
> >> command="cmd_editCamMicSettings" />
> >> @@ -177,14 +178,17 @@
> >> <_labelMenuItem width="250" id="lblPollVote"
> >> labelid="42"
> >> command="cmd_checkPollVoted" />
> >> <menuseparator />
> >> + <_labelMenuItem width="250" id="lblShowSipDialer"
> >> labelid="1447"
> >> + command="cmd_showSipDialer" />
> >> + <menuseparator />
> >> <_labelMenuItem width="250" labelid="1126"
> >> command="cmd_editWhiteboardDefault" />
> >> </_labelMenu>
> >> -
> >> - <!-- exit room <_labelMenu labelid="308" width="250">
> >> </_labelMenu> <_labelMenu
> >> - labelid="301" width="250"> <_labelMenuItem
> >> id="lblMod" labelid="302" command="cmd_applyforMod"
> >> - /> </_labelMenu> <_labelMenu labelid="305"
> >> width="250"> <_labelMenuItem labelid="306"
> >> - command="cmd_editCamMicSettings" />
> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
> >> +
> >> + <!-- exit room <_labelMenu labelid="308" width="250">
> >> </_labelMenu> <_labelMenu
> >> + labelid="301" width="250"> <_labelMenuItem
> >> id="lblMod" labelid="302" command="cmd_applyforMod"
> >> + /> </_labelMenu> <_labelMenu labelid="305"
> >> width="250"> <_labelMenuItem labelid="306"
> >> + command="cmd_editCamMicSettings" />
> >> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
> >> /> </_labelMenu> <_labelMenu labelid="303"
> >> width="250"> </_labelMenu> -->
> >>
> >> </class>
> >> @@ -258,7 +262,7 @@
> >> </handler>
> >> </_labelMenuItem>
> >> <menuseparator />
> >> - <!-- <_labelMenuItem labelid="749"
> >> command="cmd_coBrowser" enabled="${
> >> + <!-- <_labelMenuItem labelid="749"
> >> command="cmd_coBrowser" enabled="${
> >> canvas.ismoderator }" />
> >> <menuseparator/> -->
> >> <_labelMenuItem labelid="306"
> >> command="cmd_editCamMicSettings"
> >> enabled="${ canvas.ismoderator
> }" />
> >> @@ -358,7 +362,7 @@
> >> </handler>
> >> </_labelMenuItem>
> >> <menuseparator />
> >> - <!-- <_labelMenuItem labelid="749"
> >> command="cmd_coBrowser" enabled="${
> >> + <!-- <_labelMenuItem labelid="749"
> >> command="cmd_coBrowser" enabled="${
> >> canvas.ismoderator }" />
> >> <menuseparator/> -->
> >> <_labelMenuItem labelid="306"
> >> command="cmd_editCamMicSettings"
> >> enabled="${ canvas.ismoderator
> }" />
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
> >> Mon Mar 26 09:14:15 2012
> >> @@ -65,6 +65,7 @@
> >> <include href="restricted/" />
> >> <include href="browser/" />
> >> <include href="testsetup/" />
> >> + <include href="sip/" />
> >>
> >> <include href="flexibleConferenceRoom/" />
> >>
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,6 @@
> >> +<?xml version="1.0" encoding="UTF-8" ?>
> >> +<library>
> >> +
> >> + <include href="sipDialer.lzx" />
> >> +
> >> +</library>
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,81 @@
> >> +<?xml version="1.0" encoding="UTF-8" ?>
> >> +<library>
> >> +
> >> +<class name="sipDialer" extends="window" bgcolor="gray" width="200">
> >> + <simplelayout axis="y" spacing="5"/>
> >> + <labelText labelid="1003"/>
> >> + <view name="phoneNumber" width="100%">
> >> + <inputtext name="input"
> >> width="$once{parent.width-parent.del.width}" height="20"
> bgcolor="white"/>
> >> + <button name="del" x="$once{parent.input.width}" width="30"
> >> height="20" onclick="this.del();">
> >> + â†
> >> + <method name="del">
> >> + var t = parent.input.text;
> >> + if(t.length != 0) {
> >> + t = t.substr(0, t.length - 1);
> >> + parent.input.setAttribute('text', t);
> >> + }
> >> + </method>
> >> + </button>
> >> + </view>
> >> +
> >> + <view name="dialerButtons" align="center">
> >> + <vbox spacing="5">
> >> + <hbox spacing="5">
> >> + <button onclick="parent.parent.parent.parent.dial('1')"
> >> width="40">1</button>
> >> + <button onclick="parent.parent.parent.parent.dial('2')"
> >> width="40">2</button>
> >> + <button onclick="parent.parent.parent.parent.dial('3')"
> >> width="40">3</button>
> >> + </hbox>
> >> + <hbox spacing="5">
> >> + <button onclick="parent.parent.parent.parent.dial('4')"
> >> width="40">4</button>
> >> + <button onclick="parent.parent.parent.parent.dial('5')"
> >> width="40">5</button>
> >> + <button onclick="parent.parent.parent.parent.dial('6')"
> >> width="40">6</button>
> >> + </hbox>
> >> + <hbox spacing="5">
> >> + <button onclick="parent.parent.parent.parent.dial('7')"
> >> width="40">7</button>
> >> + <button onclick="parent.parent.parent.parent.dial('8')"
> >> width="40">8</button>
> >> + <button onclick="parent.parent.parent.parent.dial('9')"
> >> width="40">9</button>
> >> + </hbox>
> >> + <hbox spacing="5">
> >> + <button onclick="parent.parent.parent.parent.dial('*')"
> >> width="40">*</button>
> >> + <button onclick="parent.parent.parent.parent.dial('0')"
> >> width="40">0</button>
> >> + <button onclick="parent.parent.parent.parent.dial('#')"
> >> width="40">#</button>
> >> + </hbox>
> >> + </vbox>
> >> + </view>
> >> + <hbox spacing="10" align="center">
> >> + <simpleLabelButton labelid="1448" name="callButton">
> >> + <handler name="onclick">
> >> + parent.parent.joinToConfCall.doCall();
> >> + </handler>
> >> + </simpleLabelButton>
> >> + <simpleLabelButton labelid="85" name="closeButton">
> >> + <handler name="onclick">
> >> + canvas.sipDialer = null;
> >> + parent.parent.destroy();
> >> + </handler>
> >> + </simpleLabelButton>
> >> + </hbox>
> >> + <handler name="oninit">
> >> + if(canvas.sipDialer != null) {
> >> + canvas.sipDialer.destroy();
> >> + }
> >> + canvas.setAttribute('sipDialer', this);
> >> + this.bringToFront();
> >> + </handler>
> >> +
> >> + <method name="dial" args="digit">
> >> + this.phoneNumber.input.setAttribute('text',
> >> this.phoneNumber.input.text + digit);
> >> + </method>
> >> +
> >> + <netRemoteCallHib name="joinToConfCall" funcname="joinToConfCall"
> >> remotecontext="$once{ canvas.thishib }">
> >> + <netparam><method name="getValue">return
> >> parent.parent.phoneNumber.input.text</method></netparam>
> >> + <handler name="ondata" args="value">
> >> + <![CDATA[
> >> + //The onResult-Handler will be called be the rtmpconnection
> >> + if($debug) Debug.write("joinToConfCall : ",value);
> >> + ]]>
> >> + </handler>
> >> + </netRemoteCallHib>
> >> +</class>
> >> +
> >> +</library>
> >> \ No newline at end of file
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
> >> Mon Mar 26 09:14:15 2012
> >> @@ -67,6 +67,9 @@
> >>
> >> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
> >>
> >> <class>org.openmeetings.app.persistence.beans.user.Users</class>
> >>
> >>
> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
> >> +
> >>
> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
> >> +
> >>
> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
> >> +
> >>
> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
> >>
> <exclude-unlisted-classes>false</exclude-unlisted-classes>
> >> <properties>
> >> <property
> >> name="openjpa.ConnectionProperties"
> >> @@ -83,7 +86,8 @@
> >> <property name="openjpa.Log"
> >> value="DefaultLevel=WARN, Tool=INFO" />
> >> <property
> >> name="openjpa.ConnectionDriverName"
> >> value="org.apache.commons.dbcp.BasicDataSource"/>
> >> <property name="openjpa.DataCache"
> >> value="true"/>
> >> - <property name="openjpa.QueryCache"
> >> value="true"/>
> >> + <!-- QueryCache disabled due to changes outside of JPA
> >> doesn't take effect with caching -->
> >> + <property name="openjpa.QueryCache"
> >> value="false"/>
> >> <property
> name="openjpa.jdbc.DBDictionary"
> >> value="batchLimit=100,tableType=myisam"/>
> >> <property
> name="openjpa.jdbc.QuerySQLCache"
> >> value="false"/>
> >> </properties>
> >>
> >> Modified:
> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
> >> (original)
> >> +++ incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
> Mon
> >> Mar 26 09:14:15 2012
> >> @@ -331,7 +331,36 @@ function checkEmail()
> >>
> >> </i></p>
> >>
> >> - </fieldset>
> >> + </fieldset>
> >> +
> >> + <fieldset id="red5sip">
> >> + <legend>red5SIP Configuration</legend>
> >> +
> >> + <li>
> >> + <label for="red5sip_enable">Enable SIP</label>
> >> + <select name="red5sip_enable" id="red5sip_enable" size="1">
> >> + <option value="yes">Yes</option>
> >> + <option value="no" selected>No</option>
> >> + </select><br />
> >> + </li>
> >> + <p><i>
> >> + Enable red5SIP integration
> >> + </i></p>
> >> + <br />
> >> +
> >> + <li>
> >> + <label for="red5sip_room_prefix">SIP rooms prefix</label>
> >> + <input name="red5sip_room_prefix" id="red5sip_room_prefix"
> >> size="27" title="" type="text" value="400" />
> >> + <p><i>Prefix for phone number of conference rooms</i></p>
> >> + </li>
> >> +
> >> + <li>
> >> + <label for="red5sip_exten_context">SIP extensions
> context</label>
> >> + <input name="red5sip_exten_context" id="red5sip_exten_context"
> >> size="27" title="" type="text" value="rooms" />
> >> + <p><i>Context of Asterisk extensions</i></p>
> >> + </li>
> >> +
> >> + </fieldset>
> >>
> >> <fieldset id="sip">
> >>
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
> >>
> >> import org.openmeetings.app.conference.session.RoomClient;
> >> import org.openmeetings.app.data.basic.AuthLevelmanagement;
> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
> >> import org.openmeetings.app.data.beans.basic.SearchResult;
> >> import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
> >> import org.openmeetings.app.data.user.Organisationmanagement;
> >> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
> >> import
> org.openmeetings.app.persistence.beans.domain.Organisation_Users;
> >> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
> >> import org.openmeetings.app.persistence.beans.rooms.Rooms;
> >> import org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
> >> import org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
> >> import org.openmeetings.app.persistence.beans.user.Users;
> >> import org.openmeetings.app.remote.red5.ClientListManager;
> >> +import org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
> >> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
> >> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
> >> +import
> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
> >> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
> >> import org.red5.logging.Red5LoggerFactory;
> >> import org.slf4j.Logger;
> >> @@ -71,6 +78,8 @@ public class Roommanagement {
> >> @Autowired
> >> private OpenXGHttpClient openXGHttpClient;
> >> @Autowired
> >> + private AsteriskDbSipClient asteriskDbSipClient;
> >> + @Autowired
> >> private RoomModeratorsDaoImpl roomModeratorsDao;
> >> @Autowired
> >> private UsersDaoImpl usersDao;
> >> @@ -78,6 +87,8 @@ public class Roommanagement {
> >> private AuthLevelmanagement authLevelManagement;
> >> @Autowired
> >> private ClientListManager clientListManager;
> >> + @Autowired
> >> + private Configurationmanagement cfgManagement;
> >>
> >> /**
> >> * add a new Record to the table roomtypes
> >> @@ -102,6 +113,20 @@ public class Roommanagement {
> >>
> >> public Long addRoom(Rooms room) {
> >> try {
> >> + /* Red5SIP integration
> >>
> *******************************************************************************/
> >> + Configuration conf = cfgManagement.getConfKey(3L,
> >> "red5sip.enable");
> >> + if(conf != null && conf.getConf_value().equals("yes")) {
> >> + if(room.getSipNumber() != null &&
> >> !room.getSipNumber().isEmpty()) {
> >> + asteriskDbSipClient.createSIPConference(new
> >> SIPCreateConferenceRequest(room.getSipNumber()));
> >> + } else {
> >> + SipCreateConferenceRequestResult requestResult =
> >> asteriskDbSipClient.createSIPConference(new
> SIPCreateConferenceRequest());
> >> + if(!requestResult.hasError()) {
> >> +
> >> room.setSipNumber(requestResult.getConferenceNumber());
> >> +
> >> room.setConferencePin(requestResult.getConferencePin());
> >> + }
> >> + }
> >> + }
> >> +
> >>
> /*****************************************************************************************************/
> >> room.setStarttime(new Date());
> >> room = em.merge(room);
> >> long returnId = room.getRooms_id();
> >> @@ -719,6 +744,25 @@ public class Roommanagement {
> >> return null;
> >> }
> >>
> >> + /**
> >> + * Returns number of SIP conference participants
> >> + * @param rooms_id id of room
> >> + * @return number of participants
> >> + */
> >> + public Integer getSipConferenceMembersNumber(Long rooms_id) {
> >> + Configuration conf = cfgManagement.getConfKey(3L,
> >> "red5sip.enable");
> >> + if(conf != null && conf.getConf_value().equals("yes")) {
> >> + Rooms rooms = this.getRoomById(rooms_id);
> >> + if(rooms != null) {
> >> + return
> >> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
> >> + } else {
> >> + return 0;
> >> + }
> >> + } else {
> >> + return null;
> >> + }
> >> + }
> >> +
> >> /**
> >> * adds a new Record to the table rooms
> >> * @param name
> >> @@ -793,6 +837,19 @@ public class Roommanagement {
> >>
> >> r.setConferencePin(openXGReturnObject.getConferencePin());
> >> }
> >>
> >> + /* Red5SIP integration
> >>
> *******************************************************************************/
> >> + Configuration conf = cfgManagement.getConfKey(3L,
> >> "red5sip.enable");
> >> + if(conf != null && conf.getConf_value().equals("yes"))
> {
> >> + SipCreateConferenceRequestResult requestResult =
> >> asteriskDbSipClient
> >> + .createSIPConference(new
> >> SIPCreateConferenceRequest());
> >> +
> >> + if(!requestResult.hasError()) {
> >> +
> >> r.setSipNumber(requestResult.getConferenceNumber());
> >> +
> >> r.setConferencePin(requestResult.getConferencePin());
> >> + }
> >> + }
> >> +
> >>
> /*****************************************************************************************************/
> >> +
> >> r = em.merge(r);
> >> long returnId = r.getRooms_id();
> >>
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -252,7 +252,8 @@ public class ImportInitvalues {
> >> String openxg_client_domain, String
> >> openxg_community_code,
> >> String openxg_language_code, String
> openxg_adminid,
> >> String sip_language_phonecode, String
> >> sip_phonerange_start,
> >> - String sip_phonerange, String jodPath) {
> >> + String sip_phonerange, String jodPath,
> >> + String red5sip_enable, String red5sip_room_prefix,String
> >> red5sip_exten_context) {
> >>
> >> cfgManagement
> >> .addConfByKey(
> >> @@ -349,6 +350,18 @@ public class ImportInitvalues {
> >> cfgManagement.addConfByKey(3, "default.rpc.userid", "" +
> 1,
> >> null,
> >> "The User-Id of the Control User in
> >> OpenMeetings");
> >>
> >> + // ***************************************
> >> + // ***************************************
> >> + // red5SIP Integration Coniguration Values
> >> + // ***************************************
> >> +
> >> + cfgManagement.addConfByKey(3, "red5sip.enable", red5sip_enable,
> >> null,
> >> + "Enable to enable the red5SIP
> integration
> >> ");
> >> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
> >> red5sip_room_prefix, null,
> >> + "Enable to enable the red5SIP
> integration
> >> ");
> >> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
> >> red5sip_exten_context, null,
> >> + "Enable to enable the red5SIP
> integration
> >> ");
> >> +
> >> // ***************************************
> >> // ***************************************
> >> // SIP Applet Configuration Values
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -19,6 +19,7 @@
> >> package org.openmeetings.app.remote.red5;
> >>
> >> import java.io.File;
> >> +import java.io.IOException;
> >> import java.util.ArrayList;
> >> import java.util.Collection;
> >> import java.util.Date;
> >> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
> >> return null;
> >> }
> >>
> >> + public synchronized List<Integer> listRoomBroadcast() {
> >> + List<Integer> broadcastList = new ArrayList<Integer>();
> >> + IConnection current = Red5.getConnectionLocal();
> >> + String streamid = current.getClient().getId();
> >> + Collection<Set<IConnection>> conCollection =
> >> current.getScope().getConnections();
> >> + for (Set<IConnection> conset : conCollection) {
> >> + for (IConnection conn : conset) {
> >> + if (conn != null) {
> >> + RoomClient rcl = this.clientListManager
> >> + .getClientByStreamId(conn
> >> + .getClient().getId());
> >> + if (rcl == null) {
> >> + // continue;
> >> + } else if (rcl.getIsScreenClient() != null
> >> + && rcl.getIsScreenClient()) {
> >> + // continue;
> >> + } else {
> >> + if (!streamid.equals(rcl.getStreamid())) {
> >> + // It is not needed to send back
> >> + // that event to the actuall
> >> + // Moderator
> >> + // as it will be already triggered
> >> + // in the result of this Function
> >> + // in the Client
> >> +
> >> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
> >> + }
> >> + }
> >> + }
> >> + }
> >> + }
> >> + return broadcastList;
> >> + }
> >> +
> >> +
> >> /**
> >> * this function is invoked directly after initial connecting
> >> *
> >> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
> >> }
> >> return null;
> >> }
> >> +
> >> + /*
> >> + * SIP transport methods
> >> + */
> >> +
> >> + public synchronized void updateSipTransport() {
> >> + IConnection current = Red5.getConnectionLocal();
> >> + String streamid = current.getClient().getId();
> >> + RoomClient currentClient =
> >> this.clientListManager.getClientByStreamId(streamid);
> >> + log.debug("getSipConferenceMembersNumber: " +
> >>
> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
> >> + String newNumber =
> >>
> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
> >> + if(!newNumber.equals(currentClient.getLastname())) {
> >> + currentClient.setLastname(newNumber);
> >> + this.clientListManager.updateClientByStreamId(streamid,
> >> currentClient);
> >> + log.debug("updateSipTransport: {}, {}, {}, {}", new
> >> Object[]{currentClient.getPublicSID(),
> >> + currentClient.getRoom_id(),
> >> currentClient.getFirstname(), currentClient.getLastname()});
> >> + sendMessageWithClient(new
> >>
> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
> >> + }
> >> + }
> >> +
> >> + /**
> >> + * Perform call to specified phone number and join to conference
> >> + * @param number to call
> >> + */
> >> + public synchronized void joinToConfCall(String number) {
> >> + IConnection current = Red5.getConnectionLocal();
> >> + String streamid = current.getClient().getId();
> >> + RoomClient currentClient =
> >> this.clientListManager.getClientByStreamId(streamid);
> >> + Rooms rooms =
> >> roommanagement.getRoomById(currentClient.getRoom_id());
> >> + log.debug("asterisk -rx \"originate Local/" + number + "@rooms
> >> extension " + rooms.getSipNumber() + "@rooms\"");
> >> + try {
> >> + Process proc = Runtime.getRuntime().exec(new
> >> String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms
> extension
> >> " + rooms.getSipNumber() + "@rooms"});
> >> + } catch (IOException e) {
> >> + log.error("Executing asterisk originate error: ", e);
> >> + }
> >> + }
> >> +
> >> + public synchronized String getSipNumber(Long room_id) {
> >> + Rooms rooms = roommanagement.getRoomById(room_id);
> >> + if(rooms != null) {
> >> + log.debug("getSipNumber: room_id: {}, sipNumber: {}", new
> >> Object[]{room_id, rooms.getSipNumber()});
> >> + return rooms.getSipNumber();
> >> + }
> >> + return null;
> >> + }
> >> +
> >> + public synchronized void setSipTransport(Long room_id, String
> >> publicSID, String broadCastId) {
> >> + IConnection current = Red5.getConnectionLocal();
> >> + String streamid = current.getClient().getId();
> >> + Rooms room = roommanagement.getRoomById(room_id);
> >> + // Notify all clients of the same scope (room)
> >> + RoomClient currentClient =
> >> this.clientListManager.getClientByStreamId(streamid);
> >> + currentClient.setRoom_id(room_id);
> >> + currentClient.setRoomEnter(new Date());
> >> + currentClient.setFirstname("SIP Transport");
> >> +
> >>
> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
> >> + currentClient.setBroadCastID(Long.parseLong(broadCastId));
> >> + currentClient.setIsBroadcasting(true);
> >> + currentClient.setPublicSID(publicSID);
> >> + currentClient.setAvsettings("av");
> >> + currentClient.setVWidth(120);
> >> + currentClient.setVHeight(90);
> >> + this.clientListManager.updateClientByStreamId(streamid,
> >> currentClient);
> >> +
> >> + Collection<Set<IConnection>> conCollection = current
> >> + .getScope().getConnections();
> >> + for (Set<IConnection> conset : conCollection) {
> >> + for (IConnection conn : conset) {
> >> + if (conn != null) {
> >> + RoomClient rcl =
> >> this.clientListManager.getClientByStreamId(conn.getClient().getId());
> >> + if (rcl == null) {
> >> + // continue;
> >> + } else if (rcl.getIsScreenClient() != null
> >> + && rcl.getIsScreenClient()) {
> >> + // continue;
> >> + } else {
> >> + if (!streamid.equals(rcl.getStreamid())) {
> >> + // It is not needed to send back
> >> + // that event to the actuall
> >> + // Moderator
> >> + // as it will be already triggered
> >> + // in the result of this Function
> >> + // in the Client
> >> + if (conn instanceof
> >> IServiceCapableConnection) {
> >> + ((IServiceCapableConnection)
> >> conn).invoke("addNewUser", new Object[]{currentClient}, this);
> >> + ((IServiceCapableConnection)
> >> conn).invoke("newStream", new Object[]{currentClient}, this);
> >> + log.debug("sending setSipTransport to "
> >> + + conn);
> >> + }
> >> + }
> >> + }
> >> + }
> >> + }
> >> + }
> >> + }
> >> }
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,19 @@
> >> +package org.openmeetings.app.sip.api;
> >> +
> >> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
> >> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
> >> +import
> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
> >> +
> >> +/**
> >> + * SIP client interface
> >> + */
> >> +public interface ISIPClient {
> >> +
> >> + SIPCreateUserRequestResult createSIPUser(SIPCreateUserRequest
> >> request);
> >> +
> >> + SipCreateConferenceRequestResult
> >> createSIPConference(SIPCreateConferenceRequest request);
> >> +
> >> + Integer getConferenceMembersNumber(String sipNumber);
> >> +
> >> +}
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,58 @@
> >> +package org.openmeetings.app.sip.api.impl.asterisk;
> >> +
> >> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
> >> +import org.openmeetings.app.sip.api.ISIPClient;
> >> +import org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
> >> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
> >> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
> >> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
> >> +import
> >> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
> >> +import org.springframework.beans.factory.annotation.Autowired;
> >> +/**
> >> + *
> >> + */
> >> +public class AsteriskDbSipClient implements ISIPClient {
> >> +
> >> + @Autowired
> >> + private AsteriskDAOImpl asteriskDAO;
> >> +
> >> + public SIPCreateUserRequestResult createSIPUser(final
> >> SIPCreateUserRequest request) {
> >> + asteriskDAO.addSipUser(request.getLogin(),
> request.getPassword());
> >> + return new SIPCreateUserRequestResult() {
> >> + @Override
> >> + public UserSipData getUserSipData() {
> >> + UserSipData sipData = new UserSipData();
> >> + sipData.setAuthId(request.getLogin());
> >> + sipData.setUserpass(request.getPassword());
> >> + sipData.setUsername(request.getLogin());
> >> + return sipData;
> >> + }
> >> +
> >> + public boolean hasError() {
> >> + return false;
> >> + }
> >> +
> >> + public String getErrorMessage() {
> >> + return null;
> >> + }
> >> + };
> >> + }
> >> +
> >> + public SipCreateConferenceRequestResult
> >> createSIPConference(SIPCreateConferenceRequest request) {
> >> + String confno = asteriskDAO.addMeetMeConference();
> >> + return new SipCreateConferenceRequestResult(confno, "") {
> >> + public boolean hasError() {
> >> + return false;
> >> + }
> >> +
> >> + public String getErrorMessage() {
> >> + return null;
> >> + }
> >> + };
> >> + }
> >> +
> >> + public Integer getConferenceMembersNumber(String sipNumber) {
> >> + return asteriskDAO.getConferensMembersNumber(sipNumber);
> >> + }
> >> +}
> >> \ No newline at end of file
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,76 @@
> >> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
> >> +
> >> +import org.openmeetings.app.OpenmeetingsVariables;
> >> +import org.openmeetings.app.data.basic.Configurationmanagement;
> >> +import org.openmeetings.app.persistence.beans.basic.Configuration;
> >> +import
> >> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
> >> +import org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
> >> +import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
> >> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
> >> +import org.red5.logging.Red5LoggerFactory;
> >> +import org.slf4j.Logger;
> >> +import org.springframework.transaction.annotation.Transactional;
> >> +import org.springframework.beans.factory.annotation.Autowired;
> >> +
> >> +import javax.persistence.EntityManager;
> >> +import javax.persistence.PersistenceContext;
> >> +
> >> +@Transactional
> >> +public class AsteriskDAOImpl {
> >> +
> >> + private static final Logger log =
> >> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
> >> OpenmeetingsVariables.webAppRootKey);
> >> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
> >> + @PersistenceContext
> >> + private EntityManager em;
> >> + @Autowired
> >> + private Configurationmanagement cfgManagement;
> >> +
> >> + public void addSipUser(String username, String secret) {
> >> + AsteriskSipUsers u = new AsteriskSipUsers();
> >> + Configuration conf =
> >> cfgManagement.getConfKey(3L,"red5sip.exten_context");
> >> + String defaultRoomContext = "rooms";
> >> + if(conf != null && !conf.getConf_value().isEmpty()) {
> >> + defaultRoomContext = conf.getConf_value();
> >> + }
> >> + u.setName(username);
> >> + u.setSecret(secret);
> >> + u.setContext(defaultRoomContext);
> >> + u.setHost("dynamic");
> >> + Extensions e = new Extensions();
> >> + e.setApp("Dial");
> >> + e.setAppdata("SIP/" + username);
> >> + e.setExten(username);
> >> + e.setContext(defaultRoomContext);
> >> + e.setPriority(1);
> >> + em.persist(u);
> >> + em.persist(e);
> >> + }
> >> +
> >> + public String addMeetMeConference() {
> >> + int count = ((Number)em.createQuery("SELECT COUNT(m.confno)
> FROM
> >> MeetMe AS m").getSingleResult()).intValue();
> >> +
> >> + Configuration conf =
> >> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
> >> + String prefix = DEFAULT_SIP_CONTEXT;
> >> + if(conf != null) {
> >> + prefix = conf.getConf_value();
> >> + }
> >> + String confno = prefix+(count+1);
> >> + MeetMe mm = new MeetMe();
> >> + mm.setConfno(confno);
> >> + Extensions e = new Extensions();
> >> + e.setApp("MeetMe");
> >> + e.setAppdata(confno + ",dM");
> >> + e.setExten(confno);
> >> + e.setContext("rooms");
> >> + e.setPriority(1);
> >> + em.persist(mm);
> >> + em.persist(e);
> >> + return confno;
> >> + }
> >> +
> >> + public Integer getConferensMembersNumber(String confNo) {
> >> + return ((Number)em.createQuery("SELECT m.members FROM MeetMe
> AS m
> >> WHERE m.confno=:confno")
> >> + .setParameter("confno", confNo)
> >> + .getSingleResult()).intValue();
> >> + }
> >> +}
> >> \ No newline at end of file
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,8 @@
> >> +package org.openmeetings.app.sip.api.request;
> >> +
> >> +/**
> >> + * Base interface for SIP API requests
> >> + */
> >> +public interface ISIPRequest {
> >> +
> >> +}
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,17 @@
> >> +package org.openmeetings.app.sip.api.request;
> >> +
> >> +/**
> >> + * Create SIP conferece request
> >> + */
> >> +public class SIPCreateConferenceRequest implements ISIPRequest {
> >> + private String sipNumber;
> >> +
> >> + public SIPCreateConferenceRequest() {
> >> + super(); //To change body of overridden methods use File |
> >> Settings | File Templates.
> >> + }
> >> +
> >> + public SIPCreateConferenceRequest(String sipNumber) {
> >> + super();
> >> + this.sipNumber = sipNumber;
> >> + }
> >> +}
> >> \ No newline at end of file
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,72 @@
> >> +package org.openmeetings.app.sip.api.request;
> >> +
> >> +/**
> >> + * Create User Request
> >> + */
> >> +public class SIPCreateUserRequest implements ISIPRequest {
> >> +
> >> + protected String firstName;
> >> + protected String middleName;
> >> + protected String lastName;
> >> + protected String email;
> >> + protected String login;
> >> + protected String password;
> >> +
> >> +
> >> + public SIPCreateUserRequest(String firstName, String middleName,
> >> String lastName, String email, String login, String password) {
> >> + this.firstName = firstName;
> >> + this.middleName = middleName;
> >> + this.lastName = lastName;
> >> + this.email = email;
> >> + this.login = login;
> >> + this.password = password;
> >> + }
> >> +
> >> + public void withFirstName(String firstName) {
> >> + this.firstName = firstName;
> >> + }
> >> +
> >> + public void withMiddleName(String middleName) {
> >> + this.middleName = middleName;
> >> + }
> >> +
> >> + public void withLastName(String lastName) {
> >> + this.lastName = lastName;
> >> + }
> >> +
> >> + public void withEmail(String email) {
> >> + this.email = email;
> >> + }
> >> +
> >> + public void withLogin(String login) {
> >> + this.login = login;
> >> + }
> >> +
> >> + public void withPassword(String password) {
> >> + this.password = password;
> >> + }
> >> +
> >> + public String getFirstName() {
> >> + return firstName;
> >> + }
> >> +
> >> + public String getMiddleName() {
> >> + return middleName;
> >> + }
> >> +
> >> + public String getLastName() {
> >> + return lastName;
> >> + }
> >> +
> >> + public String getEmail() {
> >> + return email;
> >> + }
> >> +
> >> + public String getLogin() {
> >> + return login;
> >> + }
> >> +
> >> + public String getPassword() {
> >> + return password;
> >> + }
> >> +}
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,12 @@
> >> +package org.openmeetings.app.sip.api.result;
> >> +
> >> +/**
> >> + * * Base interface for SIP API request's resuslt
> >> + */
> >> +public interface ISIPRequestResult {
> >> +
> >> + boolean hasError();
> >> +
> >> + String getErrorMessage();
> >> +
> >> +}
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,12 @@
> >> +package org.openmeetings.app.sip.api.result;
> >> +
> >> +import org.openmeetings.app.persistence.beans.user.UserSipData;
> >> +
> >> +/**
> >> + * TODO
> >> + */
> >> +public abstract class SIPCreateUserRequestResult implements
> >> ISIPRequestResult {
> >> +
> >> + abstract public UserSipData getUserSipData();
> >> +
> >> +}
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Added:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> >> (added)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -0,0 +1,26 @@
> >> +package org.openmeetings.app.sip.api.result;
> >> +
> >> +/**
> >> + * TODO
> >> + */
> >> +public abstract class SipCreateConferenceRequestResult implements
> >> ISIPRequestResult {
> >> +
> >> + protected String conferenceNumber;
> >> + protected String conferencePin;
> >> +
> >> + protected SipCreateConferenceRequestResult() {
> >> + }
> >> +
> >> + protected SipCreateConferenceRequestResult(String conferenceNumber,
> >> String conferencePin) {
> >> + this.conferenceNumber = conferenceNumber;
> >> + this.conferencePin = conferencePin;
> >> + }
> >> +
> >> + public String getConferenceNumber() {
> >> + return conferenceNumber;
> >> + }
> >> +
> >> + public String getConferencePin() {
> >> + return conferencePin;
> >> + }
> >> +}
> >>
> >> Propchange:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
> >>
> >>
> ------------------------------------------------------------------------------
> >> svn:eol-style = native
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
> >> String screen_viewer =
> >> httpServletRequest
> >>
> >> .getParameter("screen_viewer");
> >>
> >> + // red5sip integration config
> >> + String red5sip_enable = httpServletRequest
> >> +
> >> .getParameter("red5sip_enable");
> >> + String red5sip_room_prefix = httpServletRequest
> >> +
> >> .getParameter("red5sip_room_prefix");
> >> + String red5sip_exten_context = httpServletRequest
> >> +
> >> .getParameter("red5sip_exten_context");
> >> +
> >> // SIP Applet Configuration
> >> String sip_enable =
> >> httpServletRequest
> >>
> >> .getParameter("sip_enable");
> >> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
> >>
> >> openxg_community_code, openxg_language_code,
> >> openxg_adminid,
> >> sip_language_phonecode,
> >>
> >> sip_phonerange_start, sip_phonerange,
> >> - jodPath);
> >> + jodPath,
> >> + red5sip_enable, red5sip_room_prefix,
> >> red5sip_exten_context);
> >>
> >>
> >> getImportInitvalues().loadInitUserAndOrganisation(username,
> >> userpass,
> >> useremail, orgname, timeZone, configdefaultLang);
> >>
> >> Modified:
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
> >> (original)
> >> +++
> >>
> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
> >> Mon Mar 26 09:14:15 2012
> >> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
> >> private static final String sip_phonerange_start = "";
> >> private static final String sip_phonerange = "";
> >> private static final String jodPath = "./jod/lib";
> >> + private static final String red5sip_enable = "no";
> >> + private static final String red5sip_room_prefix = "400";
> >> + private static final String red5sip_exten_context = "rooms";
> >> protected static final String username = "junit";
> >> protected static final String userpass = "test";
> >> private static final String orgname = "smoketest";
> >> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
> >> openxg_client_id, openxg_client_secret,
> >> openxg_client_domain,
> >> openxg_community_code,
> >> openxg_language_code, openxg_adminid,
> >> sip_language_phonecode,
> >> sip_phonerange_start, sip_phonerange,
> >> - jodPath);
> >> + jodPath, red5sip_enable,
> >> red5sip_room_prefix, red5sip_exten_context);
> >>
> >> importInitvalues.loadInitUserAndOrganisation(username,
> >> userpass,
> >> useremail, orgname, timeZone,
> >> configdefaultLang);
> >>
> >>
> >>
> >
> >
> > --
> > Sebastian Wagner
> > http://www.openmeetings.de
> > http://incubator.apache.org/openmeetings/
> > http://www.webbase-design.de
> > http://www.wagner-sebastian.com
> > seba.wagner@gmail.com
>
--
Timur Tleukenov
Re: svn commit: r1305274 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/src/modules/conference/conference/
WebCont
Posted by Alexei Fedotov <al...@gmail.com>.
Ok, I'm here. :-)
On Mon, Mar 26, 2012 at 6:03 PM, seba.wagner@gmail.com
<se...@gmail.com> wrote:
> Hi Timur,
>
> nice changeset :)
>
> But it seems like you've missed to checking some of your code:
> https://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/
>
> The beans: AsteriskSipUsers, Extens, MeetMe are missing
>
> And you should enable the BackupExport/BackupImport to include and
> re-import the data from the new tables.
>
> We might also add some panels in the Admin UI to have the possibility to
> save/edit/delete the settings from the OpenMeetings Admin UI in the future.
>
> Thanks!
> Sebastian
>
> 2012/3/26 <ti...@apache.org>
>
>> Author: timur
>> Date: Mon Mar 26 09:14:15 2012
>> New Revision: 1305274
>>
>> URL: http://svn.apache.org/viewvc?rev=1305274&view=rev
>> Log:
>> red5sip integration:
>> - new Asterisk DAO added;
>> - new red5sip configurations added to install step1 template;
>> - new methods added to ScopeApplicationAdapter.java
>> - openjpa.QueryCache temporally disabled to make database changes from
>> Asterisk visible in OM.
>>
>> Added:
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> (with props)
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> (with props)
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> (with props)
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> (with props)
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> (with props)
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> (with props)
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> (with props)
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> (with props)
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> (with props)
>> Modified:
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> simplified.xml
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> traditional.xml
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>> (studIP).xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>> brazil.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>>
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>>
>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>> incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>>
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -204,7 +204,9 @@
>> <!-- No Interface -->
>> <bean id="manageCryptStyle"
>> class="org.openmeetings.utils.crypt.ManageCryptStyle" />
>> <bean id="openXGHttpClient"
>> class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
>> - <bean id="generateImage"
>> class="org.openmeetings.app.documents.GenerateImage" />
>> + <bean id="asteriskDbSipClient"
>> class="org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient" />
>> + <bean id="asteriskDAO"
>> class="org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl" />
>> + <bean id="generateImage"
>> class="org.openmeetings.app.documents.GenerateImage" />
>> <bean id="generateThumbs"
>> class="org.openmeetings.app.documents.GenerateThumbs" />
>> <bean id="generatePDF"
>> class="org.openmeetings.app.documents.GeneratePDF" />
>> <bean id="mailHandler"
>> class="org.openmeetings.utils.mail.MailHandler" />
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4364,4 +4364,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> simplified.xml (original)
>> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> simplified.xml Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> traditional.xml (original)
>> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
>> traditional.xml Mon Mar 26 09:14:15 2012
>> @@ -4369,4 +4369,16 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</value>
>> + </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> --- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>> (studIP).xml (original)
>> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
>> (studIP).xml Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -5797,4 +5797,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -5806,4 +5806,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4314,4 +4314,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4436,4 +4436,10 @@ transmitowania głosu i obrazu wideo.<
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>> brazil.xml (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
>> brazil.xml Mon Mar 26 09:14:15 2012
>> @@ -4369,4 +4369,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Ромеронабиратель SIP</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Позвонить</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4371,4 +4371,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Mon
>> Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4362,4 +4362,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</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=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -4363,4 +4363,10 @@ see http://incubator.apache.org/openmeet
>> <string id="1446" name="calendar edit button">
>> <value>Edit details</value>
>> </string>
>> + <string id="1447" name="sip show dialer">
>> + <value>Show sip dialer</value>
>> + </string>
>> + <string id="1448" name="sip call">
>> + <value>Call</value>
>> + </string>
>> </language>
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -225,8 +225,9 @@ of the red5-servlet
>> -->
>> <!-- Quality-Modus *normal* -->
>> <microphoneRateNormal>22</microphoneRateNormal>
>> -<!-- Microphone Settings Quality-Modus *best* -->
>> -<microphoneRateBest>44</microphoneRateBest>
>> +<!-- Microphone Settings Quality-Modus *best* -->
>> +<!-- TODO: red5sip support only 8 -->
>> +<microphoneRateBest>44</microphoneRateBest>
>>
>> <!--
>> The Size of the Whiteboard
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
>> Mon Mar 26 09:14:15 2012
>> @@ -47,7 +47,8 @@
>> <confmenucommand id="cmd_importFile"
>> onselect="canvas.doActionmenu('importFile')" key="['ALT','Shift','I']"/>
>> <confmenucommand id="cmd_editCamMicSettings"
>> onselect="canvas.doActionmenu('editCamMicSettings')"
>> key="['ALT','Shift','1']"/>
>> <confmenucommand id="cmd_editBoardSettings"
>> onselect="canvas.doActionmenu('editBoardSettings')"
>> key="['ALT','Shift','2']"/>
>> - <confmenucommand id="cmd_quit" onselect="canvas.doActionmenu('quit')"
>> key="['ALT','Shift','E']"/>
>> + <confmenucommand id="cmd_quit" onselect="canvas.doActionmenu('quit')"
>> key="['ALT','Shift','E']"/>
>> + <confmenucommand id="cmd_showSipDialer"
>> onselect="canvas.doActionmenu('showSipDialer')" key="['ALT','Shift','D']" />
>>
>> <confmenucommand id="cmd_applyforMod_nokey"
>> onselect="canvas.doActionmenu('applyForMod')" />
>> <confmenucommand id="cmd_createPoll_nokey"
>> onselect="canvas.doActionmenu('createPoll')" />
>> @@ -56,7 +57,8 @@
>> <confmenucommand id="cmd_importFile_nokey"
>> onselect="canvas.doActionmenu('importFile')" />
>> <confmenucommand id="cmd_editCamMicSettings_nokey"
>> onselect="canvas.doActionmenu('editCamMicSettings')"/>
>> <confmenucommand id="cmd_editBoardSettings_nokey"
>> onselect="canvas.doActionmenu('editBoardSettings')" />
>> - <confmenucommand id="cmd_quit_nokey"
>> onselect="canvas.doActionmenu('quit')" />
>> + <confmenucommand id="cmd_quit_nokey"
>> onselect="canvas.doActionmenu('quit')" />
>> + <confmenucommand id="cmd_showSipDialer_nokey"
>> onselect="canvas.doActionmenu('showSipDialer')" />
>>
>> <!--
>> <command id="cmd_browser_open"
>> onselect="canvas.doActionmenu('browser_open')" key="['ALT','Shift','B']"/>
>> @@ -402,6 +404,8 @@
>> canvas.thishib.applyForModeration.doCall();
>> } else if (stringSub=='editCamMicSettings') {
>>
>> canvas._videocontainer._videoviewcontent.changeDevice();
>> + } else if (stringSub=='showSipDialer') {
>> + new lz.sipDialer(canvas.main_content._content.inner);
>> } else if (stringSub=='editBoardSettings') {
>> new
>> lz.editWhiteboardDefault(canvas.main_content._content.inner);
>> } else if (stringSub=='quit') {
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
>> Mon Mar 26 09:14:15 2012
>> @@ -47,9 +47,9 @@
>> </method>
>> </class>
>>
>> - <!--- Menu for public/private conference and audience room. This
>> class shows
>> - exit, moderator, file, setteings and poll menu. Those menu
>> items are connected
>> - to each command that has been declared in
>> base/mainMethods.lzx. May 24 2008
>> + <!--- Menu for public/private conference and audience room. This
>> class shows
>> + exit, moderator, file, setteings and poll menu. Those menu
>> items are connected
>> + to each command that has been declared in
>> base/mainMethods.lzx. May 24 2008
>> commented by onokeiji@gmail.com -->
>> <class name="conferenceMenubar" extends="menubar" height="28"
>> style="itemStyle">
>> @@ -83,7 +83,7 @@
>> parent._exitbtn.destroy();
>> }
>> }
>> -
>> +
>> if(canvas.isrtl == 'true'){
>> if ($debug) Debug.write("onInit : Setting
>> nokey");
>> lblImport.setCommand(cmd_importFile_nokey);
>> @@ -92,11 +92,11 @@
>> </handler>
>> <_labelMenuItem id="lblImport" labelid="15"
>> command="cmd_importFile" enabled="${
>> canvas.ismoderator }" />
>> - <!-- <menuseparator/> <_labelMenuItem
>> labelid="561" command="cmd_exportFilePNG"
>> - /> <_labelMenuItem labelid="562"
>> command="cmd_exportFileJPG" /> <_labelMenuItem
>> - labelid="563" command="cmd_exportFilePDF"
>> /> <_labelMenuItem labelid="560"
>> - command="cmd_exportFileSVG" />
>> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>> - /> <menuseparator/> <_labelMenuItem
>> name="_exitItem" labelid="309" command="cmd_quit"
>> + <!-- <menuseparator/> <_labelMenuItem
>> labelid="561" command="cmd_exportFilePNG"
>> + /> <_labelMenuItem labelid="562"
>> command="cmd_exportFileJPG" /> <_labelMenuItem
>> + labelid="563" command="cmd_exportFilePDF"
>> /> <_labelMenuItem labelid="560"
>> + command="cmd_exportFileSVG" />
>> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
>> + /> <menuseparator/> <_labelMenuItem
>> name="_exitItem" labelid="309" command="cmd_quit"
>> value="quit" /> -->
>> </_labelMenu>
>>
>> @@ -104,7 +104,7 @@
>>
>> <handler name="oninit">
>> <![CDATA[
>> -
>> +
>> if(canvas.isrtl == 'true'){
>> if ($debug) Debug.write("onInit : Setting
>> nokey");
>>
>> lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
>> @@ -112,6 +112,7 @@
>> lblPoll.setCommand(cmd_createPoll_nokey);
>>
>> lblPollResult.setCommand(cmd_pollResults_nokey);
>>
>> lblPollVote.setCommand(cmd_checkPollVoted_nokey);
>> +
>> lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
>> }
>> //hideActionsMenu
>> if(canvas.currentRoomObj.hideActionsMenu){
>> @@ -133,7 +134,7 @@
>> </handler>
>> </_labelMenuItem>
>> <menuseparator />
>> - <!-- <_labelMenuItem labelid="749"
>> command="cmd_coBrowser" enabled="${
>> + <!-- <_labelMenuItem labelid="749"
>> command="cmd_coBrowser" enabled="${
>> canvas.ismoderator }" /> <menuseparator/>
>> -->
>> <_labelMenuItem id="lblCamMic" labelid="306"
>> command="cmd_editCamMicSettings" />
>> @@ -177,14 +178,17 @@
>> <_labelMenuItem width="250" id="lblPollVote"
>> labelid="42"
>> command="cmd_checkPollVoted" />
>> <menuseparator />
>> + <_labelMenuItem width="250" id="lblShowSipDialer"
>> labelid="1447"
>> + command="cmd_showSipDialer" />
>> + <menuseparator />
>> <_labelMenuItem width="250" labelid="1126"
>> command="cmd_editWhiteboardDefault" />
>> </_labelMenu>
>> -
>> - <!-- exit room <_labelMenu labelid="308" width="250">
>> </_labelMenu> <_labelMenu
>> - labelid="301" width="250"> <_labelMenuItem
>> id="lblMod" labelid="302" command="cmd_applyforMod"
>> - /> </_labelMenu> <_labelMenu labelid="305"
>> width="250"> <_labelMenuItem labelid="306"
>> - command="cmd_editCamMicSettings" />
>> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>> +
>> + <!-- exit room <_labelMenu labelid="308" width="250">
>> </_labelMenu> <_labelMenu
>> + labelid="301" width="250"> <_labelMenuItem
>> id="lblMod" labelid="302" command="cmd_applyforMod"
>> + /> </_labelMenu> <_labelMenu labelid="305"
>> width="250"> <_labelMenuItem labelid="306"
>> + command="cmd_editCamMicSettings" />
>> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
>> /> </_labelMenu> <_labelMenu labelid="303"
>> width="250"> </_labelMenu> -->
>>
>> </class>
>> @@ -258,7 +262,7 @@
>> </handler>
>> </_labelMenuItem>
>> <menuseparator />
>> - <!-- <_labelMenuItem labelid="749"
>> command="cmd_coBrowser" enabled="${
>> + <!-- <_labelMenuItem labelid="749"
>> command="cmd_coBrowser" enabled="${
>> canvas.ismoderator }" />
>> <menuseparator/> -->
>> <_labelMenuItem labelid="306"
>> command="cmd_editCamMicSettings"
>> enabled="${ canvas.ismoderator }" />
>> @@ -358,7 +362,7 @@
>> </handler>
>> </_labelMenuItem>
>> <menuseparator />
>> - <!-- <_labelMenuItem labelid="749"
>> command="cmd_coBrowser" enabled="${
>> + <!-- <_labelMenuItem labelid="749"
>> command="cmd_coBrowser" enabled="${
>> canvas.ismoderator }" />
>> <menuseparator/> -->
>> <_labelMenuItem labelid="306"
>> command="cmd_editCamMicSettings"
>> enabled="${ canvas.ismoderator }" />
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
>> Mon Mar 26 09:14:15 2012
>> @@ -65,6 +65,7 @@
>> <include href="restricted/" />
>> <include href="browser/" />
>> <include href="testsetup/" />
>> + <include href="sip/" />
>>
>> <include href="flexibleConferenceRoom/" />
>>
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/library.lzx
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,6 @@
>> +<?xml version="1.0" encoding="UTF-8" ?>
>> +<library>
>> +
>> + <include href="sipDialer.lzx" />
>> +
>> +</library>
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/sip/sipDialer.lzx
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,81 @@
>> +<?xml version="1.0" encoding="UTF-8" ?>
>> +<library>
>> +
>> +<class name="sipDialer" extends="window" bgcolor="gray" width="200">
>> + <simplelayout axis="y" spacing="5"/>
>> + <labelText labelid="1003"/>
>> + <view name="phoneNumber" width="100%">
>> + <inputtext name="input"
>> width="$once{parent.width-parent.del.width}" height="20" bgcolor="white"/>
>> + <button name="del" x="$once{parent.input.width}" width="30"
>> height="20" onclick="this.del();">
>> + â†
>> + <method name="del">
>> + var t = parent.input.text;
>> + if(t.length != 0) {
>> + t = t.substr(0, t.length - 1);
>> + parent.input.setAttribute('text', t);
>> + }
>> + </method>
>> + </button>
>> + </view>
>> +
>> + <view name="dialerButtons" align="center">
>> + <vbox spacing="5">
>> + <hbox spacing="5">
>> + <button onclick="parent.parent.parent.parent.dial('1')"
>> width="40">1</button>
>> + <button onclick="parent.parent.parent.parent.dial('2')"
>> width="40">2</button>
>> + <button onclick="parent.parent.parent.parent.dial('3')"
>> width="40">3</button>
>> + </hbox>
>> + <hbox spacing="5">
>> + <button onclick="parent.parent.parent.parent.dial('4')"
>> width="40">4</button>
>> + <button onclick="parent.parent.parent.parent.dial('5')"
>> width="40">5</button>
>> + <button onclick="parent.parent.parent.parent.dial('6')"
>> width="40">6</button>
>> + </hbox>
>> + <hbox spacing="5">
>> + <button onclick="parent.parent.parent.parent.dial('7')"
>> width="40">7</button>
>> + <button onclick="parent.parent.parent.parent.dial('8')"
>> width="40">8</button>
>> + <button onclick="parent.parent.parent.parent.dial('9')"
>> width="40">9</button>
>> + </hbox>
>> + <hbox spacing="5">
>> + <button onclick="parent.parent.parent.parent.dial('*')"
>> width="40">*</button>
>> + <button onclick="parent.parent.parent.parent.dial('0')"
>> width="40">0</button>
>> + <button onclick="parent.parent.parent.parent.dial('#')"
>> width="40">#</button>
>> + </hbox>
>> + </vbox>
>> + </view>
>> + <hbox spacing="10" align="center">
>> + <simpleLabelButton labelid="1448" name="callButton">
>> + <handler name="onclick">
>> + parent.parent.joinToConfCall.doCall();
>> + </handler>
>> + </simpleLabelButton>
>> + <simpleLabelButton labelid="85" name="closeButton">
>> + <handler name="onclick">
>> + canvas.sipDialer = null;
>> + parent.parent.destroy();
>> + </handler>
>> + </simpleLabelButton>
>> + </hbox>
>> + <handler name="oninit">
>> + if(canvas.sipDialer != null) {
>> + canvas.sipDialer.destroy();
>> + }
>> + canvas.setAttribute('sipDialer', this);
>> + this.bringToFront();
>> + </handler>
>> +
>> + <method name="dial" args="digit">
>> + this.phoneNumber.input.setAttribute('text',
>> this.phoneNumber.input.text + digit);
>> + </method>
>> +
>> + <netRemoteCallHib name="joinToConfCall" funcname="joinToConfCall"
>> remotecontext="$once{ canvas.thishib }">
>> + <netparam><method name="getValue">return
>> parent.parent.phoneNumber.input.text</method></netparam>
>> + <handler name="ondata" args="value">
>> + <![CDATA[
>> + //The onResult-Handler will be called be the rtmpconnection
>> + if($debug) Debug.write("joinToConfCall : ",value);
>> + ]]>
>> + </handler>
>> + </netRemoteCallHib>
>> +</class>
>> +
>> +</library>
>> \ No newline at end of file
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
>> Mon Mar 26 09:14:15 2012
>> @@ -67,6 +67,9 @@
>>
>> <class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
>>
>> <class>org.openmeetings.app.persistence.beans.user.Users</class>
>>
>> <class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
>> +
>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
>> +
>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
>> +
>> <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
>> <exclude-unlisted-classes>false</exclude-unlisted-classes>
>> <properties>
>> <property
>> name="openjpa.ConnectionProperties"
>> @@ -83,7 +86,8 @@
>> <property name="openjpa.Log"
>> value="DefaultLevel=WARN, Tool=INFO" />
>> <property
>> name="openjpa.ConnectionDriverName"
>> value="org.apache.commons.dbcp.BasicDataSource"/>
>> <property name="openjpa.DataCache"
>> value="true"/>
>> - <property name="openjpa.QueryCache"
>> value="true"/>
>> + <!-- QueryCache disabled due to changes outside of JPA
>> doesn't take effect with caching -->
>> + <property name="openjpa.QueryCache"
>> value="false"/>
>> <property name="openjpa.jdbc.DBDictionary"
>> value="batchLimit=100,tableType=myisam"/>
>> <property name="openjpa.jdbc.QuerySQLCache"
>> value="false"/>
>> </properties>
>>
>> Modified: incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> --- incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
>> (original)
>> +++ incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Mon
>> Mar 26 09:14:15 2012
>> @@ -331,7 +331,36 @@ function checkEmail()
>>
>> </i></p>
>>
>> - </fieldset>
>> + </fieldset>
>> +
>> + <fieldset id="red5sip">
>> + <legend>red5SIP Configuration</legend>
>> +
>> + <li>
>> + <label for="red5sip_enable">Enable SIP</label>
>> + <select name="red5sip_enable" id="red5sip_enable" size="1">
>> + <option value="yes">Yes</option>
>> + <option value="no" selected>No</option>
>> + </select><br />
>> + </li>
>> + <p><i>
>> + Enable red5SIP integration
>> + </i></p>
>> + <br />
>> +
>> + <li>
>> + <label for="red5sip_room_prefix">SIP rooms prefix</label>
>> + <input name="red5sip_room_prefix" id="red5sip_room_prefix"
>> size="27" title="" type="text" value="400" />
>> + <p><i>Prefix for phone number of conference rooms</i></p>
>> + </li>
>> +
>> + <li>
>> + <label for="red5sip_exten_context">SIP extensions context</label>
>> + <input name="red5sip_exten_context" id="red5sip_exten_context"
>> size="27" title="" type="text" value="rooms" />
>> + <p><i>Context of Asterisk extensions</i></p>
>> + </li>
>> +
>> + </fieldset>
>>
>> <fieldset id="sip">
>>
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
>> Mon Mar 26 09:14:15 2012
>> @@ -35,17 +35,24 @@ import javax.persistence.criteria.Root;
>>
>> import org.openmeetings.app.conference.session.RoomClient;
>> import org.openmeetings.app.data.basic.AuthLevelmanagement;
>> +import org.openmeetings.app.data.basic.Configurationmanagement;
>> import org.openmeetings.app.data.beans.basic.SearchResult;
>> import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
>> import org.openmeetings.app.data.user.Organisationmanagement;
>> import org.openmeetings.app.data.user.dao.UsersDaoImpl;
>> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>> import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
>> import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
>> import org.openmeetings.app.persistence.beans.rooms.Rooms;
>> import org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
>> import org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
>> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>> import org.openmeetings.app.persistence.beans.user.Users;
>> import org.openmeetings.app.remote.red5.ClientListManager;
>> +import org.openmeetings.app.sip.api.impl.asterisk.AsteriskDbSipClient;
>> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>> +import
>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>> import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
>> import org.red5.logging.Red5LoggerFactory;
>> import org.slf4j.Logger;
>> @@ -71,6 +78,8 @@ public class Roommanagement {
>> @Autowired
>> private OpenXGHttpClient openXGHttpClient;
>> @Autowired
>> + private AsteriskDbSipClient asteriskDbSipClient;
>> + @Autowired
>> private RoomModeratorsDaoImpl roomModeratorsDao;
>> @Autowired
>> private UsersDaoImpl usersDao;
>> @@ -78,6 +87,8 @@ public class Roommanagement {
>> private AuthLevelmanagement authLevelManagement;
>> @Autowired
>> private ClientListManager clientListManager;
>> + @Autowired
>> + private Configurationmanagement cfgManagement;
>>
>> /**
>> * add a new Record to the table roomtypes
>> @@ -102,6 +113,20 @@ public class Roommanagement {
>>
>> public Long addRoom(Rooms room) {
>> try {
>> + /* Red5SIP integration
>> *******************************************************************************/
>> + Configuration conf = cfgManagement.getConfKey(3L,
>> "red5sip.enable");
>> + if(conf != null && conf.getConf_value().equals("yes")) {
>> + if(room.getSipNumber() != null &&
>> !room.getSipNumber().isEmpty()) {
>> + asteriskDbSipClient.createSIPConference(new
>> SIPCreateConferenceRequest(room.getSipNumber()));
>> + } else {
>> + SipCreateConferenceRequestResult requestResult =
>> asteriskDbSipClient.createSIPConference(new SIPCreateConferenceRequest());
>> + if(!requestResult.hasError()) {
>> +
>> room.setSipNumber(requestResult.getConferenceNumber());
>> +
>> room.setConferencePin(requestResult.getConferencePin());
>> + }
>> + }
>> + }
>> +
>> /*****************************************************************************************************/
>> room.setStarttime(new Date());
>> room = em.merge(room);
>> long returnId = room.getRooms_id();
>> @@ -719,6 +744,25 @@ public class Roommanagement {
>> return null;
>> }
>>
>> + /**
>> + * Returns number of SIP conference participants
>> + * @param rooms_id id of room
>> + * @return number of participants
>> + */
>> + public Integer getSipConferenceMembersNumber(Long rooms_id) {
>> + Configuration conf = cfgManagement.getConfKey(3L,
>> "red5sip.enable");
>> + if(conf != null && conf.getConf_value().equals("yes")) {
>> + Rooms rooms = this.getRoomById(rooms_id);
>> + if(rooms != null) {
>> + return
>> asteriskDbSipClient.getConferenceMembersNumber(rooms.getSipNumber());
>> + } else {
>> + return 0;
>> + }
>> + } else {
>> + return null;
>> + }
>> + }
>> +
>> /**
>> * adds a new Record to the table rooms
>> * @param name
>> @@ -793,6 +837,19 @@ public class Roommanagement {
>>
>> r.setConferencePin(openXGReturnObject.getConferencePin());
>> }
>>
>> + /* Red5SIP integration
>> *******************************************************************************/
>> + Configuration conf = cfgManagement.getConfKey(3L,
>> "red5sip.enable");
>> + if(conf != null && conf.getConf_value().equals("yes")) {
>> + SipCreateConferenceRequestResult requestResult =
>> asteriskDbSipClient
>> + .createSIPConference(new
>> SIPCreateConferenceRequest());
>> +
>> + if(!requestResult.hasError()) {
>> +
>> r.setSipNumber(requestResult.getConferenceNumber());
>> +
>> r.setConferencePin(requestResult.getConferencePin());
>> + }
>> + }
>> +
>> /*****************************************************************************************************/
>> +
>> r = em.merge(r);
>> long returnId = r.getRooms_id();
>>
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
>> Mon Mar 26 09:14:15 2012
>> @@ -252,7 +252,8 @@ public class ImportInitvalues {
>> String openxg_client_domain, String
>> openxg_community_code,
>> String openxg_language_code, String openxg_adminid,
>> String sip_language_phonecode, String
>> sip_phonerange_start,
>> - String sip_phonerange, String jodPath) {
>> + String sip_phonerange, String jodPath,
>> + String red5sip_enable, String red5sip_room_prefix,String
>> red5sip_exten_context) {
>>
>> cfgManagement
>> .addConfByKey(
>> @@ -349,6 +350,18 @@ public class ImportInitvalues {
>> cfgManagement.addConfByKey(3, "default.rpc.userid", "" + 1,
>> null,
>> "The User-Id of the Control User in
>> OpenMeetings");
>>
>> + // ***************************************
>> + // ***************************************
>> + // red5SIP Integration Coniguration Values
>> + // ***************************************
>> +
>> + cfgManagement.addConfByKey(3, "red5sip.enable", red5sip_enable,
>> null,
>> + "Enable to enable the red5SIP integration
>> ");
>> + cfgManagement.addConfByKey(3, "red5sip.room_prefix",
>> red5sip_room_prefix, null,
>> + "Enable to enable the red5SIP integration
>> ");
>> + cfgManagement.addConfByKey(3, "red5sip.exten_context",
>> red5sip_exten_context, null,
>> + "Enable to enable the red5SIP integration
>> ");
>> +
>> // ***************************************
>> // ***************************************
>> // SIP Applet Configuration Values
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
>> Mon Mar 26 09:14:15 2012
>> @@ -19,6 +19,7 @@
>> package org.openmeetings.app.remote.red5;
>>
>> import java.io.File;
>> +import java.io.IOException;
>> import java.util.ArrayList;
>> import java.util.Collection;
>> import java.util.Date;
>> @@ -437,6 +438,40 @@ public class ScopeApplicationAdapter ext
>> return null;
>> }
>>
>> + public synchronized List<Integer> listRoomBroadcast() {
>> + List<Integer> broadcastList = new ArrayList<Integer>();
>> + IConnection current = Red5.getConnectionLocal();
>> + String streamid = current.getClient().getId();
>> + Collection<Set<IConnection>> conCollection =
>> current.getScope().getConnections();
>> + for (Set<IConnection> conset : conCollection) {
>> + for (IConnection conn : conset) {
>> + if (conn != null) {
>> + RoomClient rcl = this.clientListManager
>> + .getClientByStreamId(conn
>> + .getClient().getId());
>> + if (rcl == null) {
>> + // continue;
>> + } else if (rcl.getIsScreenClient() != null
>> + && rcl.getIsScreenClient()) {
>> + // continue;
>> + } else {
>> + if (!streamid.equals(rcl.getStreamid())) {
>> + // It is not needed to send back
>> + // that event to the actuall
>> + // Moderator
>> + // as it will be already triggered
>> + // in the result of this Function
>> + // in the Client
>> +
>> broadcastList.add(Long.valueOf(rcl.getBroadCastID()).intValue());
>> + }
>> + }
>> + }
>> + }
>> + }
>> + return broadcastList;
>> + }
>> +
>> +
>> /**
>> * this function is invoked directly after initial connecting
>> *
>> @@ -2923,4 +2958,99 @@ public class ScopeApplicationAdapter ext
>> }
>> return null;
>> }
>> +
>> + /*
>> + * SIP transport methods
>> + */
>> +
>> + public synchronized void updateSipTransport() {
>> + IConnection current = Red5.getConnectionLocal();
>> + String streamid = current.getClient().getId();
>> + RoomClient currentClient =
>> this.clientListManager.getClientByStreamId(streamid);
>> + log.debug("getSipConferenceMembersNumber: " +
>> roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id()));
>> + String newNumber =
>> "("+Integer.toString(roommanagement.getSipConferenceMembersNumber(currentClient.getRoom_id())-1)+")";
>> + if(!newNumber.equals(currentClient.getLastname())) {
>> + currentClient.setLastname(newNumber);
>> + this.clientListManager.updateClientByStreamId(streamid,
>> currentClient);
>> + log.debug("updateSipTransport: {}, {}, {}, {}", new
>> Object[]{currentClient.getPublicSID(),
>> + currentClient.getRoom_id(),
>> currentClient.getFirstname(), currentClient.getLastname()});
>> + sendMessageWithClient(new
>> String[]{"personal",currentClient.getFirstname(),currentClient.getLastname()});
>> + }
>> + }
>> +
>> + /**
>> + * Perform call to specified phone number and join to conference
>> + * @param number to call
>> + */
>> + public synchronized void joinToConfCall(String number) {
>> + IConnection current = Red5.getConnectionLocal();
>> + String streamid = current.getClient().getId();
>> + RoomClient currentClient =
>> this.clientListManager.getClientByStreamId(streamid);
>> + Rooms rooms =
>> roommanagement.getRoomById(currentClient.getRoom_id());
>> + log.debug("asterisk -rx \"originate Local/" + number + "@rooms
>> extension " + rooms.getSipNumber() + "@rooms\"");
>> + try {
>> + Process proc = Runtime.getRuntime().exec(new
>> String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms extension
>> " + rooms.getSipNumber() + "@rooms"});
>> + } catch (IOException e) {
>> + log.error("Executing asterisk originate error: ", e);
>> + }
>> + }
>> +
>> + public synchronized String getSipNumber(Long room_id) {
>> + Rooms rooms = roommanagement.getRoomById(room_id);
>> + if(rooms != null) {
>> + log.debug("getSipNumber: room_id: {}, sipNumber: {}", new
>> Object[]{room_id, rooms.getSipNumber()});
>> + return rooms.getSipNumber();
>> + }
>> + return null;
>> + }
>> +
>> + public synchronized void setSipTransport(Long room_id, String
>> publicSID, String broadCastId) {
>> + IConnection current = Red5.getConnectionLocal();
>> + String streamid = current.getClient().getId();
>> + Rooms room = roommanagement.getRoomById(room_id);
>> + // Notify all clients of the same scope (room)
>> + RoomClient currentClient =
>> this.clientListManager.getClientByStreamId(streamid);
>> + currentClient.setRoom_id(room_id);
>> + currentClient.setRoomEnter(new Date());
>> + currentClient.setFirstname("SIP Transport");
>> +
>> currentClient.setLastname("("+Integer.toString(roommanagement.getSipConferenceMembersNumber(room_id)-1)+")");
>> + currentClient.setBroadCastID(Long.parseLong(broadCastId));
>> + currentClient.setIsBroadcasting(true);
>> + currentClient.setPublicSID(publicSID);
>> + currentClient.setAvsettings("av");
>> + currentClient.setVWidth(120);
>> + currentClient.setVHeight(90);
>> + this.clientListManager.updateClientByStreamId(streamid,
>> currentClient);
>> +
>> + Collection<Set<IConnection>> conCollection = current
>> + .getScope().getConnections();
>> + for (Set<IConnection> conset : conCollection) {
>> + for (IConnection conn : conset) {
>> + if (conn != null) {
>> + RoomClient rcl =
>> this.clientListManager.getClientByStreamId(conn.getClient().getId());
>> + if (rcl == null) {
>> + // continue;
>> + } else if (rcl.getIsScreenClient() != null
>> + && rcl.getIsScreenClient()) {
>> + // continue;
>> + } else {
>> + if (!streamid.equals(rcl.getStreamid())) {
>> + // It is not needed to send back
>> + // that event to the actuall
>> + // Moderator
>> + // as it will be already triggered
>> + // in the result of this Function
>> + // in the Client
>> + if (conn instanceof
>> IServiceCapableConnection) {
>> + ((IServiceCapableConnection)
>> conn).invoke("addNewUser", new Object[]{currentClient}, this);
>> + ((IServiceCapableConnection)
>> conn).invoke("newStream", new Object[]{currentClient}, this);
>> + log.debug("sending setSipTransport to "
>> + + conn);
>> + }
>> + }
>> + }
>> + }
>> + }
>> + }
>> + }
>> }
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,19 @@
>> +package org.openmeetings.app.sip.api;
>> +
>> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>> +import
>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>> +
>> +/**
>> + * SIP client interface
>> + */
>> +public interface ISIPClient {
>> +
>> + SIPCreateUserRequestResult createSIPUser(SIPCreateUserRequest
>> request);
>> +
>> + SipCreateConferenceRequestResult
>> createSIPConference(SIPCreateConferenceRequest request);
>> +
>> + Integer getConferenceMembersNumber(String sipNumber);
>> +
>> +}
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,58 @@
>> +package org.openmeetings.app.sip.api.impl.asterisk;
>> +
>> +import org.openmeetings.app.persistence.beans.rooms.Rooms;
>> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>> +import org.openmeetings.app.sip.api.ISIPClient;
>> +import org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
>> +import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
>> +import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
>> +import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
>> +import
>> org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
>> +import org.springframework.beans.factory.annotation.Autowired;
>> +/**
>> + *
>> + */
>> +public class AsteriskDbSipClient implements ISIPClient {
>> +
>> + @Autowired
>> + private AsteriskDAOImpl asteriskDAO;
>> +
>> + public SIPCreateUserRequestResult createSIPUser(final
>> SIPCreateUserRequest request) {
>> + asteriskDAO.addSipUser(request.getLogin(), request.getPassword());
>> + return new SIPCreateUserRequestResult() {
>> + @Override
>> + public UserSipData getUserSipData() {
>> + UserSipData sipData = new UserSipData();
>> + sipData.setAuthId(request.getLogin());
>> + sipData.setUserpass(request.getPassword());
>> + sipData.setUsername(request.getLogin());
>> + return sipData;
>> + }
>> +
>> + public boolean hasError() {
>> + return false;
>> + }
>> +
>> + public String getErrorMessage() {
>> + return null;
>> + }
>> + };
>> + }
>> +
>> + public SipCreateConferenceRequestResult
>> createSIPConference(SIPCreateConferenceRequest request) {
>> + String confno = asteriskDAO.addMeetMeConference();
>> + return new SipCreateConferenceRequestResult(confno, "") {
>> + public boolean hasError() {
>> + return false;
>> + }
>> +
>> + public String getErrorMessage() {
>> + return null;
>> + }
>> + };
>> + }
>> +
>> + public Integer getConferenceMembersNumber(String sipNumber) {
>> + return asteriskDAO.getConferensMembersNumber(sipNumber);
>> + }
>> +}
>> \ No newline at end of file
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,76 @@
>> +package org.openmeetings.app.sip.api.impl.asterisk.dao;
>> +
>> +import org.openmeetings.app.OpenmeetingsVariables;
>> +import org.openmeetings.app.data.basic.Configurationmanagement;
>> +import org.openmeetings.app.persistence.beans.basic.Configuration;
>> +import
>> org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
>> +import org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
>> +import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
>> +import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
>> +import org.red5.logging.Red5LoggerFactory;
>> +import org.slf4j.Logger;
>> +import org.springframework.transaction.annotation.Transactional;
>> +import org.springframework.beans.factory.annotation.Autowired;
>> +
>> +import javax.persistence.EntityManager;
>> +import javax.persistence.PersistenceContext;
>> +
>> +@Transactional
>> +public class AsteriskDAOImpl {
>> +
>> + private static final Logger log =
>> Red5LoggerFactory.getLogger(AsteriskDAOImpl.class,
>> OpenmeetingsVariables.webAppRootKey);
>> + private static final String DEFAULT_SIP_CONTEXT = "rooms";
>> + @PersistenceContext
>> + private EntityManager em;
>> + @Autowired
>> + private Configurationmanagement cfgManagement;
>> +
>> + public void addSipUser(String username, String secret) {
>> + AsteriskSipUsers u = new AsteriskSipUsers();
>> + Configuration conf =
>> cfgManagement.getConfKey(3L,"red5sip.exten_context");
>> + String defaultRoomContext = "rooms";
>> + if(conf != null && !conf.getConf_value().isEmpty()) {
>> + defaultRoomContext = conf.getConf_value();
>> + }
>> + u.setName(username);
>> + u.setSecret(secret);
>> + u.setContext(defaultRoomContext);
>> + u.setHost("dynamic");
>> + Extensions e = new Extensions();
>> + e.setApp("Dial");
>> + e.setAppdata("SIP/" + username);
>> + e.setExten(username);
>> + e.setContext(defaultRoomContext);
>> + e.setPriority(1);
>> + em.persist(u);
>> + em.persist(e);
>> + }
>> +
>> + public String addMeetMeConference() {
>> + int count = ((Number)em.createQuery("SELECT COUNT(m.confno) FROM
>> MeetMe AS m").getSingleResult()).intValue();
>> +
>> + Configuration conf =
>> cfgManagement.getConfKey(3L,"red5sip.room_prefix");
>> + String prefix = DEFAULT_SIP_CONTEXT;
>> + if(conf != null) {
>> + prefix = conf.getConf_value();
>> + }
>> + String confno = prefix+(count+1);
>> + MeetMe mm = new MeetMe();
>> + mm.setConfno(confno);
>> + Extensions e = new Extensions();
>> + e.setApp("MeetMe");
>> + e.setAppdata(confno + ",dM");
>> + e.setExten(confno);
>> + e.setContext("rooms");
>> + e.setPriority(1);
>> + em.persist(mm);
>> + em.persist(e);
>> + return confno;
>> + }
>> +
>> + public Integer getConferensMembersNumber(String confNo) {
>> + return ((Number)em.createQuery("SELECT m.members FROM MeetMe AS m
>> WHERE m.confno=:confno")
>> + .setParameter("confno", confNo)
>> + .getSingleResult()).intValue();
>> + }
>> +}
>> \ No newline at end of file
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,8 @@
>> +package org.openmeetings.app.sip.api.request;
>> +
>> +/**
>> + * Base interface for SIP API requests
>> + */
>> +public interface ISIPRequest {
>> +
>> +}
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/ISIPRequest.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,17 @@
>> +package org.openmeetings.app.sip.api.request;
>> +
>> +/**
>> + * Create SIP conferece request
>> + */
>> +public class SIPCreateConferenceRequest implements ISIPRequest {
>> + private String sipNumber;
>> +
>> + public SIPCreateConferenceRequest() {
>> + super(); //To change body of overridden methods use File |
>> Settings | File Templates.
>> + }
>> +
>> + public SIPCreateConferenceRequest(String sipNumber) {
>> + super();
>> + this.sipNumber = sipNumber;
>> + }
>> +}
>> \ No newline at end of file
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,72 @@
>> +package org.openmeetings.app.sip.api.request;
>> +
>> +/**
>> + * Create User Request
>> + */
>> +public class SIPCreateUserRequest implements ISIPRequest {
>> +
>> + protected String firstName;
>> + protected String middleName;
>> + protected String lastName;
>> + protected String email;
>> + protected String login;
>> + protected String password;
>> +
>> +
>> + public SIPCreateUserRequest(String firstName, String middleName,
>> String lastName, String email, String login, String password) {
>> + this.firstName = firstName;
>> + this.middleName = middleName;
>> + this.lastName = lastName;
>> + this.email = email;
>> + this.login = login;
>> + this.password = password;
>> + }
>> +
>> + public void withFirstName(String firstName) {
>> + this.firstName = firstName;
>> + }
>> +
>> + public void withMiddleName(String middleName) {
>> + this.middleName = middleName;
>> + }
>> +
>> + public void withLastName(String lastName) {
>> + this.lastName = lastName;
>> + }
>> +
>> + public void withEmail(String email) {
>> + this.email = email;
>> + }
>> +
>> + public void withLogin(String login) {
>> + this.login = login;
>> + }
>> +
>> + public void withPassword(String password) {
>> + this.password = password;
>> + }
>> +
>> + public String getFirstName() {
>> + return firstName;
>> + }
>> +
>> + public String getMiddleName() {
>> + return middleName;
>> + }
>> +
>> + public String getLastName() {
>> + return lastName;
>> + }
>> +
>> + public String getEmail() {
>> + return email;
>> + }
>> +
>> + public String getLogin() {
>> + return login;
>> + }
>> +
>> + public String getPassword() {
>> + return password;
>> + }
>> +}
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateUserRequest.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,12 @@
>> +package org.openmeetings.app.sip.api.result;
>> +
>> +/**
>> + * * Base interface for SIP API request's resuslt
>> + */
>> +public interface ISIPRequestResult {
>> +
>> + boolean hasError();
>> +
>> + String getErrorMessage();
>> +
>> +}
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,12 @@
>> +package org.openmeetings.app.sip.api.result;
>> +
>> +import org.openmeetings.app.persistence.beans.user.UserSipData;
>> +
>> +/**
>> + * TODO
>> + */
>> +public abstract class SIPCreateUserRequestResult implements
>> ISIPRequestResult {
>> +
>> + abstract public UserSipData getUserSipData();
>> +
>> +}
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1305274&view=auto
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> (added)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>> Mon Mar 26 09:14:15 2012
>> @@ -0,0 +1,26 @@
>> +package org.openmeetings.app.sip.api.result;
>> +
>> +/**
>> + * TODO
>> + */
>> +public abstract class SipCreateConferenceRequestResult implements
>> ISIPRequestResult {
>> +
>> + protected String conferenceNumber;
>> + protected String conferencePin;
>> +
>> + protected SipCreateConferenceRequestResult() {
>> + }
>> +
>> + protected SipCreateConferenceRequestResult(String conferenceNumber,
>> String conferencePin) {
>> + this.conferenceNumber = conferenceNumber;
>> + this.conferencePin = conferencePin;
>> + }
>> +
>> + public String getConferenceNumber() {
>> + return conferenceNumber;
>> + }
>> +
>> + public String getConferencePin() {
>> + return conferencePin;
>> + }
>> +}
>>
>> Propchange:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
>> Mon Mar 26 09:14:15 2012
>> @@ -285,6 +285,14 @@ public class Install extends VelocityVie
>> String screen_viewer =
>> httpServletRequest
>>
>> .getParameter("screen_viewer");
>>
>> + // red5sip integration config
>> + String red5sip_enable = httpServletRequest
>> +
>> .getParameter("red5sip_enable");
>> + String red5sip_room_prefix = httpServletRequest
>> +
>> .getParameter("red5sip_room_prefix");
>> + String red5sip_exten_context = httpServletRequest
>> +
>> .getParameter("red5sip_exten_context");
>> +
>> // SIP Applet Configuration
>> String sip_enable =
>> httpServletRequest
>>
>> .getParameter("sip_enable");
>> @@ -369,7 +377,8 @@ public class Install extends VelocityVie
>>
>> openxg_community_code, openxg_language_code,
>> openxg_adminid,
>> sip_language_phonecode,
>>
>> sip_phonerange_start, sip_phonerange,
>> - jodPath);
>> + jodPath,
>> + red5sip_enable, red5sip_room_prefix,
>> red5sip_exten_context);
>>
>>
>> getImportInitvalues().loadInitUserAndOrganisation(username,
>> userpass,
>> useremail, orgname, timeZone, configdefaultLang);
>>
>> Modified:
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1305274&r1=1305273&r2=1305274&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>> (original)
>> +++
>> incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
>> Mon Mar 26 09:14:15 2012
>> @@ -84,6 +84,9 @@ public abstract class AbstractOpenmeetin
>> private static final String sip_phonerange_start = "";
>> private static final String sip_phonerange = "";
>> private static final String jodPath = "./jod/lib";
>> + private static final String red5sip_enable = "no";
>> + private static final String red5sip_room_prefix = "400";
>> + private static final String red5sip_exten_context = "rooms";
>> protected static final String username = "junit";
>> protected static final String userpass = "test";
>> private static final String orgname = "smoketest";
>> @@ -181,7 +184,7 @@ public abstract class AbstractOpenmeetin
>> openxg_client_id, openxg_client_secret,
>> openxg_client_domain,
>> openxg_community_code,
>> openxg_language_code, openxg_adminid,
>> sip_language_phonecode,
>> sip_phonerange_start, sip_phonerange,
>> - jodPath);
>> + jodPath, red5sip_enable,
>> red5sip_room_prefix, red5sip_exten_context);
>>
>> importInitvalues.loadInitUserAndOrganisation(username,
>> userpass,
>> useremail, orgname, timeZone,
>> configdefaultLang);
>>
>>
>>
>
>
> --
> Sebastian Wagner
> http://www.openmeetings.de
> http://incubator.apache.org/openmeetings/
> http://www.webbase-design.de
> http://www.wagner-sebastian.com
> seba.wagner@gmail.com