openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1442484 - in /openmeetings/trunk/singlewebapp: docs/ src/org/apache/openmeetings/data/conference/dao/ src/org/apache/openmeetings/remote/red5/ src/org/apache/openmeetings/session/store/ xdocs/
Date Tue, 05 Feb 2013 07:20:17 GMT
Author: solomax
Date: Tue Feb  5 07:20:16 2013
New Revision: 1442484

URL: http://svn.apache.org/viewvc?rev=1442484&view=rev
Log:
SIP: getActiveRoomIds is fixed to correctly return empty list;
	typo in getRoomModeratorByRoomId is fixed;

Modified:
    openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
    openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml

Modified: openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html?rev=1442484&r1=1442483&r2=1442484&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html (original)
+++ openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html Tue Feb  5 07:20:16
2013
@@ -672,6 +672,7 @@ limitations under the License.
 				</blockquote><br /><br />
 				Modify file /etc/odbcinst.ini 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 /usr/lib/x86_64-linux-gnu/odbc)<br
/>
 					<i>
 						[MySQL]<br />
 						Description = ODBC for MySQL<br />
@@ -729,6 +730,19 @@ limitations under the License.
 				<blockquote>
 					<i>rtcachefriends=yes</i>
 				</blockquote>
+				add following section to create internal user for red5sip:
+				<blockquote>
+					<i>
+						[sip]
+						type=friend
+						user=sip
+						context=rooms
+						secret=12345
+						disallow=all
+						allow=ulaw
+						host=dynamic
+					</i>
+				</blockquote>
 			</div>
                                                 <div>
 				Add next lines into the /etc/asterisk/extconfig.conf:
@@ -795,9 +809,18 @@ limitations under the License.
 				Download red5sip from
 				<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip</blockquote>
 			</div>
-                                                <p>
+                                                <div>
 				Build with Apache Ant
-			</p>
+				<blockquote>
+					<i>ant</i>
+				</blockquote>
+			</div>
+                                                <div>
+				Set red5sip.sh to be executable:
+				<blockquote>
+					<i>chmod a+x red5sip.sh</i>
+				</blockquote>
+			</div>
                                                 <div>
 				Install jsvc:
 				<blockquote>
@@ -811,10 +834,10 @@ limitations under the License.
 					<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.phone - sip phone number (sip)<br />
+						sip.authid - sip auth id (sip)<br />
 						sip.secret - sip password (12345)<br />
-						sip.realm - sip realm, "asterisk" by default<br />
+						sip.realm - sip realm (asterisk)<br />
 						sip.proxy - <br />
 					</i>
 				</blockquote>

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java?rev=1442484&r1=1442483&r2=1442484&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java
Tue Feb  5 07:20:16 2013
@@ -107,7 +107,7 @@ public class RoomModeratorsDao {
 
 	public List<RoomModerator> getRoomModeratorByRoomId(Long roomId) {
 		try {
-			TypedQuery<RoomModerator> query = em.createQuery("getRoomModeratorByRoomId", RoomModerator.class);
+			TypedQuery<RoomModerator> query = em.createNamedQuery("getRoomModeratorByRoomId",
RoomModerator.class);
 			query.setParameter("deleted", true);
 			query.setParameter("roomId", roomId);
 			return query.getResultList();

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1442484&r1=1442483&r2=1442484&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Tue Feb  5 07:20:16 2013
@@ -2777,7 +2777,7 @@ public class ScopeApplicationAdapter ext
 				i.remove();
 			}
 		}
-		return roomDao.getSipRooms(result);
+		return result.isEmpty() ? result : roomDao.getSipRooms(result);
 	}
 	
 	public synchronized List<Long> getActiveRoomIds() {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java?rev=1442484&r1=1442483&r2=1442484&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
Tue Feb  5 07:20:16 2013
@@ -21,6 +21,7 @@ package org.apache.openmeetings.session.
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -175,16 +176,14 @@ public class HashMapStore implements ICl
 	}
 
 	public List<Long> getRoomsIdsByServer(Server server) {
-		List<Long> roomIds = new ArrayList<Long>();
+		HashSet<Long> rooms = new HashSet<Long>();
 		for (Client cl : clientsByStreamId.values()) {
 			Long roomId = cl.getRoom_id();
-			if (roomId != null && roomId > 0) {
-				if (!roomIds.contains(roomId)) {
-					
-				}
+			if (roomId != null && roomId > 0 && !rooms.contains(roomId)) {
+				rooms.add(roomId);
 			}
 		}
-		return roomIds;
+		return new ArrayList<Long>(rooms);
 	}
 
 }

Modified: openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml?rev=1442484&r1=1442483&r2=1442484&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml Tue Feb  5 07:20:16
2013
@@ -83,6 +83,19 @@
 				<blockquote>
 					<i>rtcachefriends=yes</i>
 				</blockquote>
+				add following section to create internal user for red5sip:
+				<blockquote>
+					<i>
+						[sip]
+						type=friend
+						user=sip
+						context=rooms
+						secret=12345
+						disallow=all
+						allow=ulaw
+						host=dynamic
+					</i>
+				</blockquote>
 			</div>
 			<div>
 				Add next lines into the /etc/asterisk/extconfig.conf:
@@ -140,9 +153,18 @@
 				Download red5sip from
 				<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip</blockquote>
 			</div>
-			<p>
+			<div>
 				Build with Apache Ant
-			</p>
+				<blockquote>
+					<i>ant</i>
+				</blockquote>
+			</div>
+			<div>
+				Set red5sip.sh to be executable:
+				<blockquote>
+					<i>chmod a+x red5sip.sh</i>
+				</blockquote>
+			</div>
 			<div>
 				Install jsvc:
 				<blockquote>
@@ -156,10 +178,10 @@
 					<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.phone - sip phone number (sip)<br />
+						sip.authid - sip auth id (sip)<br />
 						sip.secret - sip password (12345)<br />
-						sip.realm - sip realm, "asterisk" by default<br />
+						sip.realm - sip realm (asterisk)<br />
 						sip.proxy - <br />
 					</i>
 				</blockquote>



Mime
View raw message