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 2017/04/23 04:23:37 UTC
svn commit: r1792340 [2/2] - in /openmeetings/application/trunk:
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
openmeetings-core/src/main/java/org/apache/openmeetings/core/session/
openmeetings-core/src/main/java/org/apache/openm...
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Sun Apr 23 04:23:36 2017
@@ -34,7 +34,7 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.IUserService;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.StreamClient;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.room.RoomGroup;
@@ -82,12 +82,12 @@ public class RoomForm extends AdminBaseF
private final TextField<String> pin = new TextField<>("pin");
private final WebMarkupContainer moderatorContainer = new WebMarkupContainer("moderatorContainer");
private final WebMarkupContainer clientsContainer = new WebMarkupContainer("clientsContainer");
- private final ListView<Client> clients = new ListView<Client>("clients", new ArrayList<>()) {
+ private final ListView<StreamClient> clients = new ListView<StreamClient>("clients", new ArrayList<>()) {
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(final ListItem<Client> item) {
- Client client = item.getModelObject();
+ protected void populateItem(final ListItem<StreamClient> item) {
+ StreamClient client = item.getModelObject();
item.add(new Label("clientId", "" + client.getId()))
.add(new Label("clientLogin", "" + client.getUsername()))
.add(new ConfirmableAjaxBorder("clientDelete", getString("80"), getString("833")) {
@@ -95,7 +95,7 @@ public class RoomForm extends AdminBaseF
@Override
protected void onSubmit(AjaxRequestTarget target) {
- Client c = item.getModelObject();
+ StreamClient c = item.getModelObject();
getBean(IUserService.class).kickUserByStreamId(getSid(), c.getStreamid()
, c.getServer() == null ? 0 : c.getServer().getId());
@@ -329,7 +329,7 @@ public class RoomForm extends AdminBaseF
void updateClients(AjaxRequestTarget target) {
long roomId = (getModelObject().getId() != null ? getModelObject().getId() : 0);
- final List<Client> clientsInRoom = getBean(ISessionManager.class).getClientListByRoom(roomId);
+ final List<StreamClient> clientsInRoom = getBean(ISessionManager.class).getClientListByRoom(roomId);
clients.setDefaultModelObject(clientsInRoom);
target.add(clientsContainer);
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Sun Apr 23 04:23:36 2017
@@ -56,6 +56,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.Right;
+import org.apache.openmeetings.db.entity.room.StreamClient;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.util.InitializationContainer;
@@ -257,7 +258,7 @@ public class Application extends Authent
}
}
- private static boolean hasVideo(org.apache.openmeetings.db.entity.room.Client rcl) {
+ private static boolean hasVideo(StreamClient rcl) {
return rcl != null && rcl.getAvsettings().contains("v");
}
@@ -266,7 +267,7 @@ public class Application extends Authent
}
@Override
- public org.apache.openmeetings.db.entity.room.Client updateClient(org.apache.openmeetings.db.entity.room.Client rcl, boolean forceSize) {
+ public StreamClient updateClient(StreamClient rcl, boolean forceSize) {
if (rcl == null) {
return null;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java Sun Apr 23 04:23:36 2017
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.core.remote.ScopeApplicationAdapter;
import org.apache.openmeetings.core.session.SessionManager;
import org.apache.openmeetings.db.dto.server.ClientSessionInfo;
-import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.StreamClient;
import org.apache.openmeetings.web.app.Application;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -32,13 +32,13 @@ import org.slf4j.Logger;
public class RoomBroadcaster {
private static final Logger log = Red5LoggerFactory.getLogger(RoomBroadcaster.class, webAppRootKey);
- public static Client getClient(String publicSid) {
+ public static StreamClient getClient(String publicSid) {
ClientSessionInfo csi = getBean(SessionManager.class).getClientByPublicSIDAnyServer(publicSid);
return csi == null ? null : csi.getRcl();
}
public static void broadcast(String publicSid, String method, Object obj) {
- Client rc = getClient(publicSid);
+ StreamClient rc = getClient(publicSid);
if (rc == null) {
return;
}
@@ -51,7 +51,7 @@ public class RoomBroadcaster {
}
public static void sendUpdatedClient(org.apache.openmeetings.db.entity.basic.Client client) {
- org.apache.openmeetings.db.entity.room.Client rcl = Application.get().updateClient(getClient(client.getUid()), true);
+ StreamClient rcl = Application.get().updateClient(getClient(client.getUid()), true);
log.debug("----------- sendUpdatedClient ");
if (rcl == null) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Sun Apr 23 04:23:36 2017
@@ -34,10 +34,11 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
-import org.apache.directory.api.util.Strings;
+import org.apache.openmeetings.core.util.RoomHelper;
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
+import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -78,6 +79,7 @@ import org.apache.wicket.markup.head.Pri
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.protocol.ws.api.event.WebSocketPushPayload;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -122,7 +124,7 @@ public class RoomPanel extends BasePanel
target.appendJavaScript(String.format("VideoManager.init(%s);", options));
WebSocketHelper.sendRoom(new RoomMessage(r.getId(), getUserId(), RoomMessage.Type.roomEnter));
// play video from other participants
- playVideos(target);
+ initVideos(target);
getMainPanel().getChat().roomEnter(r, target);
if (r.isFilesOpened()) {
sidebar.setFilesActive(target);
@@ -157,14 +159,21 @@ public class RoomPanel extends BasePanel
//private String publishingUser = null;
}
- private void playVideos(AjaxRequestTarget target) {
- for (Client c: getRoomClients(getRoom().getId()) ){
+ private void initVideos(AjaxRequestTarget target) {
+ StringBuilder sb = new StringBuilder();
+ for (Client c: getRoomClients(getRoom().getId()) ) {
boolean self = getClient().getUid().equals(c.getUid());
- if (!self) {
- JSONObject json = c.toJson(self).put("sid", getSid());
- // TODO we should check if client is screenShare, see onEvent newStream case.
- target.appendJavaScript(String.format("VideoManager.play(%s);", json));
+ if (c.hasAnyActivity(Client.Activity.broadcastA, Client.Activity.broadcastV)) {
+ sb.append(String.format("VideoManager.play(%s);"
+ , RoomHelper.videoJson(c, self, getSid(), getBean(ISessionManager.class), false)));
}
+ if (c.hasActivity(Client.Activity.share)) {
+ sb.append(String.format("VideoManager.play(%s);"
+ , RoomHelper.videoJson(c, self, getSid(), getBean(ISessionManager.class), true)));
+ }
+ }
+ if (!Strings.isEmpty(sb)) {
+ target.appendJavaScript(sb);
}
}
@@ -399,15 +408,8 @@ public class RoomPanel extends BasePanel
Client c = getOnlineClient(obj.getString("uid"));
boolean self = getClient().getUid().equals(c.getUid());
if (!self) {
- JSONObject json = c.toJson(self).put("sid", getSid());
- if (obj.optBoolean("screenShare", false)) {
- json.put("screenShare", true)
- .put("uid", obj.getString("suid")) // unique screen-sharing ID
- .put("broadcastId", obj.getString("broadcastId"))
- .put("width", obj.getInt("width"))
- .put("height", obj.getInt("height"));
- }
- handler.appendJavaScript(String.format("VideoManager.play(%s);", json));
+ handler.appendJavaScript(String.format("VideoManager.play(%s);"
+ , RoomHelper.videoJson(c, self, getSid(), getBean(ISessionManager.class), obj.optBoolean("screenShare", false))));
}
}
break;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Sun Apr 23 04:23:36 2017
@@ -38,6 +38,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.room.RoomPoll;
+import org.apache.openmeetings.db.entity.room.StreamClient;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.message.RoomMessage.Type;
@@ -300,13 +301,13 @@ public class RoomMenuPanel extends Panel
StringBuilder roomTitle = new StringBuilder();
if (room.getRecordingUser() != null) {
ISessionManager sessMngr = getBean(ISessionManager.class);
- org.apache.openmeetings.db.entity.room.Client recUser = sessMngr.getClientByPublicSID(room.getRecordingUser(), null); //TODO check server
+ StreamClient recUser = sessMngr.getClientByPublicSID(room.getRecordingUser(), null); //TODO check server
if (recUser != null) {
roomTitle.append(String.format("%s %s %s %s %s", getString("419")
, recUser.getUsername(), recUser.getFirstname(), recUser.getLastname(), df.format(recUser.getConnectedSince())));
roomClass.append(" screen");
}
- org.apache.openmeetings.db.entity.room.Client pubUser = sessMngr.getClientByPublicSID(room.getPublishingUser(), null); //TODO check server
+ StreamClient pubUser = sessMngr.getClientByPublicSID(room.getPublishingUser(), null); //TODO check server
if (pubUser != null) {
if (recUser != null) {
roomTitle.append('\n');
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js Sun Apr 23 04:23:36 2017
@@ -31,7 +31,7 @@ var Video = (function() {
vc.width(w).height(h);
swf.attr('width', w).attr('height', h);
}
- function _init(_box, _c) {
+ function _init(_box, _uid, _c) {
c = _c;
box = _box;
size = {width: c.width, height: c.height};
@@ -95,12 +95,13 @@ var Video = (function() {
o.cam = c.cam;
o.mic = c.mic;
o.mode = 'broadcast';
+ o.uid = c.uid;
} else {
o.mode = 'play';
+ o.uid = _uid;
}
o.width = c.width;
o.height = c.height;
- o.uid = c.uid;
o.sid = c.sid;
o.broadcastId = c.broadcastId;
swf = initVideo(vc, _id + '-swf', o);
@@ -134,7 +135,7 @@ var VideoManager = (function() {
, av = audio || video
, v = $('#' + _id);
if (av && v.length != 1 && !!c.self) {
- Video().init(box, c);
+ Video().init(box, options.uid, c);
} else if (av && v.length == 1) {
v.data().update(c);
} else if (!av && v.length == 1) {
@@ -142,7 +143,7 @@ var VideoManager = (function() {
}
}
function _play(c) {
- Video().init(box, c);
+ Video().init(box, options.uid, c);
}
function _close(uid) {
var _id = _getVid(uid), v = $('#' + _id);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Sun Apr 23 04:23:36 2017
@@ -46,7 +46,7 @@
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
- <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.StreamClient</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Sun Apr 23 04:23:36 2017
@@ -46,7 +46,7 @@
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
- <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.StreamClient</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Sun Apr 23 04:23:36 2017
@@ -45,7 +45,7 @@
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
- <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.StreamClient</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Sun Apr 23 04:23:36 2017
@@ -46,7 +46,7 @@
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
- <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.StreamClient</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Sun Apr 23 04:23:36 2017
@@ -46,7 +46,7 @@
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
- <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.StreamClient</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Sun Apr 23 04:23:36 2017
@@ -46,7 +46,7 @@
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
- <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.StreamClient</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java Sun Apr 23 04:23:36 2017
@@ -24,7 +24,7 @@ import java.util.List;
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.room.StreamClient;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -58,7 +58,7 @@ public class TestDbSession extends Abstr
serverDao.update(server, null);
}
- Client cl1 = new Client();
+ StreamClient cl1 = new StreamClient();
cl1.setStreamid("1");
cl1.setServer(null);
cl1.setUserId(1L);
@@ -66,7 +66,7 @@ public class TestDbSession extends Abstr
cl1.setPublicSID("public1");
clientDao.add(cl1);
- Client cl2 = new Client();
+ StreamClient cl2 = new StreamClient();
cl2.setStreamid("2");
cl2.setServer(null);
cl2.setRoomId(1L);
@@ -74,7 +74,7 @@ public class TestDbSession extends Abstr
cl2.setPublicSID("public2");
clientDao.add(cl2);
- Client cl3 = new Client();
+ StreamClient cl3 = new StreamClient();
cl3.setStreamid("3");
cl3.setServer(server);
cl3.setRoomId(3L);
@@ -82,21 +82,21 @@ public class TestDbSession extends Abstr
cl3.setPublicSID("public3");
clientDao.add(cl3);
- Client clTest = clientDao.getClientByServerAndStreamId(null, "1");
+ StreamClient clTest = clientDao.getClientByServerAndStreamId(null, "1");
log.debug("cl1 " + cl1);
log.debug("clTest " + clTest);
assertEquals(clTest.getId(), cl1.getId());
- Client clTest3 = clientDao.getClientByServerAndStreamId(server, "3");
+ StreamClient clTest3 = clientDao.getClientByServerAndStreamId(server, "3");
log.debug("cl3 " + cl3);
log.debug("clTest3 " + clTest3);
assertEquals(clTest3.getId(), cl3.getId());
- Client clTest_NOT_3 = clientDao.getClientByServerAndStreamId(null, "3");
+ StreamClient clTest_NOT_3 = clientDao.getClientByServerAndStreamId(null, "3");
log.debug("clTest_NOT_3 " + clTest_NOT_3);
assertEquals(null, clTest_NOT_3);
@@ -110,51 +110,51 @@ public class TestDbSession extends Abstr
long numberOfClients4 = clientDao.countClientsByServerAndStreamId(null, "3");
assertEquals(0, numberOfClients4);
- List<Client> clTest_Pub_1_list = clientDao.getClientsByPublicSIDAndServer(null, "public1");
+ List<StreamClient> clTest_Pub_1_list = clientDao.getClientsByPublicSIDAndServer(null, "public1");
assertEquals(cl1.getId(), clTest_Pub_1_list.get(0).getId());
- List<Client> clTest_Pub_3_list = clientDao.getClientsByPublicSIDAndServer(server, "public3");
+ List<StreamClient> clTest_Pub_3_list = clientDao.getClientsByPublicSIDAndServer(server, "public3");
assertEquals(cl3.getId(), clTest_Pub_3_list.get(0).getId());
- List<Client> clTest_Fail_list = clientDao.getClientsByPublicSIDAndServer(null, "public3");
+ List<StreamClient> clTest_Fail_list = clientDao.getClientsByPublicSIDAndServer(null, "public3");
assertEquals(0, clTest_Fail_list.size());
- List<Client> clTest_PubAll_1_list = clientDao.getClientsByPublicSID("public1");
+ List<StreamClient> clTest_PubAll_1_list = clientDao.getClientsByPublicSID("public1");
assertEquals(cl1.getId(), clTest_PubAll_1_list.get(0).getId());
- List<Client> clTest_PubAll_3_list = clientDao.getClientsByPublicSID("public3");
+ List<StreamClient> clTest_PubAll_3_list = clientDao.getClientsByPublicSID("public3");
assertEquals(cl3.getId(), clTest_PubAll_3_list.get(0).getId());
- List<Client> clTest_FailAll_list = clientDao.getClientsByPublicSID("public4");
+ List<StreamClient> clTest_FailAll_list = clientDao.getClientsByPublicSID("public4");
assertEquals(0, clTest_FailAll_list.size());
- List<Client> clientsByServerNull = clientDao.getClientsByServer(null);
+ List<StreamClient> clientsByServerNull = clientDao.getClientsByServer(null);
assertEquals(2, clientsByServerNull.size());
- List<Client> clientsByServer = clientDao.getClientsByServer(server);
+ List<StreamClient> clientsByServer = clientDao.getClientsByServer(server);
assertEquals(1, clientsByServer.size());
- List<Client> clientsAll = clientDao.getClients();
+ List<StreamClient> clientsAll = clientDao.getClients();
assertEquals(3, clientsAll.size());
//by userid
- List<Client> clTest_User_1_list = clientDao.getClientsByUserId(null, 1L);
+ List<StreamClient> clTest_User_1_list = clientDao.getClientsByUserId(null, 1L);
assertEquals(cl1.getId(), clTest_User_1_list.get(0).getId());
- List<Client> clTest_User_3_list = clientDao.getClientsByUserId(server, 3L);
+ List<StreamClient> clTest_User_3_list = clientDao.getClientsByUserId(server, 3L);
assertEquals(cl3.getId(), clTest_User_3_list.get(0).getId());
- List<Client> clTest_UserFail_list = clientDao.getClientsByUserId(null, 3L);
+ List<StreamClient> clTest_UserFail_list = clientDao.getClientsByUserId(null, 3L);
assertEquals(0, clTest_UserFail_list.size());
//by roomid
- List<Client> clTest_Room_1_list = clientDao.getClientsByRoomId(1L);
+ List<StreamClient> clTest_Room_1_list = clientDao.getClientsByRoomId(1L);
assertEquals(2, clTest_Room_1_list.size());
- List<Client> clTest_Room_3_list = clientDao.getClientsByRoomId(3L);
+ List<StreamClient> clTest_Room_3_list = clientDao.getClientsByRoomId(3L);
assertEquals(cl3.getId(), clTest_Room_3_list.get(0).getId());
- List<Client> clTest_RoomFail_list = clientDao.getClientsByRoomId(2L);
+ List<StreamClient> clTest_RoomFail_list = clientDao.getClientsByRoomId(2L);
assertEquals(0, clTest_RoomFail_list.size());
//count all
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java Sun Apr 23 04:23:36 2017
@@ -24,7 +24,7 @@ import java.util.List;
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.room.StreamClient;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -58,7 +58,7 @@ public class TestDbSessionGetRoomIds ext
serverDao.update(server, null);
}
- Client cl1 = new Client();
+ StreamClient cl1 = new StreamClient();
cl1.setStreamid("1");
cl1.setServer(server);
cl1.setUserId(1L);
@@ -66,7 +66,7 @@ public class TestDbSessionGetRoomIds ext
cl1.setPublicSID("public1");
clientDao.add(cl1);
- Client cl2 = new Client();
+ StreamClient cl2 = new StreamClient();
cl2.setStreamid("2");
cl2.setServer(server);
cl2.setRoomId(1L);
@@ -74,7 +74,7 @@ public class TestDbSessionGetRoomIds ext
cl2.setPublicSID("public2");
clientDao.add(cl2);
- Client cl3 = new Client();
+ StreamClient cl3 = new StreamClient();
cl3.setStreamid("3");
cl3.setServer(server);
cl3.setRoomId(3L);
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java?rev=1792340&r1=1792339&r2=1792340&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java Sun Apr 23 04:23:36 2017
@@ -27,7 +27,7 @@ import java.util.Random;
import org.apache.openmeetings.core.session.store.HashMapStore;
import org.apache.openmeetings.core.session.store.IClientPersistenceStore;
-import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.StreamClient;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.CryptProvider;
@@ -54,7 +54,7 @@ public class TestHashMapSession extends
String streamId = ""+i;
- Client rcm = new Client();
+ StreamClient rcm = new StreamClient();
rcm.setConnectedSince(new Date());
rcm.setStreamid(streamId);
rcm.setScope("scopeName");