You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/05/26 04:25:35 UTC

svn commit: r1745556 - in /openmeetings/application: branches/3.1.x/openmeetings-server/src/site/xdoc/ branches/3.2.x/openmeetings-server/src/site/xdoc/ trunk/openmeetings-server/src/site/xdoc/

Author: solomax
Date: Thu May 26 04:25:35 2016
New Revision: 1745556

URL: http://svn.apache.org/viewvc?rev=1745556&view=rev
Log:
no jira: documentation clean-up

Added:
    openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
    openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
    openmeetings/application/trunk/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
Modified:
    openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
    openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml
    openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
    openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
    openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
    openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
    openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
    openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
    openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
    openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
    openmeetings/application/trunk/openmeetings-server/src/site/xdoc/voip-sip-integration.xml

Modified: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml Thu May 26 04:25:35 2016
@@ -22,7 +22,7 @@
 	<body>
 		<section name="OpenMeetings Plugin for Bitrix">
 			<p>
-				Plugin for Joomla currently is not open source. 
+				Plugin for Bitrix currently is not open source. 
 				Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. 
 			</p>			
 		</section>

Modified: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml Thu May 26 04:25:35 2016
@@ -15,79 +15,73 @@
 <document xmlns="http://maven.apache.org/XDOC/2.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-
-    <properties>
-        <title>Layout options for a conference room in OpenMeetings</title>
+	<properties>
+		<title>Layout options for a conference room in OpenMeetings</title>
 		<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
-    </properties>
-
-    <body>
-
-        <section name="Layout options for conference rooms">
-
-            <p>Each room has a number of attributes to generate different layouts.
-            You can change those values individually for each room in Administration &gt; Rooms
-            </p>
-            <p></p>
-            <table>
-                <tr>
-                    <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> key </th>
-                    <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> default </th>
-                    <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> meaning </th>
-                    <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> availabe since OpenMeetings version </th>
-                </tr>
-                <tr>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideTopBar </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the top bar with the menus and exit button </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
-                </tr>
-                <tr>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideChat </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the chat tab and use space for whiteboard </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
-                </tr>
-                <tr>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActivitiesAndActions </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the activities window with the notofications aber user activities</td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
-                </tr>
-                <tr>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideFilesExplorer </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the file explorer</td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
-                </tr>
-                <tr>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActionsMenu </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the menu with the actions</td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
-                </tr>
-                <tr>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideScreenSharing </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the button to start screensharing/recording</td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
-                </tr>
-                <tr>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideWhiteboard </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the whiteboard, if this option is true, the videos will be in the area of the whiteboard</td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
-                </tr>
-                <tr>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> showMicrophoneStatus </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Show the current status of the microphone (off/on) on the bottom of each video view</td>
-                    <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
-                </tr>
-            </table>
-
-        </section>
-        
-    </body>
-
-</document>
\ No newline at end of file
+	</properties>
+	<body>
+		<section name="Layout options for conference rooms">
+			<p>
+				Each room has a number of attributes to generate different layouts.
+				You can change those values individually for each room in Administration &gt; Rooms
+			</p>
+			<p></p>
+			<table>
+				<tr>
+					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> key </th>
+					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> default </th>
+					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> meaning </th>
+					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> availabe since OpenMeetings version </th>
+				</tr>
+				<tr>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideTopBar </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the top bar with the menus and exit button </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+				</tr>
+				<tr>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideChat </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the chat tab and use space for whiteboard </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+				</tr>
+				<tr>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActivitiesAndActions </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the activities window with the notofications aber user activities</td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+				</tr>
+				<tr>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideFilesExplorer </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the file explorer</td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+				</tr>
+				<tr>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActionsMenu </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the menu with the actions</td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+				</tr>
+				<tr>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideScreenSharing </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the button to start screensharing/recording</td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+				</tr>
+				<tr>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideWhiteboard </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the whiteboard, if this option is true, the videos will be in the area of the whiteboard</td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+				</tr>
+				<tr>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> showMicrophoneStatus </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Show the current status of the microphone (off/on) on the bottom of each video view</td>
+					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+				</tr>
+			</table>
+		</section>
+	</body>
+</document>

Modified: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml Thu May 26 04:25:35 2016
@@ -22,6 +22,7 @@
 
 	<body>
 		<section name="Confluence Plugin for OpenMeetings">
+			<p>Sources are available at <a href="https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence">https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence</a></p>
 			<p>
 				To get SNAPSHOTS for testing please contact <a href="mail-lists.html">Mailing lists</a>
 			</p>

Modified: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml Thu May 26 04:25:35 2016
@@ -135,7 +135,7 @@ Enter key password for <red5>
 				<li>Restart red5 and try to connect - your connection should now be
 					made via RTMPS (close port 1935 to be sure)
 				</li>   
-		  </ol>
+			</ol>
 		</section>
 		<section name="SSL for the web interface">
 			<p>If you want to use SSL for the web interface in addition to RTMPS,

Added: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml?rev=1745556&view=auto
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml (added)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml Thu May 26 04:25:35 2016
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+	<properties>
+		<title>SIP-Transport Integration</title>
+		<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+	</properties>
+	<body>
+		<section name="SIP-Transport Integration">
+			<p>You need Apache OpenMeetings <strong>version 3.0+</strong> to apply this guide!</p>
+			<p>You need Asterisk <strong>version 13+</strong> to apply this guide!</p>
+			<p>Here is instruction how-to set up red5sip transport integration with OpenMeetings on Ubuntu 12.10.</p>
+		</section>
+		<section name="Prerequisites">
+			<div>
+				Run the commands
+				<source>
+<![CDATA[
+sudo apt-get update && sudo apt-get upgrade
+]]>
+				</source>
+			</div>
+		</section>
+		<section name="Building and setting up Asterisk">
+			<div>
+				Run the commands
+				<source>
+<![CDATA[
+sudo mkdir /usr/src/asterisk &amp;&amp; cd /usr/src/asterisk
+sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.9.0.tar.gz
+sudo tar -xvzf asterisk-13.9.0.tar.gz
+cd ./asterisk-13.9.0
+sudo make clean
+sudo contrib/scripts/install_prereq install
+sudo ./configure
+sudo make menuconfig
+]]>
+				</source>
+				Make sure you have selected  <tt>Add-ons -> res_config_mysql</tt>, Press F12 to save
+				<source>
+<![CDATA[
+sudo make
+sudo make install
+sudo make samples
+sudo make config
+sudo service asterisk start
+]]>
+				</source>
+			</div>
+		</section>
+		<section name="Configure Asterisk">
+			<div>
+				Enable asterisk MySQL module:<br /><br />
+				Modify "[modules]" section of <tt>/etc/asterisk/modules.conf</tt> as follows:<br />
+				<strong>Add/uncomment the following lines</strong>
+				<source>
+<![CDATA[
+preload => res_config_mysql.so
+]]>
+				</source>
+			</div><br />
+			<div>
+				Configure MySQL module:<br /><br />
+				Set valid data for MySQL in <tt>/etc/asterisk/res_config_mysql.conf</tt> :<br />
+				<strong>Example</strong>
+				<source>
+<![CDATA[
+[general]
+dbhost = 127.0.0.1
+dbname = openmeetings
+dbuser = root
+dbpass =
+dbport = 3306
+dbsock = /var/lib/mysql/mysql.sock
+dbcharset = utf8
+requirements=warn
+]]>
+				</source>
+			</div><br />
+			<div>
+				Modify <tt>/etc/asterisk/sip.conf</tt><br />
+				<strong>Add/uncomment the following line</strong>:<br />
+				<source>
+<![CDATA[
+videosupport=yes
+rtcachefriends=yes
+]]>
+				</source>
+				<strong>Increase maxexpiry value to 43200</strong>:<br />
+				<source>
+<![CDATA[
+maxexpiry=43200
+]]>
+				</source>
+				<strong>Add user for the "SIP Transport"</strong>:<br />
+				<source>
+<![CDATA[
+[red5sip_user]
+type=friend
+secret=12345
+disallow=all
+allow=ulaw
+allow=h263
+host=dynamic
+nat=force_rport,comedia
+context=rooms-red5sip
+]]>
+				</source>
+			</div><br />
+			<div>
+				Add next lines into the <tt>/etc/asterisk/extconfig.conf</tt>:
+				<source>
+<![CDATA[
+[settings]
+sippeers => mysql,general,sipusers
+]]>
+				</source>
+			</div><br />
+			<div>
+				Modify <tt>/etc/asterisk/extensions.conf</tt><br />
+				<strong>Add the following section</strong>:<br />
+				<source>
+<![CDATA[
+; *****************************************************
+; The below dial plan is used to dial into a Openmeetings Conference room
+; The first line DB_EXISTS(openmeetings/room/ does not belong to the openmeetings application but is the name of astDB containing the astDB family/key pair and values
+; To Check if your astDB has been created do the following in a terminal window type the following:
+; asterisk –rx “database show”
+; If you do not receive an output with that resembles openmeetings/rooms/400## where “##” will equal the extension assigned when you created your room
+; If you do not receive the above output check your parameters in /opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml
+; Go back into the Administrator Panel and remove the PIN number in each room save the record with no PIN number and then re-enter the pin again resave the record.
+; *****************************************************
+
+[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:notavail)
+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 />
+				<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 />
+				<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. 
+				Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt><br />
+				find <strong>&lt;bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"&gt;</strong>
+				uncomment its parameters and set it to your custom values.
+				<p style="font-size: larger; color: blue;">
+					IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore
+					otherwise all SIP related room information will be lost
+				</p>   
+			</div><br />
+			<div>
+				Restart asterisk:
+				<source>
+<![CDATA[
+service asterisk restart
+]]>
+				</source>
+			</div><br />
+		</section>
+
+		<section name="Setup red5sip transport">
+			<div>
+				Download red5sip from <tt>https://github.com/openmeetings/red5sip</tt>
+			</div>
+			<div>
+				<source>
+<![CDATA[
+git clone https://github.com/openmeetings/red5sip.git
+]]>
+				</source>
+			</div>
+			<div>
+				Build with Apache Maven
+				<source>
+<![CDATA[
+mvn clean package
+]]>
+				</source>
+				All necessary files will be available in <tt>target</tt> folder, copy/move it to /opt/red5sip/
+			</div>
+			<div>
+				Insert proper values to the <tt>/opt/red5sip/settings.properties</tt>
+
+				<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:
+				<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
+				<source>
+<![CDATA[
+service red5 start
+]]>
+				</source>
+			</div>
+			<div>
+				Start red5sip
+				<source>
+<![CDATA[
+service red5sip start
+]]>
+				</source>
+			</div>
+		</section>
+	</body>
+</document>

Modified: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml Thu May 26 04:25:35 2016
@@ -56,7 +56,10 @@
                 Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 2.1
                 </a>.<br/>
                 <a href="red5sip-integration_3.0.html">
-                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.0+
+                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.0
+                </a>.<br/>
+                <a href="red5sip-integration_3.1.html">
+                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.1+
                 </a>.<br/>
 			</p>
 		</section>

Modified: openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml Thu May 26 04:25:35 2016
@@ -22,7 +22,7 @@
 	<body>
 		<section name="OpenMeetings Plugin for Bitrix">
 			<p>
-				Plugin for Joomla currently is not open source. 
+				Plugin for Bitrix currently is not open source. 
 				Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. 
 			</p>			
 		</section>

Modified: openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml Thu May 26 04:25:35 2016
@@ -22,6 +22,7 @@
 
 	<body>
 		<section name="Confluence Plugin for OpenMeetings">
+			<p>Sources are available at <a href="https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence">https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence</a></p>
 			<p>
 				To get SNAPSHOTS for testing please contact <a href="mail-lists.html">Mailing lists</a>
 			</p>

Added: openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml?rev=1745556&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml Thu May 26 04:25:35 2016
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+	<properties>
+		<title>SIP-Transport Integration</title>
+		<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+	</properties>
+	<body>
+		<section name="SIP-Transport Integration">
+			<p>You need Apache OpenMeetings <strong>version 3.0+</strong> to apply this guide!</p>
+			<p>You need Asterisk <strong>version 13+</strong> to apply this guide!</p>
+			<p>Here is instruction how-to set up red5sip transport integration with OpenMeetings on Ubuntu 12.10.</p>
+		</section>
+		<section name="Prerequisites">
+			<div>
+				Run the commands
+				<source>
+<![CDATA[
+sudo apt-get update && sudo apt-get upgrade
+]]>
+				</source>
+			</div>
+		</section>
+		<section name="Building and setting up Asterisk">
+			<div>
+				Run the commands
+				<source>
+<![CDATA[
+sudo mkdir /usr/src/asterisk &amp;&amp; cd /usr/src/asterisk
+sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.9.0.tar.gz
+sudo tar -xvzf asterisk-13.9.0.tar.gz
+cd ./asterisk-13.9.0
+sudo make clean
+sudo contrib/scripts/install_prereq install
+sudo ./configure
+sudo make menuconfig
+]]>
+				</source>
+				Make sure you have selected  <tt>Add-ons -> res_config_mysql</tt>, Press F12 to save
+				<source>
+<![CDATA[
+sudo make
+sudo make install
+sudo make samples
+sudo make config
+sudo service asterisk start
+]]>
+				</source>
+			</div>
+		</section>
+		<section name="Configure Asterisk">
+			<div>
+				Enable asterisk MySQL module:<br /><br />
+				Modify "[modules]" section of <tt>/etc/asterisk/modules.conf</tt> as follows:<br />
+				<strong>Add/uncomment the following lines</strong>
+				<source>
+<![CDATA[
+preload => res_config_mysql.so
+]]>
+				</source>
+			</div><br />
+			<div>
+				Configure MySQL module:<br /><br />
+				Set valid data for MySQL in <tt>/etc/asterisk/res_config_mysql.conf</tt> :<br />
+				<strong>Example</strong>
+				<source>
+<![CDATA[
+[general]
+dbhost = 127.0.0.1
+dbname = openmeetings
+dbuser = root
+dbpass =
+dbport = 3306
+dbsock = /var/lib/mysql/mysql.sock
+dbcharset = utf8
+requirements=warn
+]]>
+				</source>
+			</div><br />
+			<div>
+				Modify <tt>/etc/asterisk/sip.conf</tt><br />
+				<strong>Add/uncomment the following line</strong>:<br />
+				<source>
+<![CDATA[
+videosupport=yes
+rtcachefriends=yes
+]]>
+				</source>
+				<strong>Increase maxexpiry value to 43200</strong>:<br />
+				<source>
+<![CDATA[
+maxexpiry=43200
+]]>
+				</source>
+				<strong>Add user for the "SIP Transport"</strong>:<br />
+				<source>
+<![CDATA[
+[red5sip_user]
+type=friend
+secret=12345
+disallow=all
+allow=ulaw
+allow=h263
+host=dynamic
+nat=force_rport,comedia
+context=rooms-red5sip
+]]>
+				</source>
+			</div><br />
+			<div>
+				Add next lines into the <tt>/etc/asterisk/extconfig.conf</tt>:
+				<source>
+<![CDATA[
+[settings]
+sippeers => mysql,general,sipusers
+]]>
+				</source>
+			</div><br />
+			<div>
+				Modify <tt>/etc/asterisk/extensions.conf</tt><br />
+				<strong>Add the following section</strong>:<br />
+				<source>
+<![CDATA[
+; *****************************************************
+; The below dial plan is used to dial into a Openmeetings Conference room
+; The first line DB_EXISTS(openmeetings/room/ does not belong to the openmeetings application but is the name of astDB containing the astDB family/key pair and values
+; To Check if your astDB has been created do the following in a terminal window type the following:
+; asterisk –rx “database show”
+; If you do not receive an output with that resembles openmeetings/rooms/400## where “##” will equal the extension assigned when you created your room
+; If you do not receive the above output check your parameters in /opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml
+; Go back into the Administrator Panel and remove the PIN number in each room save the record with no PIN number and then re-enter the pin again resave the record.
+; *****************************************************
+
+[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:notavail)
+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 />
+				<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 />
+				<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. 
+				Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt><br />
+				find <strong>&lt;bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"&gt;</strong>
+				uncomment its parameters and set it to your custom values.
+				<p style="font-size: larger; color: blue;">
+					IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore
+					otherwise all SIP related room information will be lost
+				</p>   
+			</div><br />
+			<div>
+				Restart asterisk:
+				<source>
+<![CDATA[
+service asterisk restart
+]]>
+				</source>
+			</div><br />
+		</section>
+
+		<section name="Setup red5sip transport">
+			<div>
+				Download red5sip from <tt>https://github.com/openmeetings/red5sip</tt>
+			</div>
+			<div>
+				<source>
+<![CDATA[
+git clone https://github.com/openmeetings/red5sip.git
+]]>
+				</source>
+			</div>
+			<div>
+				Build with Apache Maven
+				<source>
+<![CDATA[
+mvn clean package
+]]>
+				</source>
+				All necessary files will be available in <tt>target</tt> folder, copy/move it to /opt/red5sip/
+			</div>
+			<div>
+				Insert proper values to the <tt>/opt/red5sip/settings.properties</tt>
+
+				<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:
+				<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
+				<source>
+<![CDATA[
+service red5 start
+]]>
+				</source>
+			</div>
+			<div>
+				Start red5sip
+				<source>
+<![CDATA[
+service red5sip start
+]]>
+				</source>
+			</div>
+		</section>
+	</body>
+</document>

Modified: openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml Thu May 26 04:25:35 2016
@@ -56,7 +56,10 @@
                 Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 2.1
                 </a>.<br/>
                 <a href="red5sip-integration_3.0.html">
-                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.0+
+                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.0
+                </a>.<br/>
+                <a href="red5sip-integration_3.1.html">
+                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.1+
                 </a>.<br/>
 			</p>
 		</section>

Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BitrixPlugin.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BitrixPlugin.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BitrixPlugin.xml Thu May 26 04:25:35 2016
@@ -22,7 +22,7 @@
 	<body>
 		<section name="OpenMeetings Plugin for Bitrix">
 			<p>
-				Plugin for Joomla currently is not open source. 
+				Plugin for Bitrix currently is not open source. 
 				Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. 
 			</p>			
 		</section>

Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml Thu May 26 04:25:35 2016
@@ -22,6 +22,7 @@
 
 	<body>
 		<section name="Confluence Plugin for OpenMeetings">
+			<p>Sources are available at <a href="https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence">https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence</a></p>
 			<p>
 				To get SNAPSHOTS for testing please contact <a href="mail-lists.html">Mailing lists</a>
 			</p>

Added: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml?rev=1745556&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml (added)
+++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml Thu May 26 04:25:35 2016
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+	<properties>
+		<title>SIP-Transport Integration</title>
+		<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+	</properties>
+	<body>
+		<section name="SIP-Transport Integration">
+			<p>You need Apache OpenMeetings <strong>version 3.0+</strong> to apply this guide!</p>
+			<p>You need Asterisk <strong>version 13+</strong> to apply this guide!</p>
+			<p>Here is instruction how-to set up red5sip transport integration with OpenMeetings on Ubuntu 12.10.</p>
+		</section>
+		<section name="Prerequisites">
+			<div>
+				Run the commands
+				<source>
+<![CDATA[
+sudo apt-get update && sudo apt-get upgrade
+]]>
+				</source>
+			</div>
+		</section>
+		<section name="Building and setting up Asterisk">
+			<div>
+				Run the commands
+				<source>
+<![CDATA[
+sudo mkdir /usr/src/asterisk &amp;&amp; cd /usr/src/asterisk
+sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.9.0.tar.gz
+sudo tar -xvzf asterisk-13.9.0.tar.gz
+cd ./asterisk-13.9.0
+sudo make clean
+sudo contrib/scripts/install_prereq install
+sudo ./configure
+sudo make menuconfig
+]]>
+				</source>
+				Make sure you have selected  <tt>Add-ons -> res_config_mysql</tt>, Press F12 to save
+				<source>
+<![CDATA[
+sudo make
+sudo make install
+sudo make samples
+sudo make config
+sudo service asterisk start
+]]>
+				</source>
+			</div>
+		</section>
+		<section name="Configure Asterisk">
+			<div>
+				Enable asterisk MySQL module:<br /><br />
+				Modify "[modules]" section of <tt>/etc/asterisk/modules.conf</tt> as follows:<br />
+				<strong>Add/uncomment the following lines</strong>
+				<source>
+<![CDATA[
+preload => res_config_mysql.so
+]]>
+				</source>
+			</div><br />
+			<div>
+				Configure MySQL module:<br /><br />
+				Set valid data for MySQL in <tt>/etc/asterisk/res_config_mysql.conf</tt> :<br />
+				<strong>Example</strong>
+				<source>
+<![CDATA[
+[general]
+dbhost = 127.0.0.1
+dbname = openmeetings
+dbuser = root
+dbpass =
+dbport = 3306
+dbsock = /var/lib/mysql/mysql.sock
+dbcharset = utf8
+requirements=warn
+]]>
+				</source>
+			</div><br />
+			<div>
+				Modify <tt>/etc/asterisk/sip.conf</tt><br />
+				<strong>Add/uncomment the following line</strong>:<br />
+				<source>
+<![CDATA[
+videosupport=yes
+rtcachefriends=yes
+]]>
+				</source>
+				<strong>Increase maxexpiry value to 43200</strong>:<br />
+				<source>
+<![CDATA[
+maxexpiry=43200
+]]>
+				</source>
+				<strong>Add user for the "SIP Transport"</strong>:<br />
+				<source>
+<![CDATA[
+[red5sip_user]
+type=friend
+secret=12345
+disallow=all
+allow=ulaw
+allow=h263
+host=dynamic
+nat=force_rport,comedia
+context=rooms-red5sip
+]]>
+				</source>
+			</div><br />
+			<div>
+				Add next lines into the <tt>/etc/asterisk/extconfig.conf</tt>:
+				<source>
+<![CDATA[
+[settings]
+sippeers => mysql,general,sipusers
+]]>
+				</source>
+			</div><br />
+			<div>
+				Modify <tt>/etc/asterisk/extensions.conf</tt><br />
+				<strong>Add the following section</strong>:<br />
+				<source>
+<![CDATA[
+; *****************************************************
+; The below dial plan is used to dial into a Openmeetings Conference room
+; The first line DB_EXISTS(openmeetings/room/ does not belong to the openmeetings application but is the name of astDB containing the astDB family/key pair and values
+; To Check if your astDB has been created do the following in a terminal window type the following:
+; asterisk –rx “database show”
+; If you do not receive an output with that resembles openmeetings/rooms/400## where “##” will equal the extension assigned when you created your room
+; If you do not receive the above output check your parameters in /opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml
+; Go back into the Administrator Panel and remove the PIN number in each room save the record with no PIN number and then re-enter the pin again resave the record.
+; *****************************************************
+
+[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:notavail)
+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 />
+				<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 />
+				<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. 
+				Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt><br />
+				find <strong>&lt;bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"&gt;</strong>
+				uncomment its parameters and set it to your custom values.
+				<p style="font-size: larger; color: blue;">
+					IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore
+					otherwise all SIP related room information will be lost
+				</p>   
+			</div><br />
+			<div>
+				Restart asterisk:
+				<source>
+<![CDATA[
+service asterisk restart
+]]>
+				</source>
+			</div><br />
+		</section>
+
+		<section name="Setup red5sip transport">
+			<div>
+				Download red5sip from <tt>https://github.com/openmeetings/red5sip</tt>
+			</div>
+			<div>
+				<source>
+<![CDATA[
+git clone https://github.com/openmeetings/red5sip.git
+]]>
+				</source>
+			</div>
+			<div>
+				Build with Apache Maven
+				<source>
+<![CDATA[
+mvn clean package
+]]>
+				</source>
+				All necessary files will be available in <tt>target</tt> folder, copy/move it to /opt/red5sip/
+			</div>
+			<div>
+				Insert proper values to the <tt>/opt/red5sip/settings.properties</tt>
+
+				<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:
+				<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
+				<source>
+<![CDATA[
+service red5 start
+]]>
+				</source>
+			</div>
+			<div>
+				Start red5sip
+				<source>
+<![CDATA[
+service red5sip start
+]]>
+				</source>
+			</div>
+		</section>
+	</body>
+</document>

Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/voip-sip-integration.xml?rev=1745556&r1=1745555&r2=1745556&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/voip-sip-integration.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/voip-sip-integration.xml Thu May 26 04:25:35 2016
@@ -56,7 +56,10 @@
                 Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 2.1
                 </a>.<br/>
                 <a href="red5sip-integration_3.0.html">
-                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.0+
+                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.0
+                </a>.<br/>
+                <a href="red5sip-integration_3.1.html">
+                Instruction how-to set up OpenMeetings SIP-Transport integration for Openmeetings 3.1+
                 </a>.<br/>
 			</p>
 		</section>