You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/12 07:28:23 UTC
svn commit: r1522448 [8/8] - in /openmeetings/trunk/singlewebapp: docs/
src/main/java/org/apache/openmeetings/axis/services/
src/main/java/org/apache/openmeetings/backup/
src/main/java/org/apache/openmeetings/cli/
src/main/java/org/apache/openmeetings/...
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java Thu Sep 12 05:28:14 2013
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertNul
import java.util.List;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.test.calendar.TestAppointmentAddAppointment;
import org.junit.Test;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java Thu Sep 12 05:28:14 2013
@@ -20,8 +20,8 @@ package org.apache.openmeetings.test.dom
import org.apache.log4j.Logger;
import org.apache.openmeetings.data.user.OrganisationManager;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java Thu Sep 12 05:28:14 2013
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.openmeetings.data.user.OrganisationManager;
-import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java Thu Sep 12 05:28:14 2013
@@ -21,8 +21,8 @@ package org.apache.openmeetings.test.inv
import java.util.Date;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.InvitationService;
import org.apache.openmeetings.remote.MainService;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java Thu Sep 12 05:28:14 2013
@@ -29,11 +29,11 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.openmeetings.data.basic.FieldLanguageDao;
-import org.apache.openmeetings.data.basic.FieldValueDao;
-import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
+import org.apache.openmeetings.db.dao.label.FieldValueDao;
+import org.apache.openmeetings.db.entity.label.FieldLanguage;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.label.Fieldvalues;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.utils.LangExport;
import org.apache.openmeetings.utils.OmFileHelper;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java Thu Sep 12 05:28:14 2013
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertNot
import java.util.List;
-import org.apache.openmeetings.data.basic.NaviBuilder;
-import org.apache.openmeetings.persistence.beans.basic.Naviglobal;
-import org.apache.openmeetings.persistence.beans.basic.Navimain;
+import org.apache.openmeetings.db.dao.basic.NavigationDao;
+import org.apache.openmeetings.db.entity.basic.Naviglobal;
+import org.apache.openmeetings.db.entity.basic.Navimain;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ import org.springframework.beans.factory
public class TestNavi extends AbstractOpenmeetingsSpringTest {
@Autowired
- private NaviBuilder navimanagement;
+ private NavigationDao navimanagement;
@Test
public void testGetNavi(){
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java Thu Sep 12 05:28:14 2013
@@ -18,16 +18,17 @@
*/
package org.apache.openmeetings.test.poll;
-import org.apache.openmeetings.data.conference.PollManager;
-import org.apache.openmeetings.persistence.beans.poll.PollType;
+import org.apache.openmeetings.db.dao.room.PollDao;
+import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
+
import static org.junit.Assert.*;
public class TestPollManagement extends AbstractOpenmeetingsSpringTest {
@Autowired
- private PollManager pollManager;
+ private PollDao pollManager;
@Test
public void addPollType() {
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java Thu Sep 12 05:28:14 2013
@@ -23,10 +23,10 @@ import static org.junit.Assert.assertEqu
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
-import org.apache.openmeetings.data.conference.dao.ClientDao;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.dao.room.ClientDao;
+import org.apache.openmeetings.db.dao.server.ServerDao;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java Thu Sep 12 05:28:14 2013
@@ -23,10 +23,10 @@ import static org.junit.Assert.assertEqu
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
-import org.apache.openmeetings.data.conference.dao.ClientDao;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.dao.room.ClientDao;
+import org.apache.openmeetings.db.dao.server.ServerDao;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java Thu Sep 12 05:28:14 2013
@@ -26,7 +26,7 @@ import java.util.Date;
import java.util.Random;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.session.store.HashMapStore;
import org.apache.openmeetings.session.store.IClientPersistenceStore;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java Thu Sep 12 05:28:14 2013
@@ -20,8 +20,8 @@ package org.apache.openmeetings.test.use
import static org.junit.Assert.assertTrue;
-import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.persistence.beans.user.State;
+import org.apache.openmeetings.db.dao.user.StateDao;
+import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java Thu Sep 12 05:28:14 2013
@@ -26,9 +26,9 @@ import static org.junit.Assert.assertTru
import java.util.List;
import java.util.Random;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractWiketTester;
import org.apache.openmeetings.web.app.WebSession;
import org.junit.Test;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java Thu Sep 12 05:28:14 2013
@@ -25,10 +25,10 @@ import static org.junit.Assert.fail;
import java.util.List;
import org.apache.openmeetings.data.user.OrganisationManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.user.Organisation;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.userdata;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.remote.MainService;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java Thu Sep 12 05:28:14 2013
@@ -21,8 +21,8 @@ package org.apache.openmeetings.test.use
import static org.junit.Assert.assertNotNull;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.MainService;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
Added: openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_3.0.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_3.0.xml?rev=1522448&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_3.0.xml (added)
+++ openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_3.0.xml Thu Sep 12 05:28:14 2013
@@ -0,0 +1,314 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="website.xsd">
+ <properties>
+ <title>SIP-Transport Integration</title>
+ <author email="solomax@apache.org">OpenMeetings Team</author>
+ </properties>
+ <body>
+ <section name="SIP-Transport Integration">
+ <p>You need Apache OpenMeetings <strong>version 2.1</strong> to apply this guide!</p>
+ <p>You need Asterisk <strong>version 11</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
+ <blockquote>
+ <i>
+ sudo apt-get update && 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>
+ </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>
+ </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 />
+ Run the following command to ensure everything works as expected:
+ <blockquote>
+ <i>echo "select 1" | isql -v asterisk-connector</i>
+ </blockquote>
+ </div>
+ </section>
+ <section name="Building and setting up Asterisk">
+ <div>
+ Run the commands
+ <blockquote>
+ <i>
+ sudo mkdir /usr/src/asterisk && 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>
+ </section>
+ <section name="Configure Asterisk">
+ <div>
+ 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>
+ </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>
+ </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>
+ <strong>Increase maxexpiry value to 43200</strong>:<br />
+ <blockquote>
+ <i>
+ maxexpiry=43200<br />
+ </i>
+ </blockquote>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </div><br />
+ <div>
+ Update Openmeetings with creadentials for Asterisk manager.
+ Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt><br />
+ find <strong><bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"></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:
+ <blockquote>
+ <i>service asterisk restart</i>
+ </blockquote>
+ </div><br />
+ </section>
+
+ <section name="Setup red5sip transport">
+ <div>
+ Download red5sip from
+ <blockquote>http://red5phone.googlecode.com/svn/branches/red5sip_2.1</blockquote>
+ </div>
+ <div>
+ Build with Apache Ant
+ <blockquote>
+ <i>ant</i>
+ </blockquote>
+ </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>
+ <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>
+ <div>
+ Start openmeetings
+ <blockquote>
+ <i>service red5 start</i>
+ </blockquote>
+ </div>
+ <div>
+ Start red5sip
+ <blockquote>
+ <i>service red5sip start</i>
+ </blockquote>
+ </div>
+ </section>
+ </body>
+</document>
Modified: openmeetings/trunk/singlewebapp/xdocs/voip-sip-integration.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/voip-sip-integration.xml?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/voip-sip-integration.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/voip-sip-integration.xml Thu Sep 12 05:28:14 2013
@@ -56,6 +56,9 @@
<a href="red5sip-integration_2.1.html">
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
+ </a>.<br/>
</p>
</section>