Author: solomax
Date: Tue Aug 12 16:23:17 2014
New Revision: 1617520

URL: http://svn.apache.org/r1617520
Log:
Site was updated

Modified:
    
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/LdapAndADS.xml
    
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/PortSettings.xml
    
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
    
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
    
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
    openmeetings/trunk/site/LdapAndADS.html
    openmeetings/trunk/site/PortSettings.html
    openmeetings/trunk/site/red5sip-integration_2.0.html
    openmeetings/trunk/site/red5sip-integration_2.1.html
    openmeetings/trunk/site/red5sip-integration_3.0.html

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/LdapAndADS.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/LdapAndADS.xml?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/LdapAndADS.xml
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/LdapAndADS.xml
 Tue Aug 12 16:23:17 2014
@@ -26,30 +26,30 @@
                <section name="Ubuntu Installation">
                        <div>
                                Run the commands
-                               <blockquote>
-                                       <i>
-                                               sudo apt-get install slapd 
ldap-utils
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo apt-get install slapd ldap-utils
+]]>
+                               </source>
                        </div>
                        <div>
                                Modify file <tt>/etc/ldap/ldap.conf</tt> add 
highlighted attributes:
-                               <blockquote>
-                                       <i>
-                                               #<br />
-                                               # LDAP Defaults<br />
-                                               #<br />
-                                               # See ldap.conf(5) for 
details<br />
-                                               # This file should be world 
readable but not world writable.<br />
-                                               <b>BASE    dc=unixmen,dc=com<br 
/>
-                                               URI     
ldap://192.168.1.200</b><br />
-                                               #SIZELIMIT      12<br />
-                                               #TIMELIMIT      15<br />
-                                               #DEREF          never<br />
-                                               # TLS certificates (needed for 
GnuTLS)<br />
-                                               TLS_CACERT      
/etc/ssl/certs/ca-certificates.crt<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+#
+# LDAP Defaults
+#
+# See ldap.conf(5) for details
+# This file should be world readable but not world writable.
+BASE    dc=unixmen,dc=com
+URI     ldap://192.168.1.200
+#SIZELIMIT      12
+#TIMELIMIT      15
+#DEREF          never
+# TLS certificates (needed for GnuTLS)
+TLS_CACERT      /etc/ssl/certs/ca-certificates.crt
+]]>
+                               </source>
                        </div>
                        <div>
                                Run the Configuration assistant: <tt>sudo 
dpkg-reconfigure slapd</tt>

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/PortSettings.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/PortSettings.xml?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/PortSettings.xml
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/PortSettings.xml
 Tue Aug 12 16:23:17 2014
@@ -49,9 +49,7 @@
                                        browser cache after changing the file.
                                </li>
                                <li>
-                                       <blockquote>Every server side 
configuration has a client side
-                                               representative
-                                       </blockquote>
+                                       <blockquote>Every server side 
configuration has a client side representative</blockquote>
                                </li>
                        </ul>
                        <p></p>

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
 Tue Aug 12 16:23:17 2014
@@ -36,158 +36,144 @@
         <section name="Setup Asterisk">
                        <div>
                 Run the commands
-                <blockquote>
-                    <i>
-                    sudo apt-get update<br/>
-                    sudo apt-get install asterisk asterisk-mysql
-                    </i>
-                </blockquote>
+                               <source>
+<![CDATA[
+sudo apt-get update
+sudo apt-get install asterisk asterisk-mysql
+]]>
+                               </source>
             </div>
             <div>
                 Ubuntu 10.04 has broken asterisk-mysql version. For other 
distribution next commands not needed:
-                <blockquote>
-                    <i>
-                        aptitude purge asterisk-mysql
-                        <br/>
-                        cd /tmp
-                        <br/>
-                        apt-get build-dep asterisk-mysql
-                        <br/>
-                        apt-get -b source asterisk-mysql
-                        <br/>
-                        dpkg -i asterisk-mysql_1.6.2.0-1_i386.deb
-                    </i>
-
-                </blockquote>
+                               <source>
+<![CDATA[
+aptitude purge asterisk-mysql
+cd /tmp
+apt-get build-dep asterisk-mysql
+apt-get -b source asterisk-mysql
+dpkg -i asterisk-mysql_1.6.2.0-1_i386.deb
+]]>
+                               </source>
             </div>
             <div>
                 Enable asterisk mysql realtime module:<br/><br/>
                 Add string
-                <blockquote>
-                    <i>load => res_config_mysql.so</i>
-                </blockquote>
+                               <source>
+<![CDATA[
+load => res_config_mysql.so
+]]>
+                               </source>
                 to the /etc/asterisk/modules.conf into the "modules" section.
             </div>
             <div>
                 Configure mysql realtime module:<br/><br/>
 
                 Create file /etc/asterisk/res_mysql.conf and add lines:
-                <blockquote>
-                    <i>[general]
-                        <br/>
-                        dbhost=127.0.0.1
-                        <br/>
-                        dbname=openmeetings
-                        <br/>
-                        dbuser=root
-                        <br/>
-                        dbpass=
-                        <br/>
-                        dbport=3306
-                    </i>
-
-                </blockquote>
+                               <source>
+<![CDATA[
+[general]
+dbhost=127.0.0.1
+dbname=openmeetings
+dbuser=root
+dbpass=
+dbport=3306
+]]>
+                               </source>
             </div>
             <div>
                 Add next lines into the /etc/asterisk/extconfig.conf:
-                <blockquote>
-                    <i>[settings]
-                        <br/>
-                        sipusers => mysql,general,sipusers
-                        <br/>
-                        sippeers => mysql,general,sipusers
-                        <br/>
-                        extensions => mysql,general,extensions
-                        <br/>
-                        meetme => mysql,general,meetme
-                    </i>
-
-                </blockquote>
+                               <source>
+<![CDATA[
+[settings]
+sipusers => mysql,general,sipusers
+sippeers => mysql,general,sipusers
+extensions => mysql,general,extensions
+meetme => mysql,general,meetme
+]]>
+                               </source>
             </div>
             <div>
                 Add next lines into the /etc/asterisk/extensions.conf:
-                <blockquote>
-                    <i>[rooms]
-                        <br/>
-                        switch => Realtime/@
-                    </i>
-
-                </blockquote>
+                               <source>
+<![CDATA[
+[rooms]
+switch => Realtime/@
+]]>
+                               </source>
             </div>
 
             <div>
                 Restart asterisk:
-                <blockquote>
-                    <i>service asterisk restart</i>
-                </blockquote>
+                               <source>
+<![CDATA[
+service asterisk restart
+]]>
+                               </source>
                 Insert, for example, SIP user with name 'test':
-                <blockquote>
-                    <i>
-                        INSERT INTO sipusers (allow, context, disallow, host, 
name, secret) VALUES ('ulaw' , 'rooms', NULL, 'dynamic' , 'test', '12345');
-                    </i>
-                </blockquote>
+                               <source>
+<![CDATA[
+INSERT INTO sipusers (allow, context, disallow, host, name, secret) VALUES 
('ulaw' , 'rooms', NULL, 'dynamic' , 'test', '12345');
+]]>
+                               </source>
             </div>
                </section>
 
         <section name="Setup red5sip transport">
             <div>
-                Download red5sip 
from<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip</blockquote>
+                Download red5sip 
from<tt>http://red5phone.googlecode.com/svn/branches/red5sip</tt>
             </div>
             <p>
                 Build with Apache Ant
             </p>
             <div>
                 Install jsvc:
-                <blockquote>
-                    <i>apt-get install jsvc</i>
-                </blockquote>
+                               <source>
+<![CDATA[
+apt-get install jsvc
+]]>
+                               </source>
             </div>
             <div>
                 Insert proper values to the /opt/red5sip/settings.properties
 
-                <blockquote>
-                    <i>red5.host - red5 server address (127.0.0.1)
-                        <br/>
-                        sip.obproxy - asterisk adderss (127.0.0.1)
-                        <br/>
-                        sip.phone - sip phone number (test)
-                        <br/>
-                        sip.authid - sip auth id (test)
-                        <br/>
-                        sip.secret - sip password (12345)
-                        <br/>
-                        sip.realm - sip realm, "asterisk" by default
-                        <br/>
-                        sip.proxy -
-                        <br/>
-                        rooms - ids of openmeetings rooms, can be, for 
example, 2,3,5,6
-                    </i>
-
-                </blockquote>
+                               <source>
+<![CDATA[
+red5.host - red5 server address (127.0.0.1)
+sip.obproxy - asterisk adderss (127.0.0.1)
+sip.phone - sip phone number (test)
+sip.authid - sip auth id (test)
+sip.secret - sip password (12345)
+sip.realm - sip realm, "asterisk" by default
+sip.proxy -
+rooms - ids of openmeetings rooms, can be, for example, 2,3,5,6
+]]>
+                               </source>
             </div>
             <div>
                 Add red5sip to autostart:
-                <blockquote>
-                    <i>ln -s /opt/red5sip/red5sip.sh /etc/init.d/red5sip
-                        <br/>
-                        chmod a+x /etc/init.d/red5sip
-                        <br/>
-                        update-rc.d /etc/init.d/red5sip defaults
-                    </i>
-
-                </blockquote>
+                               <source>
+<![CDATA[
+ln -s /opt/red5sip/red5sip.sh /etc/init.d/red5sip
+chmod a+x /etc/init.d/red5sip
+update-rc.d /etc/init.d/red5sip defaults
+]]>
+                               </source>
             </div>
             <div>
                 Start openmeetings
-                <blockquote>
-                    <i>service red5 start</i>
-                </blockquote>
+                               <source>
+<![CDATA[
+service red5 start
+]]>
+                               </source>
             </div>
             <div>
                 Start red5sip
-                <blockquote>
-                    <i>service red5sip start</i>
-                </blockquote>
+                               <source>
+<![CDATA[
+service red5sip start
+]]>
+                               </source>
             </div>
         </section>
        </body>

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
 Tue Aug 12 16:23:17 2014
@@ -28,75 +28,77 @@
                <section name="Prerequisites">
                        <div>
                                Run the commands
-                               <blockquote>
-                                       <i>
-                                               sudo apt-get update &amp;&amp; 
sudo apt-get upgrade<br />
-                                               sudo apt-get install 
build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev 
libsqlite3-dev sqlite3 openssl libssl-dev<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo apt-get update && sudo apt-get upgrade
+sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev 
libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev
+]]>
+                               </source>
                        </div>
                </section>
                <section name="ODBC Setup">
                        <div>
                                Run the commands
-                               <blockquote>
-                                       <i>
-                                               sudo apt-get update<br />
-                                               sudo apt-get install unixODBC 
unixODBC-dev libmyodbc
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo apt-get update
+sudo apt-get install unixODBC unixODBC-dev libmyodbc
+]]>
+                               </source>
                        </div>
                        <div>
                                Set up Asterisk connector:<br /><br />
                                Modify file <tt>/etc/odbc.ini</tt> as follows: 
(replace USER, PASSWORD and Socket with values relative to your system)
-                               <blockquote>
-                                       <i>
-                                               [asterisk-connector]<br />
-                                               Description = MySQL connection 
to 'openmeetings' database<br />
-                                               Driver = MySQL<br />
-                                               Database = openmeetings<br />
-                                               Server = localhost<br />
-                                               USER = root<br />
-                                               PASSWORD =<br />
-                                               Port = 3306<br />
-                                               Socket = 
/var/run/mysqld/mysqld.sock<br />
-                                       </i>
-                               </blockquote><br /><br />
-                               Modify file <tt>/etc/odbcinst.ini</tt> as 
follows: (replace the path to the *.so files below with the real paths on your 
system)
-                               <blockquote>
-                                       (The path below is for x32 server, x64 
version is most probably located at 
<tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br/>
-                                       <i>
-                                               [MySQL]<br />
-                                               Description = ODBC for MySQL<br 
/>
-                                               Driver = 
/usr/lib/i386-linux-gnu/odbc/libmyodbc.so<br />
-                                               Setup = 
/usr/lib/i386-linux-gnu/odbc/libodbcmyS.so<br />
-                                               FileUsage = 1<br />
-                                       </i>
-                               </blockquote><br /><br />
+                               <source>
+<![CDATA[
+[asterisk-connector]
+Description = MySQL connection to 'openmeetings' database
+Driver = MySQL
+Database = openmeetings
+Server = localhost
+USER = root
+PASSWORD =
+Port = 3306
+Socket = /var/run/mysqld/mysqld.sock
+]]>
+                               </source>
+                               Modify file <tt>/etc/odbcinst.ini</tt> as 
follows: (replace the path to the *.so files below with the real paths on your 
system)<br/>
+                               (The path below is for x32 server, x64 version 
is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br/>
+                               <source>
+<![CDATA[
+[MySQL]
+Description = ODBC for MySQL
+Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so
+Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so
+FileUsage = 1
+]]>
+                               </source>
                                Run the following command to ensure everything 
works as expected:
-                               <blockquote>
-                                       <i>echo "select 1" | isql -v 
asterisk-connector</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+echo "select 1" | isql -v asterisk-connector
+]]>
+                               </source>
                        </div>
                </section>
                <section name="Building and setting up Asterisk">
                        <div>
                                Run the commands
-                               <blockquote>
-                                       <i>
-                                               sudo mkdir /usr/src/asterisk 
&amp;&amp; cd /usr/src/asterisk<br />
-                                               sudo wget 
http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz<br
 />
-                                               sudo tar -xvzf 
asterisk-11.2.1.tar.gz<br />
-                                               cd ./asterisk-11.2.1<br />
-                                               sudo make clean<br />
-                                               sudo ./configure<br />
-                                               sudo make<br />
-                                               sudo make install<br />
-                                               sudo make samples<br />
-                                               sudo make config<br />
-                                               sudo service asterisk start<br 
/>
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo mkdir /usr/src/asterisk &amp;&amp; cd /usr/src/asterisk
+sudo wget 
http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz
+sudo tar -xvzf asterisk-11.2.1.tar.gz
+cd ./asterisk-11.2.1
+sudo make clean
+sudo ./configure
+sudo make
+sudo make install
+sudo make samples
+sudo make config
+sudo service asterisk start
+]]>
+                               </source>
                        </div>
                </section>
                <section name="Configure Asterisk">
@@ -104,141 +106,141 @@
                                Enable asterisk ODBC module:<br /><br />
                                Modify "[modules]" section of 
<tt>/etc/asterisk/modules.conf</tt> as follows:<br />
                                <strong>Add/uncomment the following 
lines</strong>
-                               <blockquote>
-                                       <i>
-                                               preload => res_odbc.so<br />
-                                               preload => 
res_config_odbc.so<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+preload => res_odbc.so
+preload => res_config_odbc.so
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Create/update "[asterisk]" section in 
<tt>/etc/asterisk/res_odbc.conf</tt>:
-                               <blockquote>
-                                       <i>
-                                               [asterisk]<br />
-                                               enabled => yes<br />
-                                               dsn => asterisk-connector<br />
-                                               pre-connect => yes
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[asterisk]
+enabled => yes
+dsn => asterisk-connector
+pre-connect => yes
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Modify <tt>/etc/asterisk/sip.conf</tt><br />
                                <strong>Add/uncomment the following 
line</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               videosupport=yes<br />
-                                               rtcachefriends=yes<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+videosupport=yes
+rtcachefriends=yes
+]]>
+                               </source>
                                <strong>Increase maxexpiry value to 
43200</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               maxexpiry=43200<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+maxexpiry=43200
+]]>
+                               </source>
                                <strong>Add user for the "SIP 
Transport"</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               [red5sip_user]<br />
-                                               type=friend<br />
-                                               secret=12345<br />
-                                               disallow=all<br />
-                                               allow=ulaw<br />
-                                               allow=h264<br />
-                                               host=dynamic<br />
-                                               nat=force_rport,comedia<br />
-                                               context=rooms-red5sip<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[red5sip_user]
+type=friend
+secret=12345
+disallow=all
+allow=ulaw
+allow=h264
+host=dynamic
+nat=force_rport,comedia
+context=rooms-red5sip
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Add next lines into the 
<tt>/etc/asterisk/extconfig.conf</tt>:
-                               <blockquote>
-                                       <i>
-                                               [settings]<br />
-                                               sippeers => 
odbc,asterisk,sipusers<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[settings]
+sippeers => odbc,asterisk,sipusers
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Modify 
<tt>/etc/asterisk/extensions.conf</tt><br />
                                <strong>Add the following section</strong>:<br 
/>
-                               <blockquote>
-                                       <i>
-                                               [rooms]<br />
-                                               exten => 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)<br />
-                                               exten => 
_400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})<br />
-                                               exten => 
_400X!,n,Set(CONFBRIDGE(user,template)=sip_user)<br />
-                                               exten => 
_400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})<br />
-                                               exten => 
_400X!,n(ok),Confbridge(${EXTEN},default_bridge,)<br />
-                                               exten => _400X!,n,Hangup<br />
-                                               exten => 
_400X!,n(notavail),Answer()<br />
-                                               exten => 
_400X!,n,Playback(invalid)<br />
-                                               exten => _400X!,n,Hangup<br />
-                                               <br />
-                                               [rooms-originate]<br />
-                                               exten => 
_400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)<br />
-                                               exten => _400X!,n,Hangup<br />
-                                               <br />
-                                               [rooms-out]<br />
-                                               ; 
*****************************************************<br />
-                                               ; Extensions for outgoing calls 
from Openmeetings room.<br />
-                                               ; 
*****************************************************<br />
-                                               <br />
-                                               [rooms-red5sip]<br />
-                                               exten => 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)<br />
-                                               exten => 
_400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)<br />
-                                               exten => 
_400X!,n(notavail),Hangup <br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[rooms]
+exten => 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
+exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})
+exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)
+exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})
+exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)
+exten => _400X!,n,Hangup
+exten => _400X!,n(notavail),Answer()
+exten => _400X!,n,Playback(invalid)
+exten => _400X!,n,Hangup
+
+[rooms-originate]
+exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)
+exten => _400X!,n,Hangup
+
+[rooms-out]
+; *****************************************************
+; Extensions for outgoing calls from Openmeetings room.
+; *****************************************************
+
+[rooms-red5sip]
+exten => 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)
+exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)
+exten => _400X!,n(notavail),Hangup
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Modify 
<tt>/etc/asterisk/confbridge.conf</tt><br />
                                <strong>Add/Modify the following 
secions</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               [general]<br />
-                                               <br />
-                                               [red5sip_user]<br />
-                                               type=user<br />
-                                               marked=yes<br />
-                                               dsp_drop_silence=yes<br />
-                                               denoise=true<br />
-                                               <br />
-                                               [sip_user]<br />
-                                               type=user<br />
-                                               end_marked=yes<br />
-                                               wait_marked=yes<br />
-                                               music_on_hold_when_empty=yes<br 
/>
-                                               dsp_drop_silence=yes<br />
-                                               denoise=true<br />
-                                               <br />
-                                               [default_bridge]<br />
-                                               type=bridge<br />
-                                               video_mode=follow_talker<br /> 
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[general]
+
+[red5sip_user]
+type=user
+marked=yes
+dsp_drop_silence=yes
+denoise=true
+
+[sip_user]
+type=user
+end_marked=yes
+wait_marked=yes
+music_on_hold_when_empty=yes
+dsp_drop_silence=yes
+denoise=true
+
+[default_bridge]
+type=bridge
+video_mode=follow_talker 
+]]>
+                               </source>
                        </div><br />
                        <div>
                                To enable Asterisk Manager API modify 
<tt>/etc/asterisk/manager.conf</tt><br />
                                <strong>Add/Modify the following 
sections</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               [general]<br />
-                                               enabled = yes<br />
-                                               webenabled = no<br />
-                                               port = 5038<br />
-                                               bindaddr = 127.0.0.1<br />
-                                               <br />
-                                               [openmeetings]<br />
-                                               secret = 12345<br />
-                                               deny=0.0.0.0/0.0.0.0<br />
-                                               
permit=127.0.0.1/255.255.255.0<br />
-                                               read = all<br />
-                                               write = all<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[general]
+enabled = yes
+webenabled = no
+port = 5038
+bindaddr = 127.0.0.1
+
+[openmeetings]
+secret = 12345
+deny=0.0.0.0/0.0.0.0
+permit=127.0.0.1/255.255.255.0
+read = all
+write = all
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Update Openmeetings with creadentials for 
Asterisk manager. 
@@ -252,64 +254,71 @@
                        </div><br />
                        <div>
                                Restart asterisk:
-                               <blockquote>
-                                       <i>service asterisk restart</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+service asterisk restart
+]]>
+                               </source>
                        </div><br />
                </section>
 
                <section name="Setup red5sip transport">
                        <div>
-                               Download red5sip from
-                               
<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip_2.1</blockquote>
+                               Download red5sip from 
<tt>http://red5phone.googlecode.com/svn/branches/red5sip_2.1</tt>
                        </div>
                        <div>
                                Build with Apache Ant
-                               <blockquote>
-                                       <i>ant</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+ant
+]]>
+                               </source>
                        </div>
                        <div>
                                Insert proper values to the 
<tt>/opt/red5sip/settings.properties</tt>
 
-                               <blockquote>
-                                       <i>
-                                               red5.host=127.0.0.1 # red5 
server address<br />
-                                               om.context=openmeetings # 
Openmeetings context<br /> 
-                                               red5.codec=asao<br />
-                                               red5.codec.rate=22 # should 
correlate with mic settings in public/config.xml<br />
-                                               sip.obproxy=127.0.0.1 # 
asterisk adderss<br />
-                                               sip.phone=red5sip_user # sip 
phone number<br />
-                                               sip.authid=red5sip_user # sip 
auth id<br />
-                                               sip.secret=12345 # sip 
password<br />
-                                               sip.realm=asterisk # sip 
realm<br />
-                                               sip.proxy=127.0.0.1 # address 
of sip proxy <br />
-                                               rooms.forceStart=no # TBD <br />
-                                               rooms=1 # TBD (not in use) <br 
/>
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+red5.host=127.0.0.1 # red5 server address
+om.context=openmeetings # Openmeetings context 
+red5.codec=asao
+red5.codec.rate=22 # should correlate with mic settings in public/config.xml
+sip.obproxy=127.0.0.1 # asterisk adderss
+sip.phone=red5sip_user # sip phone number
+sip.authid=red5sip_user # sip auth id
+sip.secret=12345 # sip password
+sip.realm=asterisk # sip realm
+sip.proxy=127.0.0.1 # address of sip proxy
+rooms.forceStart=no # TBD
+rooms=1 # TBD (not in use)
+]]>
+                               </source>
                        </div>
                        <div>
                                Add red5sip to autostart:
-                               <blockquote>
-                                       <i>
-                                               sudo cp /opt/red5sip/red5sip 
/etc/init.d/<br />
-                                               sudo chmod a+x 
/etc/init.d/red5sip<br />
-                                               sudo update-rc.d red5sip 
defaults
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo cp /opt/red5sip/red5sip /etc/init.d/
+sudo chmod a+x /etc/init.d/red5sip
+sudo update-rc.d red5sip defaults
+]]>
+                               </source>
                        </div>
                        <div>
                                Start openmeetings
-                               <blockquote>
-                                       <i>service red5 start</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+service red5 start
+]]>
+                               </source>
                        </div>
                        <div>
                                Start red5sip
-                               <blockquote>
-                                       <i>service red5sip start</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+service red5sip start
+]]>
+                               </source>
                        </div>
                </section>
        </body>

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
 Tue Aug 12 16:23:17 2014
@@ -28,75 +28,77 @@
                <section name="Prerequisites">
                        <div>
                                Run the commands
-                               <blockquote>
-                                       <i>
-                                               sudo apt-get update &amp;&amp; 
sudo apt-get upgrade<br />
-                                               sudo apt-get install 
build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev 
libsqlite3-dev sqlite3 openssl libssl-dev<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo apt-get update && sudo apt-get upgrade
+sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev 
libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev
+]]>
+                               </source>
                        </div>
                </section>
                <section name="ODBC Setup">
                        <div>
                                Run the commands
-                               <blockquote>
-                                       <i>
-                                               sudo apt-get update<br />
-                                               sudo apt-get install unixODBC 
unixODBC-dev libmyodbc
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo apt-get update
+sudo apt-get install unixODBC unixODBC-dev libmyodbc
+]]>
+                               </source>
                        </div>
                        <div>
                                Set up Asterisk connector:<br /><br />
                                Modify file <tt>/etc/odbc.ini</tt> as follows: 
(replace USER, PASSWORD and Socket with values relative to your system)
-                               <blockquote>
-                                       <i>
-                                               [asterisk-connector]<br />
-                                               Description = MySQL connection 
to 'openmeetings' database<br />
-                                               Driver = MySQL<br />
-                                               Database = openmeetings<br />
-                                               Server = localhost<br />
-                                               USER = root<br />
-                                               PASSWORD =<br />
-                                               Port = 3306<br />
-                                               Socket = 
/var/run/mysqld/mysqld.sock<br />
-                                       </i>
-                               </blockquote><br /><br />
-                               Modify file <tt>/etc/odbcinst.ini</tt> as 
follows: (replace the path to the *.so files below with the real paths on your 
system)
-                               <blockquote>
-                                       (The path below is for x32 server, x64 
version is most probably located at 
<tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br/>
-                                       <i>
-                                               [MySQL]<br />
-                                               Description = ODBC for MySQL<br 
/>
-                                               Driver = 
/usr/lib/i386-linux-gnu/odbc/libmyodbc.so<br />
-                                               Setup = 
/usr/lib/i386-linux-gnu/odbc/libodbcmyS.so<br />
-                                               FileUsage = 1<br />
-                                       </i>
-                               </blockquote><br /><br />
+                               <source>
+<![CDATA[
+[asterisk-connector]
+Description = MySQL connection to 'openmeetings' database
+Driver = MySQL
+Database = openmeetings
+Server = localhost
+USER = root
+PASSWORD =
+Port = 3306
+Socket = /var/run/mysqld/mysqld.sock
+]]>
+                               </source>
+                               Modify file <tt>/etc/odbcinst.ini</tt> as 
follows: (replace the path to the *.so files below with the real paths on your 
system)<br/>
+                               (The path below is for x32 server, x64 version 
is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br/>
+                               <source>
+<![CDATA[
+[MySQL]
+Description = ODBC for MySQL
+Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so
+Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so
+FileUsage = 1
+]]>
+                               </source>
                                Run the following command to ensure everything 
works as expected:
-                               <blockquote>
-                                       <i>echo "select 1" | isql -v 
asterisk-connector</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+echo "select 1" | isql -v asterisk-connector
+]]>
+                               </source>
                        </div>
                </section>
                <section name="Building and setting up Asterisk">
                        <div>
                                Run the commands
-                               <blockquote>
-                                       <i>
-                                               sudo mkdir /usr/src/asterisk 
&amp;&amp; cd /usr/src/asterisk<br />
-                                               sudo wget 
http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz<br
 />
-                                               sudo tar -xvzf 
asterisk-11.2.1.tar.gz<br />
-                                               cd ./asterisk-11.2.1<br />
-                                               sudo make clean<br />
-                                               sudo ./configure<br />
-                                               sudo make<br />
-                                               sudo make install<br />
-                                               sudo make samples<br />
-                                               sudo make config<br />
-                                               sudo service asterisk start<br 
/>
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo mkdir /usr/src/asterisk &amp;&amp; cd /usr/src/asterisk
+sudo wget 
http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz
+sudo tar -xvzf asterisk-11.2.1.tar.gz
+cd ./asterisk-11.2.1
+sudo make clean
+sudo ./configure
+sudo make
+sudo make install
+sudo make samples
+sudo make config
+sudo service asterisk start
+]]>
+                               </source>
                        </div>
                </section>
                <section name="Configure Asterisk">
@@ -104,141 +106,141 @@
                                Enable asterisk ODBC module:<br /><br />
                                Modify "[modules]" section of 
<tt>/etc/asterisk/modules.conf</tt> as follows:<br />
                                <strong>Add/uncomment the following 
lines</strong>
-                               <blockquote>
-                                       <i>
-                                               preload => res_odbc.so<br />
-                                               preload => 
res_config_odbc.so<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+preload => res_odbc.so
+preload => res_config_odbc.so
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Create/update "[asterisk]" section in 
<tt>/etc/asterisk/res_odbc.conf</tt>:
-                               <blockquote>
-                                       <i>
-                                               [asterisk]<br />
-                                               enabled => yes<br />
-                                               dsn => asterisk-connector<br />
-                                               pre-connect => yes
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[asterisk]
+enabled => yes
+dsn => asterisk-connector
+pre-connect => yes
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Modify <tt>/etc/asterisk/sip.conf</tt><br />
                                <strong>Add/uncomment the following 
line</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               videosupport=yes<br />
-                                               rtcachefriends=yes<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+videosupport=yes
+rtcachefriends=yes
+]]>
+                               </source>
                                <strong>Increase maxexpiry value to 
43200</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               maxexpiry=43200<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+maxexpiry=43200
+]]>
+                               </source>
                                <strong>Add user for the "SIP 
Transport"</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               [red5sip_user]<br />
-                                               type=friend<br />
-                                               secret=12345<br />
-                                               disallow=all<br />
-                                               allow=ulaw<br />
-                                               allow=h264<br />
-                                               host=dynamic<br />
-                                               nat=force_rport,comedia<br />
-                                               context=rooms-red5sip<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[red5sip_user]
+type=friend
+secret=12345
+disallow=all
+allow=ulaw
+allow=h264
+host=dynamic
+nat=force_rport,comedia
+context=rooms-red5sip
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Add next lines into the 
<tt>/etc/asterisk/extconfig.conf</tt>:
-                               <blockquote>
-                                       <i>
-                                               [settings]<br />
-                                               sippeers => 
odbc,asterisk,sipusers<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[settings]
+sippeers => odbc,asterisk,sipusers
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Modify 
<tt>/etc/asterisk/extensions.conf</tt><br />
                                <strong>Add the following section</strong>:<br 
/>
-                               <blockquote>
-                                       <i>
-                                               [rooms]<br />
-                                               exten => 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)<br />
-                                               exten => 
_400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})<br />
-                                               exten => 
_400X!,n,Set(CONFBRIDGE(user,template)=sip_user)<br />
-                                               exten => 
_400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})<br />
-                                               exten => 
_400X!,n(ok),Confbridge(${EXTEN},default_bridge,)<br />
-                                               exten => _400X!,n,Hangup<br />
-                                               exten => 
_400X!,n(notavail),Answer()<br />
-                                               exten => 
_400X!,n,Playback(invalid)<br />
-                                               exten => _400X!,n,Hangup<br />
-                                               <br />
-                                               [rooms-originate]<br />
-                                               exten => 
_400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)<br />
-                                               exten => _400X!,n,Hangup<br />
-                                               <br />
-                                               [rooms-out]<br />
-                                               ; 
*****************************************************<br />
-                                               ; Extensions for outgoing calls 
from Openmeetings room.<br />
-                                               ; 
*****************************************************<br />
-                                               <br />
-                                               [rooms-red5sip]<br />
-                                               exten => 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)<br />
-                                               exten => 
_400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)<br />
-                                               exten => 
_400X!,n(notavail),Hangup <br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[rooms]
+exten => 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
+exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})
+exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)
+exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})
+exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)
+exten => _400X!,n,Hangup
+exten => _400X!,n(notavail),Answer()
+exten => _400X!,n,Playback(invalid)
+exten => _400X!,n,Hangup
+
+[rooms-originate]
+exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)
+exten => _400X!,n,Hangup
+
+[rooms-out]
+; *****************************************************
+; Extensions for outgoing calls from Openmeetings room.
+; *****************************************************
+
+[rooms-red5sip]
+exten => 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)
+exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)
+exten => _400X!,n(notavail),Hangup
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Modify 
<tt>/etc/asterisk/confbridge.conf</tt><br />
                                <strong>Add/Modify the following 
secions</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               [general]<br />
-                                               <br />
-                                               [red5sip_user]<br />
-                                               type=user<br />
-                                               marked=yes<br />
-                                               dsp_drop_silence=yes<br />
-                                               denoise=true<br />
-                                               <br />
-                                               [sip_user]<br />
-                                               type=user<br />
-                                               end_marked=yes<br />
-                                               wait_marked=yes<br />
-                                               music_on_hold_when_empty=yes<br 
/>
-                                               dsp_drop_silence=yes<br />
-                                               denoise=true<br />
-                                               <br />
-                                               [default_bridge]<br />
-                                               type=bridge<br />
-                                               video_mode=follow_talker<br /> 
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[general]
+
+[red5sip_user]
+type=user
+marked=yes
+dsp_drop_silence=yes
+denoise=true
+
+[sip_user]
+type=user
+end_marked=yes
+wait_marked=yes
+music_on_hold_when_empty=yes
+dsp_drop_silence=yes
+denoise=true
+
+[default_bridge]
+type=bridge
+video_mode=follow_talker 
+]]>
+                               </source>
                        </div><br />
                        <div>
                                To enable Asterisk Manager API modify 
<tt>/etc/asterisk/manager.conf</tt><br />
                                <strong>Add/Modify the following 
sections</strong>:<br />
-                               <blockquote>
-                                       <i>
-                                               [general]<br />
-                                               enabled = yes<br />
-                                               webenabled = no<br />
-                                               port = 5038<br />
-                                               bindaddr = 127.0.0.1<br />
-                                               <br />
-                                               [openmeetings]<br />
-                                               secret = 12345<br />
-                                               deny=0.0.0.0/0.0.0.0<br />
-                                               
permit=127.0.0.1/255.255.255.0<br />
-                                               read = all<br />
-                                               write = all<br />
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+[general]
+enabled = yes
+webenabled = no
+port = 5038
+bindaddr = 127.0.0.1
+
+[openmeetings]
+secret = 12345
+deny=0.0.0.0/0.0.0.0
+permit=127.0.0.1/255.255.255.0
+read = all
+write = all
+]]>
+                               </source>
                        </div><br />
                        <div>
                                Update Openmeetings with creadentials for 
Asterisk manager. 
@@ -252,64 +254,71 @@
                        </div><br />
                        <div>
                                Restart asterisk:
-                               <blockquote>
-                                       <i>service asterisk restart</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+service asterisk restart
+]]>
+                               </source>
                        </div><br />
                </section>
 
                <section name="Setup red5sip transport">
                        <div>
-                               Download red5sip from
-                               
<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip_3.0</blockquote>
+                               Download red5sip from 
<tt>http://red5phone.googlecode.com/svn/branches/red5sip_3.0</tt>
                        </div>
                        <div>
                                Build with Apache Ant
-                               <blockquote>
-                                       <i>ant</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+ant
+]]>
+                               </source>
                        </div>
                        <div>
                                Insert proper values to the 
<tt>/opt/red5sip/settings.properties</tt>
 
-                               <blockquote>
-                                       <i>
-                                               red5.host=127.0.0.1 # red5 
server address<br />
-                                               om.context=openmeetings # 
Openmeetings context<br /> 
-                                               red5.codec=asao<br />
-                                               red5.codec.rate=22 # should 
correlate with mic settings in public/config.xml<br />
-                                               sip.obproxy=127.0.0.1 # 
asterisk adderss<br />
-                                               sip.phone=red5sip_user # sip 
phone number<br />
-                                               sip.authid=red5sip_user # sip 
auth id<br />
-                                               sip.secret=12345 # sip 
password<br />
-                                               sip.realm=asterisk # sip 
realm<br />
-                                               sip.proxy=127.0.0.1 # address 
of sip proxy <br />
-                                               rooms.forceStart=no # TBD <br />
-                                               rooms=1 # TBD (not in use) <br 
/>
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+red5.host=127.0.0.1 # red5 server address
+om.context=openmeetings # Openmeetings context 
+red5.codec=asao
+red5.codec.rate=22 # should correlate with mic settings in public/config.xml
+sip.obproxy=127.0.0.1 # asterisk adderss
+sip.phone=red5sip_user # sip phone number
+sip.authid=red5sip_user # sip auth id
+sip.secret=12345 # sip password
+sip.realm=asterisk # sip realm
+sip.proxy=127.0.0.1 # address of sip proxy
+rooms.forceStart=no # TBD
+rooms=1 # TBD (not in use)
+]]>
+                               </source>
                        </div>
                        <div>
                                Add red5sip to autostart:
-                               <blockquote>
-                                       <i>
-                                               sudo cp /opt/red5sip/red5sip 
/etc/init.d/<br />
-                                               sudo chmod a+x 
/etc/init.d/red5sip<br />
-                                               sudo update-rc.d red5sip 
defaults
-                                       </i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+sudo cp /opt/red5sip/red5sip /etc/init.d/
+sudo chmod a+x /etc/init.d/red5sip
+sudo update-rc.d red5sip defaults
+]]>
+                               </source>
                        </div>
                        <div>
                                Start openmeetings
-                               <blockquote>
-                                       <i>service red5 start</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+service red5 start
+]]>
+                               </source>
                        </div>
                        <div>
                                Start red5sip
-                               <blockquote>
-                                       <i>service red5sip start</i>
-                               </blockquote>
+                               <source>
+<![CDATA[
+service red5sip start
+]]>
+                               </source>
                        </div>
                </section>
        </body>

Modified: openmeetings/trunk/site/LdapAndADS.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/site/LdapAndADS.html?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- openmeetings/trunk/site/LdapAndADS.html (original)
+++ openmeetings/trunk/site/LdapAndADS.html Tue Aug 12 16:23:17 2014
@@ -755,32 +755,34 @@
 <div>
                                Run the commands
                                
-<blockquote>
-                                       <i>
-                                               sudo apt-get install slapd 
ldap-utils
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo apt-get install slapd ldap-utils
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Modify file <tt>/etc/ldap/ldap.conf</tt> add 
highlighted attributes:
                                
-<blockquote>
-                                       <i>
-                                               #<br />
-                                               # LDAP Defaults<br />
-                                               #<br />
-                                               # See ldap.conf(5) for 
details<br />
-                                               # This file should be world 
readable but not world writable.<br />
-                                               <b>BASE    dc=unixmen,dc=com<br 
/>
-                                               URI     
ldap://192.168.1.200</b><br />
-                                               #SIZELIMIT      12<br />
-                                               #TIMELIMIT      15<br />
-                                               #DEREF          never<br />
-                                               # TLS certificates (needed for 
GnuTLS)<br />
-                                               TLS_CACERT      
/etc/ssl/certs/ca-certificates.crt<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+#
+# LDAP Defaults
+#
+# See ldap.conf(5) for details
+# This file should be world readable but not world writable.
+BASE    dc=unixmen,dc=com
+URI     ldap://192.168.1.200
+#SIZELIMIT      12
+#TIMELIMIT      15
+#DEREF          never
+# TLS certificates (needed for GnuTLS)
+TLS_CACERT      /etc/ssl/certs/ca-certificates.crt
+
+                               </pre></div>
                        </div>
                        
 <div>

Modified: openmeetings/trunk/site/PortSettings.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/site/PortSettings.html?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- openmeetings/trunk/site/PortSettings.html (original)
+++ openmeetings/trunk/site/PortSettings.html Tue Aug 12 16:23:17 2014
@@ -789,9 +789,7 @@
                                
 <li>
                                        
-<blockquote>Every server side configuration has a client side
-                                               representative
-                                       </blockquote>
+<blockquote>Every server side configuration has a client side 
representative</blockquote>
                                </li>
                        </ul>
                        

Modified: openmeetings/trunk/site/red5sip-integration_2.0.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/site/red5sip-integration_2.0.html?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- openmeetings/trunk/site/red5sip-integration_2.0.html (original)
+++ openmeetings/trunk/site/red5sip-integration_2.0.html Tue Aug 12 16:23:17 
2014
@@ -770,41 +770,41 @@
                        
 <div>
                 Run the commands
-                
-<blockquote>
-                    <i>
-                    sudo apt-get update<br />
-                    sudo apt-get install asterisk asterisk-mysql
-                    </i>
-                </blockquote>
+                               
+<div class="source">
+<pre>
+
+sudo apt-get update
+sudo apt-get install asterisk asterisk-mysql
+
+                               </pre></div>
             </div>
             
 <div>
                 Ubuntu 10.04 has broken asterisk-mysql version. For other 
distribution next commands not needed:
-                
-<blockquote>
-                    <i>
-                        aptitude purge asterisk-mysql
-                        <br />
-                        cd /tmp
-                        <br />
-                        apt-get build-dep asterisk-mysql
-                        <br />
-                        apt-get -b source asterisk-mysql
-                        <br />
-                        dpkg -i asterisk-mysql_1.6.2.0-1_i386.deb
-                    </i>
+                               
+<div class="source">
+<pre>
+
+aptitude purge asterisk-mysql
+cd /tmp
+apt-get build-dep asterisk-mysql
+apt-get -b source asterisk-mysql
+dpkg -i asterisk-mysql_1.6.2.0-1_i386.deb
 
-                </blockquote>
+                               </pre></div>
             </div>
             
 <div>
                 Enable asterisk mysql realtime module:<br /><br />
                 Add string
-                
-<blockquote>
-                    <i>load =&gt; res_config_mysql.so</i>
-                </blockquote>
+                               
+<div class="source">
+<pre>
+
+load =&gt; res_config_mysql.so
+
+                               </pre></div>
                 to the /etc/asterisk/modules.conf into the &quot;modules&quot; 
section.
             </div>
             
@@ -812,68 +812,65 @@
                 Configure mysql realtime module:<br /><br />
 
                 Create file /etc/asterisk/res_mysql.conf and add lines:
-                
-<blockquote>
-                    <i>[general]
-                        <br />
-                        dbhost=127.0.0.1
-                        <br />
-                        dbname=openmeetings
-                        <br />
-                        dbuser=root
-                        <br />
-                        dbpass=
-                        <br />
-                        dbport=3306
-                    </i>
+                               
+<div class="source">
+<pre>
+
+[general]
+dbhost=127.0.0.1
+dbname=openmeetings
+dbuser=root
+dbpass=
+dbport=3306
 
-                </blockquote>
+                               </pre></div>
             </div>
             
 <div>
                 Add next lines into the /etc/asterisk/extconfig.conf:
-                
-<blockquote>
-                    <i>[settings]
-                        <br />
-                        sipusers =&gt; mysql,general,sipusers
-                        <br />
-                        sippeers =&gt; mysql,general,sipusers
-                        <br />
-                        extensions =&gt; mysql,general,extensions
-                        <br />
-                        meetme =&gt; mysql,general,meetme
-                    </i>
+                               
+<div class="source">
+<pre>
+
+[settings]
+sipusers =&gt; mysql,general,sipusers
+sippeers =&gt; mysql,general,sipusers
+extensions =&gt; mysql,general,extensions
+meetme =&gt; mysql,general,meetme
 
-                </blockquote>
+                               </pre></div>
             </div>
             
 <div>
                 Add next lines into the /etc/asterisk/extensions.conf:
-                
-<blockquote>
-                    <i>[rooms]
-                        <br />
-                        switch =&gt; Realtime/@
-                    </i>
+                               
+<div class="source">
+<pre>
 
-                </blockquote>
+[rooms]
+switch =&gt; Realtime/@
+
+                               </pre></div>
             </div>
 
             
 <div>
                 Restart asterisk:
-                
-<blockquote>
-                    <i>service asterisk restart</i>
-                </blockquote>
+                               
+<div class="source">
+<pre>
+
+service asterisk restart
+
+                               </pre></div>
                 Insert, for example, SIP user with name 'test':
-                
-<blockquote>
-                    <i>
-                        INSERT INTO sipusers (allow, context, disallow, host, 
name, secret) VALUES ('ulaw' , 'rooms', NULL, 'dynamic' , 'test', '12345');
-                    </i>
-                </blockquote>
+                               
+<div class="source">
+<pre>
+
+INSERT INTO sipusers (allow, context, disallow, host, name, secret) VALUES 
('ulaw' , 'rooms', NULL, 'dynamic' , 'test', '12345');
+
+                               </pre></div>
             </div>
                </div>
 
@@ -882,8 +879,7 @@
 <h2><a name="Setup_red5sip_transport"></a>Setup red5sip transport</h2>
             
 <div>
-                Download red5sip from
-<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip</blockquote>
+                Download red5sip 
from<tt>http://red5phone.googlecode.com/svn/branches/red5sip</tt>
             </div>
             
 <p>
@@ -892,65 +888,67 @@
             
 <div>
                 Install jsvc:
-                
-<blockquote>
-                    <i>apt-get install jsvc</i>
-                </blockquote>
+                               
+<div class="source">
+<pre>
+
+apt-get install jsvc
+
+                               </pre></div>
             </div>
             
 <div>
                 Insert proper values to the /opt/red5sip/settings.properties
 
-                
-<blockquote>
-                    <i>red5.host - red5 server address (127.0.0.1)
-                        <br />
-                        sip.obproxy - asterisk adderss (127.0.0.1)
-                        <br />
-                        sip.phone - sip phone number (test)
-                        <br />
-                        sip.authid - sip auth id (test)
-                        <br />
-                        sip.secret - sip password (12345)
-                        <br />
-                        sip.realm - sip realm, &quot;asterisk&quot; by default
-                        <br />
-                        sip.proxy -
-                        <br />
-                        rooms - ids of openmeetings rooms, can be, for 
example, 2,3,5,6
-                    </i>
+                               
+<div class="source">
+<pre>
+
+red5.host - red5 server address (127.0.0.1)
+sip.obproxy - asterisk adderss (127.0.0.1)
+sip.phone - sip phone number (test)
+sip.authid - sip auth id (test)
+sip.secret - sip password (12345)
+sip.realm - sip realm, &quot;asterisk&quot; by default
+sip.proxy -
+rooms - ids of openmeetings rooms, can be, for example, 2,3,5,6
 
-                </blockquote>
+                               </pre></div>
             </div>
             
 <div>
                 Add red5sip to autostart:
-                
-<blockquote>
-                    <i>ln -s /opt/red5sip/red5sip.sh /etc/init.d/red5sip
-                        <br />
-                        chmod a+x /etc/init.d/red5sip
-                        <br />
-                        update-rc.d /etc/init.d/red5sip defaults
-                    </i>
+                               
+<div class="source">
+<pre>
+
+ln -s /opt/red5sip/red5sip.sh /etc/init.d/red5sip
+chmod a+x /etc/init.d/red5sip
+update-rc.d /etc/init.d/red5sip defaults
 
-                </blockquote>
+                               </pre></div>
             </div>
             
 <div>
                 Start openmeetings
-                
-<blockquote>
-                    <i>service red5 start</i>
-                </blockquote>
+                               
+<div class="source">
+<pre>
+
+service red5 start
+
+                               </pre></div>
             </div>
             
 <div>
                 Start red5sip
-                
-<blockquote>
-                    <i>service red5sip start</i>
-                </blockquote>
+                               
+<div class="source">
+<pre>
+
+service red5sip start
+
+                               </pre></div>
             </div>
         </div>
        

Modified: openmeetings/trunk/site/red5sip-integration_2.1.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/site/red5sip-integration_2.1.html?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- openmeetings/trunk/site/red5sip-integration_2.1.html (original)
+++ openmeetings/trunk/site/red5sip-integration_2.1.html Tue Aug 12 16:23:17 
2014
@@ -767,12 +767,13 @@
 <div>
                                Run the commands
                                
-<blockquote>
-                                       <i>
-                                               sudo apt-get update &amp;&amp; 
sudo apt-get upgrade<br />
-                                               sudo apt-get install 
build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev 
libsqlite3-dev sqlite3 openssl libssl-dev<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo apt-get update &amp;&amp; sudo apt-get upgrade
+sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev 
libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev
+
+                               </pre></div>
                        </div>
                </div>
                
@@ -782,48 +783,54 @@
 <div>
                                Run the commands
                                
-<blockquote>
-                                       <i>
-                                               sudo apt-get update<br />
-                                               sudo apt-get install unixODBC 
unixODBC-dev libmyodbc
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo apt-get update
+sudo apt-get install unixODBC unixODBC-dev libmyodbc
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Set up Asterisk connector:<br /><br />
                                Modify file <tt>/etc/odbc.ini</tt> as follows: 
(replace USER, PASSWORD and Socket with values relative to your system)
                                
-<blockquote>
-                                       <i>
-                                               [asterisk-connector]<br />
-                                               Description = MySQL connection 
to 'openmeetings' database<br />
-                                               Driver = MySQL<br />
-                                               Database = openmeetings<br />
-                                               Server = localhost<br />
-                                               USER = root<br />
-                                               PASSWORD =<br />
-                                               Port = 3306<br />
-                                               Socket = 
/var/run/mysqld/mysqld.sock<br />
-                                       </i>
-                               </blockquote><br /><br />
-                               Modify file <tt>/etc/odbcinst.ini</tt> as 
follows: (replace the path to the *.so files below with the real paths on your 
system)
-                               
-<blockquote>
-                                       (The path below is for x32 server, x64 
version is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br 
/>
-                                       <i>
-                                               [MySQL]<br />
-                                               Description = ODBC for MySQL<br 
/>
-                                               Driver = 
/usr/lib/i386-linux-gnu/odbc/libmyodbc.so<br />
-                                               Setup = 
/usr/lib/i386-linux-gnu/odbc/libodbcmyS.so<br />
-                                               FileUsage = 1<br />
-                                       </i>
-                               </blockquote><br /><br />
+<div class="source">
+<pre>
+
+[asterisk-connector]
+Description = MySQL connection to 'openmeetings' database
+Driver = MySQL
+Database = openmeetings
+Server = localhost
+USER = root
+PASSWORD =
+Port = 3306
+Socket = /var/run/mysqld/mysqld.sock
+
+                               </pre></div>
+                               Modify file <tt>/etc/odbcinst.ini</tt> as 
follows: (replace the path to the *.so files below with the real paths on your 
system)<br />
+                               (The path below is for x32 server, x64 version 
is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br />
+                               
+<div class="source">
+<pre>
+
+[MySQL]
+Description = ODBC for MySQL
+Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so
+Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so
+FileUsage = 1
+
+                               </pre></div>
                                Run the following command to ensure everything 
works as expected:
                                
-<blockquote>
-                                       <i>echo &quot;select 1&quot; | isql -v 
asterisk-connector</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+echo &quot;select 1&quot; | isql -v asterisk-connector
+
+                               </pre></div>
                        </div>
                </div>
                
@@ -833,21 +840,22 @@
 <div>
                                Run the commands
                                
-<blockquote>
-                                       <i>
-                                               sudo mkdir /usr/src/asterisk 
&amp;&amp; cd /usr/src/asterisk<br />
-                                               sudo wget 
http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz<br
 />
-                                               sudo tar -xvzf 
asterisk-11.2.1.tar.gz<br />
-                                               cd ./asterisk-11.2.1<br />
-                                               sudo make clean<br />
-                                               sudo ./configure<br />
-                                               sudo make<br />
-                                               sudo make install<br />
-                                               sudo make samples<br />
-                                               sudo make config<br />
-                                               sudo service asterisk start<br 
/>
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo mkdir /usr/src/asterisk &amp;amp;&amp;amp; cd /usr/src/asterisk
+sudo wget 
http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz
+sudo tar -xvzf asterisk-11.2.1.tar.gz
+cd ./asterisk-11.2.1
+sudo make clean
+sudo ./configure
+sudo make
+sudo make install
+sudo make samples
+sudo make config
+sudo service asterisk start
+
+                               </pre></div>
                        </div>
                </div>
                
@@ -859,155 +867,164 @@
                                Modify &quot;[modules]&quot; section of 
<tt>/etc/asterisk/modules.conf</tt> as follows:<br />
                                <b>Add/uncomment the following lines</b>
                                
-<blockquote>
-                                       <i>
-                                               preload =&gt; res_odbc.so<br />
-                                               preload =&gt; 
res_config_odbc.so<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+preload =&gt; res_odbc.so
+preload =&gt; res_config_odbc.so
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Create/update &quot;[asterisk]&quot; section in 
<tt>/etc/asterisk/res_odbc.conf</tt>:
                                
-<blockquote>
-                                       <i>
-                                               [asterisk]<br />
-                                               enabled =&gt; yes<br />
-                                               dsn =&gt; asterisk-connector<br 
/>
-                                               pre-connect =&gt; yes
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[asterisk]
+enabled =&gt; yes
+dsn =&gt; asterisk-connector
+pre-connect =&gt; yes
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Modify <tt>/etc/asterisk/sip.conf</tt><br />
                                <b>Add/uncomment the following line</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               videosupport=yes<br />
-                                               rtcachefriends=yes<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+videosupport=yes
+rtcachefriends=yes
+
+                               </pre></div>
                                <b>Increase maxexpiry value to 43200</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               maxexpiry=43200<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+maxexpiry=43200
+
+                               </pre></div>
                                <b>Add user for the &quot;SIP 
Transport&quot;</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               [red5sip_user]<br />
-                                               type=friend<br />
-                                               secret=12345<br />
-                                               disallow=all<br />
-                                               allow=ulaw<br />
-                                               allow=h264<br />
-                                               host=dynamic<br />
-                                               nat=force_rport,comedia<br />
-                                               context=rooms-red5sip<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[red5sip_user]
+type=friend
+secret=12345
+disallow=all
+allow=ulaw
+allow=h264
+host=dynamic
+nat=force_rport,comedia
+context=rooms-red5sip
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Add next lines into the 
<tt>/etc/asterisk/extconfig.conf</tt>:
                                
-<blockquote>
-                                       <i>
-                                               [settings]<br />
-                                               sippeers =&gt; 
odbc,asterisk,sipusers<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[settings]
+sippeers =&gt; odbc,asterisk,sipusers
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Modify 
<tt>/etc/asterisk/extensions.conf</tt><br />
                                <b>Add the following section</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               [rooms]<br />
-                                               exten =&gt; 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)<br />
-                                               exten =&gt; 
_400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})<br />
-                                               exten =&gt; 
_400X!,n,Set(CONFBRIDGE(user,template)=sip_user)<br />
-                                               exten =&gt; 
_400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})<br />
-                                               exten =&gt; 
_400X!,n(ok),Confbridge(${EXTEN},default_bridge,)<br />
-                                               exten =&gt; _400X!,n,Hangup<br 
/>
-                                               exten =&gt; 
_400X!,n(notavail),Answer()<br />
-                                               exten =&gt; 
_400X!,n,Playback(invalid)<br />
-                                               exten =&gt; _400X!,n,Hangup<br 
/>
-                                               <br />
-                                               [rooms-originate]<br />
-                                               exten =&gt; 
_400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)<br />
-                                               exten =&gt; _400X!,n,Hangup<br 
/>
-                                               <br />
-                                               [rooms-out]<br />
-                                               ; 
*****************************************************<br />
-                                               ; Extensions for outgoing calls 
from Openmeetings room.<br />
-                                               ; 
*****************************************************<br />
-                                               <br />
-                                               [rooms-red5sip]<br />
-                                               exten =&gt; 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)<br />
-                                               exten =&gt; 
_400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)<br />
-                                               exten =&gt; 
_400X!,n(notavail),Hangup <br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[rooms]
+exten =&gt; 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
+exten =&gt; _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})
+exten =&gt; _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)
+exten =&gt; _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})
+exten =&gt; _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)
+exten =&gt; _400X!,n,Hangup
+exten =&gt; _400X!,n(notavail),Answer()
+exten =&gt; _400X!,n,Playback(invalid)
+exten =&gt; _400X!,n,Hangup
+
+[rooms-originate]
+exten =&gt; _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)
+exten =&gt; _400X!,n,Hangup
+
+[rooms-out]
+; *****************************************************
+; Extensions for outgoing calls from Openmeetings room.
+; *****************************************************
+
+[rooms-red5sip]
+exten =&gt; 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)
+exten =&gt; _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)
+exten =&gt; _400X!,n(notavail),Hangup
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Modify 
<tt>/etc/asterisk/confbridge.conf</tt><br />
                                <b>Add/Modify the following secions</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               [general]<br />
-                                               <br />
-                                               [red5sip_user]<br />
-                                               type=user<br />
-                                               marked=yes<br />
-                                               dsp_drop_silence=yes<br />
-                                               denoise=true<br />
-                                               <br />
-                                               [sip_user]<br />
-                                               type=user<br />
-                                               end_marked=yes<br />
-                                               wait_marked=yes<br />
-                                               music_on_hold_when_empty=yes<br 
/>
-                                               dsp_drop_silence=yes<br />
-                                               denoise=true<br />
-                                               <br />
-                                               [default_bridge]<br />
-                                               type=bridge<br />
-                                               video_mode=follow_talker<br /> 
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[general]
+
+[red5sip_user]
+type=user
+marked=yes
+dsp_drop_silence=yes
+denoise=true
+
+[sip_user]
+type=user
+end_marked=yes
+wait_marked=yes
+music_on_hold_when_empty=yes
+dsp_drop_silence=yes
+denoise=true
+
+[default_bridge]
+type=bridge
+video_mode=follow_talker 
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                To enable Asterisk Manager API modify 
<tt>/etc/asterisk/manager.conf</tt><br />
                                <b>Add/Modify the following sections</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               [general]<br />
-                                               enabled = yes<br />
-                                               webenabled = no<br />
-                                               port = 5038<br />
-                                               bindaddr = 127.0.0.1<br />
-                                               <br />
-                                               [openmeetings]<br />
-                                               secret = 12345<br />
-                                               deny=0.0.0.0/0.0.0.0<br />
-                                               
permit=127.0.0.1/255.255.255.0<br />
-                                               read = all<br />
-                                               write = all<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[general]
+enabled = yes
+webenabled = no
+port = 5038
+bindaddr = 127.0.0.1
+
+[openmeetings]
+secret = 12345
+deny=0.0.0.0/0.0.0.0
+permit=127.0.0.1/255.255.255.0
+read = all
+write = all
+
+                               </pre></div>
                        </div><br />
                        
 <div>
@@ -1025,9 +1042,12 @@
 <div>
                                Restart asterisk:
                                
-<blockquote>
-                                       <i>service asterisk restart</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+service asterisk restart
+
+                               </pre></div>
                        </div><br />
                </div>
 
@@ -1036,67 +1056,76 @@
 <h2><a name="Setup_red5sip_transport"></a>Setup red5sip transport</h2>
                        
 <div>
-                               Download red5sip from
-                               
-<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip_2.1</blockquote>
+                               Download red5sip from 
<tt>http://red5phone.googlecode.com/svn/branches/red5sip_2.1</tt>
                        </div>
                        
 <div>
                                Build with Apache Ant
                                
-<blockquote>
-                                       <i>ant</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+ant
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Insert proper values to the 
<tt>/opt/red5sip/settings.properties</tt>
 
                                
-<blockquote>
-                                       <i>
-                                               red5.host=127.0.0.1 # red5 
server address<br />
-                                               om.context=openmeetings # 
Openmeetings context<br /> 
-                                               red5.codec=asao<br />
-                                               red5.codec.rate=22 # should 
correlate with mic settings in public/config.xml<br />
-                                               sip.obproxy=127.0.0.1 # 
asterisk adderss<br />
-                                               sip.phone=red5sip_user # sip 
phone number<br />
-                                               sip.authid=red5sip_user # sip 
auth id<br />
-                                               sip.secret=12345 # sip 
password<br />
-                                               sip.realm=asterisk # sip 
realm<br />
-                                               sip.proxy=127.0.0.1 # address 
of sip proxy <br />
-                                               rooms.forceStart=no # TBD <br />
-                                               rooms=1 # TBD (not in use) <br 
/>
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+red5.host=127.0.0.1 # red5 server address
+om.context=openmeetings # Openmeetings context 
+red5.codec=asao
+red5.codec.rate=22 # should correlate with mic settings in public/config.xml
+sip.obproxy=127.0.0.1 # asterisk adderss
+sip.phone=red5sip_user # sip phone number
+sip.authid=red5sip_user # sip auth id
+sip.secret=12345 # sip password
+sip.realm=asterisk # sip realm
+sip.proxy=127.0.0.1 # address of sip proxy
+rooms.forceStart=no # TBD
+rooms=1 # TBD (not in use)
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Add red5sip to autostart:
                                
-<blockquote>
-                                       <i>
-                                               sudo cp /opt/red5sip/red5sip 
/etc/init.d/<br />
-                                               sudo chmod a+x 
/etc/init.d/red5sip<br />
-                                               sudo update-rc.d red5sip 
defaults
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo cp /opt/red5sip/red5sip /etc/init.d/
+sudo chmod a+x /etc/init.d/red5sip
+sudo update-rc.d red5sip defaults
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Start openmeetings
                                
-<blockquote>
-                                       <i>service red5 start</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+service red5 start
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Start red5sip
                                
-<blockquote>
-                                       <i>service red5sip start</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+service red5sip start
+
+                               </pre></div>
                        </div>
                </div>
        

Modified: openmeetings/trunk/site/red5sip-integration_3.0.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/site/red5sip-integration_3.0.html?rev=1617520&r1=1617519&r2=1617520&view=diff
==============================================================================
--- openmeetings/trunk/site/red5sip-integration_3.0.html (original)
+++ openmeetings/trunk/site/red5sip-integration_3.0.html Tue Aug 12 16:23:17 
2014
@@ -767,12 +767,13 @@
 <div>
                                Run the commands
                                
-<blockquote>
-                                       <i>
-                                               sudo apt-get update &amp;&amp; 
sudo apt-get upgrade<br />
-                                               sudo apt-get install 
build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev 
libsqlite3-dev sqlite3 openssl libssl-dev<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo apt-get update &amp;&amp; sudo apt-get upgrade
+sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev 
libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev
+
+                               </pre></div>
                        </div>
                </div>
                
@@ -782,48 +783,54 @@
 <div>
                                Run the commands
                                
-<blockquote>
-                                       <i>
-                                               sudo apt-get update<br />
-                                               sudo apt-get install unixODBC 
unixODBC-dev libmyodbc
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo apt-get update
+sudo apt-get install unixODBC unixODBC-dev libmyodbc
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Set up Asterisk connector:<br /><br />
                                Modify file <tt>/etc/odbc.ini</tt> as follows: 
(replace USER, PASSWORD and Socket with values relative to your system)
                                
-<blockquote>
-                                       <i>
-                                               [asterisk-connector]<br />
-                                               Description = MySQL connection 
to 'openmeetings' database<br />
-                                               Driver = MySQL<br />
-                                               Database = openmeetings<br />
-                                               Server = localhost<br />
-                                               USER = root<br />
-                                               PASSWORD =<br />
-                                               Port = 3306<br />
-                                               Socket = 
/var/run/mysqld/mysqld.sock<br />
-                                       </i>
-                               </blockquote><br /><br />
-                               Modify file <tt>/etc/odbcinst.ini</tt> as 
follows: (replace the path to the *.so files below with the real paths on your 
system)
-                               
-<blockquote>
-                                       (The path below is for x32 server, x64 
version is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br 
/>
-                                       <i>
-                                               [MySQL]<br />
-                                               Description = ODBC for MySQL<br 
/>
-                                               Driver = 
/usr/lib/i386-linux-gnu/odbc/libmyodbc.so<br />
-                                               Setup = 
/usr/lib/i386-linux-gnu/odbc/libodbcmyS.so<br />
-                                               FileUsage = 1<br />
-                                       </i>
-                               </blockquote><br /><br />
+<div class="source">
+<pre>
+
+[asterisk-connector]
+Description = MySQL connection to 'openmeetings' database
+Driver = MySQL
+Database = openmeetings
+Server = localhost
+USER = root
+PASSWORD =
+Port = 3306
+Socket = /var/run/mysqld/mysqld.sock
+
+                               </pre></div>
+                               Modify file <tt>/etc/odbcinst.ini</tt> as 
follows: (replace the path to the *.so files below with the real paths on your 
system)<br />
+                               (The path below is for x32 server, x64 version 
is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br />
+                               
+<div class="source">
+<pre>
+
+[MySQL]
+Description = ODBC for MySQL
+Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so
+Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so
+FileUsage = 1
+
+                               </pre></div>
                                Run the following command to ensure everything 
works as expected:
                                
-<blockquote>
-                                       <i>echo &quot;select 1&quot; | isql -v 
asterisk-connector</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+echo &quot;select 1&quot; | isql -v asterisk-connector
+
+                               </pre></div>
                        </div>
                </div>
                
@@ -833,21 +840,22 @@
 <div>
                                Run the commands
                                
-<blockquote>
-                                       <i>
-                                               sudo mkdir /usr/src/asterisk 
&amp;&amp; cd /usr/src/asterisk<br />
-                                               sudo wget 
http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz<br
 />
-                                               sudo tar -xvzf 
asterisk-11.2.1.tar.gz<br />
-                                               cd ./asterisk-11.2.1<br />
-                                               sudo make clean<br />
-                                               sudo ./configure<br />
-                                               sudo make<br />
-                                               sudo make install<br />
-                                               sudo make samples<br />
-                                               sudo make config<br />
-                                               sudo service asterisk start<br 
/>
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo mkdir /usr/src/asterisk &amp;amp;&amp;amp; cd /usr/src/asterisk
+sudo wget 
http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz
+sudo tar -xvzf asterisk-11.2.1.tar.gz
+cd ./asterisk-11.2.1
+sudo make clean
+sudo ./configure
+sudo make
+sudo make install
+sudo make samples
+sudo make config
+sudo service asterisk start
+
+                               </pre></div>
                        </div>
                </div>
                
@@ -859,155 +867,164 @@
                                Modify &quot;[modules]&quot; section of 
<tt>/etc/asterisk/modules.conf</tt> as follows:<br />
                                <b>Add/uncomment the following lines</b>
                                
-<blockquote>
-                                       <i>
-                                               preload =&gt; res_odbc.so<br />
-                                               preload =&gt; 
res_config_odbc.so<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+preload =&gt; res_odbc.so
+preload =&gt; res_config_odbc.so
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Create/update &quot;[asterisk]&quot; section in 
<tt>/etc/asterisk/res_odbc.conf</tt>:
                                
-<blockquote>
-                                       <i>
-                                               [asterisk]<br />
-                                               enabled =&gt; yes<br />
-                                               dsn =&gt; asterisk-connector<br 
/>
-                                               pre-connect =&gt; yes
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[asterisk]
+enabled =&gt; yes
+dsn =&gt; asterisk-connector
+pre-connect =&gt; yes
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Modify <tt>/etc/asterisk/sip.conf</tt><br />
                                <b>Add/uncomment the following line</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               videosupport=yes<br />
-                                               rtcachefriends=yes<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+videosupport=yes
+rtcachefriends=yes
+
+                               </pre></div>
                                <b>Increase maxexpiry value to 43200</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               maxexpiry=43200<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+maxexpiry=43200
+
+                               </pre></div>
                                <b>Add user for the &quot;SIP 
Transport&quot;</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               [red5sip_user]<br />
-                                               type=friend<br />
-                                               secret=12345<br />
-                                               disallow=all<br />
-                                               allow=ulaw<br />
-                                               allow=h264<br />
-                                               host=dynamic<br />
-                                               nat=force_rport,comedia<br />
-                                               context=rooms-red5sip<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[red5sip_user]
+type=friend
+secret=12345
+disallow=all
+allow=ulaw
+allow=h264
+host=dynamic
+nat=force_rport,comedia
+context=rooms-red5sip
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Add next lines into the 
<tt>/etc/asterisk/extconfig.conf</tt>:
                                
-<blockquote>
-                                       <i>
-                                               [settings]<br />
-                                               sippeers =&gt; 
odbc,asterisk,sipusers<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[settings]
+sippeers =&gt; odbc,asterisk,sipusers
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Modify 
<tt>/etc/asterisk/extensions.conf</tt><br />
                                <b>Add the following section</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               [rooms]<br />
-                                               exten =&gt; 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)<br />
-                                               exten =&gt; 
_400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})<br />
-                                               exten =&gt; 
_400X!,n,Set(CONFBRIDGE(user,template)=sip_user)<br />
-                                               exten =&gt; 
_400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})<br />
-                                               exten =&gt; 
_400X!,n(ok),Confbridge(${EXTEN},default_bridge,)<br />
-                                               exten =&gt; _400X!,n,Hangup<br 
/>
-                                               exten =&gt; 
_400X!,n(notavail),Answer()<br />
-                                               exten =&gt; 
_400X!,n,Playback(invalid)<br />
-                                               exten =&gt; _400X!,n,Hangup<br 
/>
-                                               <br />
-                                               [rooms-originate]<br />
-                                               exten =&gt; 
_400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)<br />
-                                               exten =&gt; _400X!,n,Hangup<br 
/>
-                                               <br />
-                                               [rooms-out]<br />
-                                               ; 
*****************************************************<br />
-                                               ; Extensions for outgoing calls 
from Openmeetings room.<br />
-                                               ; 
*****************************************************<br />
-                                               <br />
-                                               [rooms-red5sip]<br />
-                                               exten =&gt; 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)<br />
-                                               exten =&gt; 
_400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)<br />
-                                               exten =&gt; 
_400X!,n(notavail),Hangup <br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[rooms]
+exten =&gt; 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
+exten =&gt; _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})
+exten =&gt; _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)
+exten =&gt; _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})
+exten =&gt; _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)
+exten =&gt; _400X!,n,Hangup
+exten =&gt; _400X!,n(notavail),Answer()
+exten =&gt; _400X!,n,Playback(invalid)
+exten =&gt; _400X!,n,Hangup
+
+[rooms-originate]
+exten =&gt; _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)
+exten =&gt; _400X!,n,Hangup
+
+[rooms-out]
+; *****************************************************
+; Extensions for outgoing calls from Openmeetings room.
+; *****************************************************
+
+[rooms-red5sip]
+exten =&gt; 
_400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)
+exten =&gt; _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)
+exten =&gt; _400X!,n(notavail),Hangup
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                Modify 
<tt>/etc/asterisk/confbridge.conf</tt><br />
                                <b>Add/Modify the following secions</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               [general]<br />
-                                               <br />
-                                               [red5sip_user]<br />
-                                               type=user<br />
-                                               marked=yes<br />
-                                               dsp_drop_silence=yes<br />
-                                               denoise=true<br />
-                                               <br />
-                                               [sip_user]<br />
-                                               type=user<br />
-                                               end_marked=yes<br />
-                                               wait_marked=yes<br />
-                                               music_on_hold_when_empty=yes<br 
/>
-                                               dsp_drop_silence=yes<br />
-                                               denoise=true<br />
-                                               <br />
-                                               [default_bridge]<br />
-                                               type=bridge<br />
-                                               video_mode=follow_talker<br /> 
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[general]
+
+[red5sip_user]
+type=user
+marked=yes
+dsp_drop_silence=yes
+denoise=true
+
+[sip_user]
+type=user
+end_marked=yes
+wait_marked=yes
+music_on_hold_when_empty=yes
+dsp_drop_silence=yes
+denoise=true
+
+[default_bridge]
+type=bridge
+video_mode=follow_talker 
+
+                               </pre></div>
                        </div><br />
                        
 <div>
                                To enable Asterisk Manager API modify 
<tt>/etc/asterisk/manager.conf</tt><br />
                                <b>Add/Modify the following sections</b>:<br />
                                
-<blockquote>
-                                       <i>
-                                               [general]<br />
-                                               enabled = yes<br />
-                                               webenabled = no<br />
-                                               port = 5038<br />
-                                               bindaddr = 127.0.0.1<br />
-                                               <br />
-                                               [openmeetings]<br />
-                                               secret = 12345<br />
-                                               deny=0.0.0.0/0.0.0.0<br />
-                                               
permit=127.0.0.1/255.255.255.0<br />
-                                               read = all<br />
-                                               write = all<br />
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+[general]
+enabled = yes
+webenabled = no
+port = 5038
+bindaddr = 127.0.0.1
+
+[openmeetings]
+secret = 12345
+deny=0.0.0.0/0.0.0.0
+permit=127.0.0.1/255.255.255.0
+read = all
+write = all
+
+                               </pre></div>
                        </div><br />
                        
 <div>
@@ -1025,9 +1042,12 @@
 <div>
                                Restart asterisk:
                                
-<blockquote>
-                                       <i>service asterisk restart</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+service asterisk restart
+
+                               </pre></div>
                        </div><br />
                </div>
 
@@ -1036,67 +1056,76 @@
 <h2><a name="Setup_red5sip_transport"></a>Setup red5sip transport</h2>
                        
 <div>
-                               Download red5sip from
-                               
-<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip_3.0</blockquote>
+                               Download red5sip from 
<tt>http://red5phone.googlecode.com/svn/branches/red5sip_3.0</tt>
                        </div>
                        
 <div>
                                Build with Apache Ant
                                
-<blockquote>
-                                       <i>ant</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+ant
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Insert proper values to the 
<tt>/opt/red5sip/settings.properties</tt>
 
                                
-<blockquote>
-                                       <i>
-                                               red5.host=127.0.0.1 # red5 
server address<br />
-                                               om.context=openmeetings # 
Openmeetings context<br /> 
-                                               red5.codec=asao<br />
-                                               red5.codec.rate=22 # should 
correlate with mic settings in public/config.xml<br />
-                                               sip.obproxy=127.0.0.1 # 
asterisk adderss<br />
-                                               sip.phone=red5sip_user # sip 
phone number<br />
-                                               sip.authid=red5sip_user # sip 
auth id<br />
-                                               sip.secret=12345 # sip 
password<br />
-                                               sip.realm=asterisk # sip 
realm<br />
-                                               sip.proxy=127.0.0.1 # address 
of sip proxy <br />
-                                               rooms.forceStart=no # TBD <br />
-                                               rooms=1 # TBD (not in use) <br 
/>
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+red5.host=127.0.0.1 # red5 server address
+om.context=openmeetings # Openmeetings context 
+red5.codec=asao
+red5.codec.rate=22 # should correlate with mic settings in public/config.xml
+sip.obproxy=127.0.0.1 # asterisk adderss
+sip.phone=red5sip_user # sip phone number
+sip.authid=red5sip_user # sip auth id
+sip.secret=12345 # sip password
+sip.realm=asterisk # sip realm
+sip.proxy=127.0.0.1 # address of sip proxy
+rooms.forceStart=no # TBD
+rooms=1 # TBD (not in use)
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Add red5sip to autostart:
                                
-<blockquote>
-                                       <i>
-                                               sudo cp /opt/red5sip/red5sip 
/etc/init.d/<br />
-                                               sudo chmod a+x 
/etc/init.d/red5sip<br />
-                                               sudo update-rc.d red5sip 
defaults
-                                       </i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+sudo cp /opt/red5sip/red5sip /etc/init.d/
+sudo chmod a+x /etc/init.d/red5sip
+sudo update-rc.d red5sip defaults
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Start openmeetings
                                
-<blockquote>
-                                       <i>service red5 start</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+service red5 start
+
+                               </pre></div>
                        </div>
                        
 <div>
                                Start red5sip
                                
-<blockquote>
-                                       <i>service red5sip start</i>
-                               </blockquote>
+<div class="source">
+<pre>
+
+service red5sip start
+
+                               </pre></div>
                        </div>
                </div>
        


Reply via email to