You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2013/01/24 04:51:19 UTC
svn commit: r1437854 [1/2] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ src/org/apache/openmeetings/axis/services/
src/org/apache/openmeetings/cluster/sync/
src/org/apache/openmeetings/conference/whiteboard/ src/org/apache/openm...
Author: sebawagner
Date: Thu Jan 24 03:51:18 2013
New Revision: 1437854
URL: http://svn.apache.org/viewvc?rev=1437854&view=rev
Log:
OPENMEETINGS-460 Remove IClientSession as there is only one implementation of the "Client". Re-factor code to remove usage of IClientSession. Create interface to alternatively store the client in the memory or in the database.
Rename Store to "manager" as it does not "store" anything, it just creates the Client session object and gives to "store" that either stores it in the database (TODO) or in memory.
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionManager.java
- copied, changed from r1437706, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionStore.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ServerSession.java
- copied, changed from r1437706, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSession.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java
- copied, changed from r1437706, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientHashMapStore.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
- copied, changed from r1437706, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/cache/HashMapStore.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/Client.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientDatabaseStore.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientHashMapStore.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSession.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/IClientSession.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionStore.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/cache/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSessionInfo.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/poll/TestClientListManager.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Thu Jan 24 03:51:18 2013
@@ -54,8 +54,8 @@
<!-- In memory / session stores -->
- <bean id="openmeetings.ClientListManager"
- class="org.apache.openmeetings.session.ClientHashMapStore" />
+ <bean id="openmeetings.SessionManager"
+ class="org.apache.openmeetings.session.SessionManager" />
<bean id="openmeetings.EmoticonsManager"
class="org.apache.openmeetings.remote.red5.EmoticonsManager" />
<bean id="openmeetings.WhiteBoardObjectListManager"
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java Thu Jan 24 03:51:18 2013
@@ -42,14 +42,13 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.remote.ConferenceService;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.session.Client;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -86,7 +85,7 @@ public class RoomWebService {
@Autowired
private ConferenceService conferenceService;
@Autowired
- private ISessionStore clientListManager;
+ private ISessionManager sessionManager;
@Autowired
private MeetingMemberLogic meetingMemberLogic;
@Autowired
@@ -503,7 +502,7 @@ public class RoomWebService {
rCountBean.setRoomName(room.getName());
rCountBean.setMaxUser(room.getNumberOfPartizipants()
.intValue());
- rCountBean.setRoomCount(clientListManager
+ rCountBean.setRoomCount(sessionManager
.getClientListByRoom(room.getRooms_id(), null).size());
roomsArray[i] = rCountBean;
@@ -571,13 +570,13 @@ public class RoomWebService {
roomReturn.setName(room.getName());
roomReturn.setRoom_id(room.getRooms_id());
- List<Client> map = clientListManager
+ List<Client> map = sessionManager
.getClientListByRoom(room.getRooms_id(), null);
RoomUser[] roomUsers = new RoomUser[map.size()];
int i = 0;
- for (IClientSession rcl : map) {
+ for (Client rcl : map) {
RoomUser roomUser = new RoomUser();
roomUser.setFirstname(rcl.getFirstname());
roomUser.setLastname(rcl.getLastname());
@@ -2064,7 +2063,7 @@ public class RoomWebService {
RoomUser[] rUser = new RoomUser[room.getCurrentusers().size()];
int i = 0;
- for (IClientSession rcl : room.getCurrentusers()) {
+ for (Client rcl : room.getCurrentusers()) {
RoomUser ru = new RoomUser();
ru.setFirstname(rcl.getFirstname());
@@ -2131,7 +2130,7 @@ public class RoomWebService {
RoomUser[] rUser = new RoomUser[room.getCurrentusers().size()];
int i = 0;
- for (IClientSession rcl : room.getCurrentusers()) {
+ for (Client rcl : room.getCurrentusers()) {
RoomUser ru = new RoomUser();
ru.setFirstname(rcl.getFirstname());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java Thu Jan 24 03:51:18 2013
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.cluster.sync;
-import java.lang.reflect.Constructor;
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -55,7 +54,6 @@ public class RestClient {
KICK_USER,
}
- private Server server;
private final String host;
private final int port;
private final String protocol;
@@ -68,14 +66,7 @@ public class RestClient {
private String publicSID;
- /**
- * there are two publicSIDs, one for the kickUser REST call and one for the syncMessage call
- * theoretically they could be performed at the same time but to different users, so we don't want
- * to use the same variable for both
- */
- private String publicSIDSync;
-
- private static String nameSpaceForSlaveDto = "http://room.conference.openmeetings.apache.org/xsd";
+// private static String nameSpaceForSlaveDto = "http://room.conference.openmeetings.apache.org/xsd";
private static String NAMESPACE_PREFIX = "http://services.axis.openmeetings.apache.org";
@@ -83,11 +74,11 @@ public class RestClient {
return protocol + "://" + host + ":" + port + "/" + webapp
+ "/services/UserService";
}
-
- private String getRoomServiceEndPoint() {
- return protocol + "://" + host + ":" + port + "/" + webapp
- + "/services/RoomService";
- }
+//
+// private String getRoomServiceEndPoint() {
+// return protocol + "://" + host + ":" + port + "/" + webapp
+// + "/services/RoomService";
+// }
/**
* The observerInstance will be notified whenever a ping was completed
@@ -101,7 +92,7 @@ public class RestClient {
* @param pass
*/
public RestClient(Server server) {
- this.server = server;
+ //this.server = server;
this.host = server.getAddress();
this.port = server.getPort();
this.protocol = server.getProtocol();
@@ -374,31 +365,31 @@ public class RestClient {
* @param typeObject
* @return
*/
- private <T> T getElementTextByName(OMElement resultElement, String elementName, Class<T> typeObject) {
- try {
- OMElement userIdElement = resultElement
- .getFirstChildWithName(new QName(nameSpaceForSlaveDto, elementName));
- if (userIdElement != null && userIdElement.getText() != null
- && userIdElement.getText().length() > 0) {
-
- String defaultValue = userIdElement.getText();
-
- // Either this can be directly assigned or try to find a constructor
- // that handles it
- if (typeObject.isAssignableFrom(defaultValue.getClass())) {
- return typeObject.cast(defaultValue);
- }
- Constructor<T> c = typeObject.getConstructor(defaultValue
- .getClass());
- return c.newInstance(defaultValue);
-
- }
- } catch (Exception err) {
- //Catch any class cast exception, but log only
- log.error("[getElementTextByName]", err);
- }
- return null;
- }
+// private <T> T getElementTextByName(OMElement resultElement, String elementName, Class<T> typeObject) {
+// try {
+// OMElement userIdElement = resultElement
+// .getFirstChildWithName(new QName(nameSpaceForSlaveDto, elementName));
+// if (userIdElement != null && userIdElement.getText() != null
+// && userIdElement.getText().length() > 0) {
+//
+// String defaultValue = userIdElement.getText();
+//
+// // Either this can be directly assigned or try to find a constructor
+// // that handles it
+// if (typeObject.isAssignableFrom(defaultValue.getClass())) {
+// return typeObject.cast(defaultValue);
+// }
+// Constructor<T> c = typeObject.getConstructor(defaultValue
+// .getClass());
+// return c.newInstance(defaultValue);
+//
+// }
+// } catch (Exception err) {
+// //Catch any class cast exception, but log only
+// log.error("[getElementTextByName]", err);
+// }
+// return null;
+// }
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java Thu Jan 24 03:51:18 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.conferen
import java.util.List;
-import org.apache.openmeetings.session.Client;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
public class RoomStatus {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java Thu Jan 24 03:51:18 2013
@@ -33,8 +33,8 @@ import javax.persistence.criteria.Root;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -59,7 +59,7 @@ public class Sessionmanagement {
@Autowired
private ManageCryptStyle manageCryptStyle;
@Autowired
- private ISessionStore clientListManager;
+ private ISessionManager sessionManager;
/**
* creates a new session-object in the database
@@ -484,7 +484,7 @@ public class Sessionmanagement {
*/
public void clearSessionByRoomId(Long room_id) {
try {
- for (IClientSession rcl : clientListManager.getClientListByRoom(room_id, null)) {
+ for (Client rcl : sessionManager.getClientListByRoom(room_id, null)) {
String aux = rcl.getSwfurl();
int init_pos = aux.indexOf("sid=") + 4;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java Thu Jan 24 03:51:18 2013
@@ -33,7 +33,7 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.poll.PollType;
import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
import org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers;
-import org.apache.openmeetings.session.IClientSession;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +75,7 @@ public class PollManagement {
return q.getSingleResult();
}
- public RoomPoll createPoll(IClientSession rc, String pollName, String pollQuestion, Long pollTypeId) {
+ public RoomPoll createPoll(Client rc, String pollName, String pollQuestion, Long pollTypeId) {
RoomPoll roomP = new RoomPoll();
roomP.setCreatedBy(usermanagement.getUserById(rc.getUser_id()));
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java Thu Jan 24 03:51:18 2013
@@ -45,7 +45,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation;
import org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe;
import org.apache.openmeetings.persistence.beans.user.Users;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ISessionManager;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,7 +74,7 @@ public class Roommanagement {
@Autowired
private AuthLevelmanagement authLevelManagement;
@Autowired
- private ISessionStore clientListManager;
+ private ISessionManager sessionManager;
@Autowired
private ConfigurationDao configurationDaoImpl;
@Autowired
@@ -166,7 +166,7 @@ public class Roommanagement {
Rooms room = roomDao.get(rooms_id);
if (room != null) {
- room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id(), null));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id(), null));
return room;
}
@@ -252,7 +252,7 @@ public class Roommanagement {
asc);
for (Rooms room : rooms) {
- room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id(), null));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id(), null));
}
sResult.setResult(rooms);
@@ -273,7 +273,7 @@ public class Roommanagement {
asc);
for (Rooms room : rooms) {
- room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id(), null));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id(), null));
}
return rooms;
@@ -295,7 +295,7 @@ public class Roommanagement {
orderby, asc, externalRoomType);
for (Rooms room : rooms) {
- room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id(), null));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id(), null));
}
return rooms;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java Thu Jan 24 03:51:18 2013
@@ -43,7 +43,6 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.Sessionmanagement;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
@@ -51,14 +50,13 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.persistence.beans.user.Userdata;
import org.apache.openmeetings.persistence.beans.user.Userlevel;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
-import org.apache.openmeetings.session.Client;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.templates.ResetPasswordTemplate;
import org.apache.openmeetings.utils.DaoHelper;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -113,9 +111,7 @@ public class Usermanagement {
@Autowired
private AuthLevelmanagement authLevelManagement;
@Autowired
- private ISessionStore clientListManager;
- @Autowired
- private ServerDao serverDao;
+ private ISessionManager sessionManager;
/**
* query for a list of users
@@ -229,7 +225,7 @@ public class Usermanagement {
* @return
*/
public Object loginUser(String SID, String userOrEmail, String userpass,
- IClientSession currentClient, IClient client, Boolean storePermanent) {
+ Client currentClient, IClient client, Boolean storePermanent) {
try {
log.debug("Login user SID : " + SID + " Stored Permanent :"
+ storePermanent);
@@ -1458,7 +1454,7 @@ public class Usermanagement {
sessionManagement.clearSessionByRoomId(room_id);
- for (Client rcl : clientListManager.getClientListByRoom(room_id, null)) {
+ for (Client rcl : sessionManager.getClientListByRoom(room_id, null)) {
if (rcl == null) {
return true;
}
@@ -1494,7 +1490,7 @@ public class Usermanagement {
// admins only
if (authLevelManagement.checkWebServiceLevel(user_level)) {
- Client rcl = clientListManager
+ Client rcl = sessionManager
.getClientByPublicSID(publicSID, false, null);
if (rcl == null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java Thu Jan 24 03:51:18 2013
@@ -62,8 +62,6 @@ public class UsersDao implements IDataPr
@Autowired
private ManageCryptStyle cryptManager;
@Autowired
- private SalutationDao salutationDaoImpl;
- @Autowired
private ConfigurationDao configDao;
@Autowired
private OmTimeZoneDao omTimeZoneDaoImpl;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java Thu Jan 24 03:51:18 2013
@@ -39,7 +39,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
-import org.apache.openmeetings.session.IClientSession;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
@@ -236,7 +236,7 @@ public class LdapLoginManagement {
*/
// ----------------------------------------------------------------------------------------
public Object doLdapLogin(String user, String passwd,
- IClientSession currentClient, IClient client, String SID, String domain) {
+ Client currentClient, IClient client, String SID, String domain) {
log.debug("LdapLoginmanagement.doLdapLogin");
// Retrieve Configuration Data
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java Thu Jan 24 03:51:18 2013
@@ -117,7 +117,7 @@ public class Server implements Serializa
@Column(name = "active", nullable = true)
@Element(data = true, required = false)
private Boolean active;
-
+
@Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted = false;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java Thu Jan 24 03:51:18 2013
@@ -28,17 +28,16 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.openmeetings.session.IClientSession;
import org.apache.openmeetings.utils.math.CalendarPatterns;
/**
- * @see IClientSession
+ * @see Client
* @author sebawagner
*
*/
@Entity
@Table(name = "client")
-public class Client implements Serializable, IClientSession {
+public class Client implements Serializable {
/**
*
@@ -51,320 +50,320 @@ public class Client implements Serializa
private long id;
/**
- * @see IClientSession#getUsername()
+ * @see Client#getUsername()
*/
@Column(name = "username")
private String username = "";
/**
- * @see IClientSession#getStreamid()
+ * @see Client#getStreamid()
*/
@Column(name = "streamid")
private String streamid = "";
/**
- * @see IClientSession#getScope()
+ * @see Client#getScope()
*/
@Column(name = "scope")
private String scope = "";
/**
- * @see IClientSession#getVWidth()
+ * @see Client#getVWidth()
*/
@Column(name = "vwidth")
private int vWidth = 0;
/**
- * @see IClientSession#getVHeight()
+ * @see Client#getVHeight()
*/
@Column(name = "vheight")
private int vHeight = 0;
/**
- * @see IClientSession#getVX()
+ * @see Client#getVX()
*/
@Column(name = "vx")
private int vX = 0;
/**
- * @see IClientSession#getVY()
+ * @see Client#getVY()
*/
@Column(name = "vy")
private int vY = 0;
/**
- * @see IClientSession#getStreamPublishName()
+ * @see Client#getStreamPublishName()
*/
@Column(name = "stream_publish_name")
private String streamPublishName = "";
/**
- * @see IClientSession#getPublicSID()
+ * @see Client#getPublicSID()
*/
@Column(name = "public_sid")
private String publicSID = "";
/**
- * @see IClientSession#getIsMod()
+ * @see Client#getIsMod()
*/
@Column(name = "is_mod")
private Boolean isMod = false;
/**
- * @see IClientSession#getIsSuperModerator()
+ * @see Client#getIsSuperModerator()
*/
@Column(name = "is_supermoderator")
private Boolean isSuperModerator = false;
/**
- * @see IClientSession#getCanDraw()
+ * @see Client#getCanDraw()
*/
@Column(name = "can_draw")
private Boolean canDraw = false;
/**
- * @see IClientSession#getCanShare()
+ * @see Client#getCanShare()
*/
@Column(name = "can_share")
private Boolean canShare = false;
/**
- * @see IClientSession#getCanRemote()
+ * @see Client#getCanRemote()
*/
@Column(name = "can_remote")
private Boolean canRemote = false;
/**
- * @see IClientSession#getCanGiveAudio()
+ * @see Client#getCanGiveAudio()
*/
@Column(name = "can_giveaudio")
private Boolean canGiveAudio = false;
/**
- * @see IClientSession#getConnectedSince()
+ * @see Client#getConnectedSince()
*/
@Column(name = "connected_since")
private Date connectedSince;
/**
- * @see IClientSession#getFormatedDate()
+ * @see Client#getFormatedDate()
*/
@Column(name = "formated_date")
private String formatedDate;
/**
- * @see IClientSession#getIsScreenClient()
+ * @see Client#getIsScreenClient()
*/
@Column(name = "is_screenclient")
private Boolean isScreenClient = false;
/**
- * @see IClientSession#getIsAVClient()
+ * @see Client#getIsAVClient()
*/
@Column(name = "is_avclient")
private boolean isAVClient = false;
/**
- * @see IClientSession#getUsercolor()
+ * @see Client#getUsercolor()
*/
@Column(name = "usercolor")
private String usercolor;
/**
- * @see IClientSession#getUserpos()
+ * @see Client#getUserpos()
*/
@Column(name = "userpos")
private Integer userpos;
/**
- * @see IClientSession#getUserip()
+ * @see Client#getUserip()
*/
@Column(name = "userip")
private String userip;
/**
- * @see IClientSession#getUserport()
+ * @see Client#getUserport()
*/
@Column(name = "userport")
private int userport;
/**
- * @see IClientSession#getRoom_id()
+ * @see Client#getRoom_id()
*/
@Column(name = "room_id")
private Long room_id;
/**
- * @see IClientSession#getRoomEnter()
+ * @see Client#getRoomEnter()
*/
@Column(name = "room_enter")
private Date roomEnter = null;
/**
- * @see IClientSession#getBroadCastID()
+ * @see Client#getBroadCastID()
*/
@Column(name = "broadcast_id")
private long broadCastID = -2;
/**
- * @see IClientSession#getUser_id()
+ * @see Client#getUser_id()
*/
@Column(name = "user_id")
private Long user_id = null;
/**
- * @see IClientSession#getFirstname()
+ * @see Client#getFirstname()
*/
@Column(name = "firstname")
private String firstname = "";
/**
- * @see IClientSession#getLastname()
+ * @see Client#getLastname()
*/
@Column(name = "lastname")
private String lastname = "";
/**
- * @see IClientSession#getMail()
+ * @see Client#getMail()
*/
@Column(name = "mail")
private String mail;
/**
- * @see IClientSession#getLastLogin()
+ * @see Client#getLastLogin()
*/
@Column(name = "last_login")
private String lastLogin;
/**
- * @see IClientSession#getOfficial_code()
+ * @see Client#getOfficial_code()
*/
@Column(name = "official_code")
private String official_code;
/**
- * @see IClientSession#getPicture_uri()
+ * @see Client#getPicture_uri()
*/
@Column(name = "picture_uri")
private String picture_uri;
/**
- * @see IClientSession#getLanguage()
+ * @see Client#getLanguage()
*/
@Column(name = "language")
private String language = "";
/**
- * @see IClientSession#getAvsettings()
+ * @see Client#getAvsettings()
*/
@Column(name = "avsettings")
private String avsettings = "";
/**
- * @see IClientSession#getSwfurl()
+ * @see Client#getSwfurl()
*/
// FIXME: Move to {@link ClientSession}
@Column(name = "swfurl")
private String swfurl;
/**
- * @see IClientSession#getIsRecording()
+ * @see Client#getIsRecording()
*/
@Column(name = "is_recording")
private Boolean isRecording = false;
/**
- * @see IClientSession#getRoomRecordingName()
+ * @see Client#getRoomRecordingName()
*/
@Column(name = "room_recording_name")
private String roomRecordingName;
/**
- * @see IClientSession#getFlvRecordingId()
+ * @see Client#getFlvRecordingId()
*/
@Column(name = "flvrecording_id")
private Long flvRecordingId;
/**
- * @see IClientSession#getFlvRecordingMetaDataId()
+ * @see Client#getFlvRecordingMetaDataId()
*/
@Column(name = "flvrecordingmetadata_id")
private Long flvRecordingMetaDataId;
/**
- * @see IClientSession#getOrganization_id()
+ * @see Client#getOrganization_id()
*/
@Column(name = "organization_id")
private Long organization_id;
/**
- * @see IClientSession#isStartRecording()
+ * @see Client#isStartRecording()
*/
@Column(name = "start_recording")
private boolean startRecording = false;
/**
- * @see IClientSession#isStartStreaming()
+ * @see Client#isStartStreaming()
*/
@Column(name = "start_streaming")
private boolean startStreaming = false;
/**
- * @see IClientSession#isScreenPublishStarted()
+ * @see Client#isScreenPublishStarted()
*/
@Column(name = "screen_publish_started")
private boolean screenPublishStarted = false;
/**
- * @see IClientSession#isStreamPublishStarted()
+ * @see Client#isStreamPublishStarted()
*/
@Column(name = "stream_publish_started")
private boolean streamPublishStarted = false;
/**
- * @see IClientSession#getIsBroadcasting()
+ * @see Client#getIsBroadcasting()
*/
@Column(name = "is_broadcasting")
private Boolean isBroadcasting = false;
/**
- * @see IClientSession#getExternalUserId()
+ * @see Client#getExternalUserId()
*/
@Column(name = "external_user_id")
private String externalUserId;
/**
- * @see IClientSession#getExternalUserType()
+ * @see Client#getExternalUserType()
*/
@Column(name = "external_user_type")
private String externalUserType;
/**
- * @see IClientSession#getInterviewPodId()
+ * @see Client#getInterviewPodId()
*/
@Column(name = "interview_pod_id")
private Integer interviewPodId = null;
/**
- * @see IClientSession#getAllowRecording()
+ * @see Client#getAllowRecording()
*/
@Column(name = "allow_recording")
private Boolean allowRecording = true;
/**
- * @see IClientSession#getZombieCheckFlag()
+ * @see Client#getZombieCheckFlag()
*/
@Column(name = "zombie_check_flag")
private Boolean zombieCheckFlag = false;
/**
- * @see IClientSession#getMicMuted()
+ * @see Client#getMicMuted()
*/
@Column(name = "mic_muted")
private Boolean micMuted = false;
/**
- * @see IClientSession#isSipTransport()
+ * @see Client#isSipTransport()
*/
@Column(name = "sip_transport")
private boolean sipTransport = false;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Thu Jan 24 03:51:18 2013
@@ -44,7 +44,6 @@ import javax.persistence.Transient;
import org.apache.openjpa.persistence.ElementDependent;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe;
-import org.apache.openmeetings.session.Client;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java Thu Jan 24 03:51:18 2013
@@ -32,13 +32,12 @@ import java.util.Set;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.conference.Roommanagement;
import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.remote.red5.EmoticonsManager;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
-import org.apache.openmeetings.session.Client;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.stringhandlers.ChatString;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
@@ -52,7 +51,7 @@ import org.springframework.beans.factory
/**
*
- * @author sebastianwagner
+ * @author sebawagner
*
*/
public class ChatService implements IPendingServiceCallback {
@@ -61,7 +60,7 @@ public class ChatService implements IPen
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
- private ISessionStore clientListManager = null;
+ private ISessionManager sessionManager = null;
@Autowired
private EmoticonsManager emoticonsManager;
@Autowired
@@ -109,7 +108,7 @@ public class ChatService implements IPen
public int sendMessageWithClient(Object newMessage) {
try {
IConnection current = Red5.getConnectionLocal();
- IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+ Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
Long room_id = currentClient.getRoom_id();
log.debug("room_id: " + room_id);
@@ -137,10 +136,10 @@ public class ChatService implements IPen
hsm.put("message", newMessage);
String publicSID = "" + messageMap.get(6);
if (!publicSID.equals(currentClient.getPublicSID())) {
- hsm.put("client", clientListManager.getClientByPublicSID("" + messageMap.get(6), false, null));
+ hsm.put("client", sessionManager.getClientByPublicSID("" + messageMap.get(6), false, null));
//need to remove unconfirmed chat message if any
for (int i = myChatList.size() - 1; i > -1; --i) {
- IClientSession msgClient = (IClientSession)myChatList.get(i).get("client");
+ Client msgClient = (Client)myChatList.get(i).get("client");
@SuppressWarnings("rawtypes")
List msgList = (List)myChatList.get(i).get("message");
if (publicSID.equals(msgClient.getPublicSID())
@@ -170,7 +169,7 @@ public class ChatService implements IPen
if (conn != null) {
if (conn instanceof IServiceCapableConnection) {
- IClientSession rcl = this.clientListManager.getClientByStreamId(conn.getClient().getId(), null);
+ Client rcl = this.sessionManager.getClientByStreamId(conn.getClient().getId(), null);
if (rcl == null) {
continue;
@@ -201,7 +200,7 @@ public class ChatService implements IPen
public int sendMessageWithClientByPublicSID(Object newMessage, String publicSID) {
try {
IConnection current = Red5.getConnectionLocal();
- IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+ Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
Long room_id = currentClient.getRoom_id();
Long user_level = usermanagement.getUserLevelByID(currentClient.getUser_id());
Rooms room = roommanagement.getRoomById(user_level, room_id);
@@ -260,7 +259,7 @@ public class ChatService implements IPen
public List<HashMap<String,Object>> clearChat() {
try {
IConnection current = Red5.getConnectionLocal();
- IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+ Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
Long room_id = currentClient.getRoom_id();
Long chatroom = room_id;
@@ -286,7 +285,7 @@ public class ChatService implements IPen
public List<HashMap<String,Object>> getRoomChatHistory() {
try {
IConnection current = Red5.getConnectionLocal();
- IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+ Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
Long room_id = currentClient.getRoom_id();
log.debug("GET CHATROOM: " + room_id);
@@ -351,7 +350,7 @@ public class ChatService implements IPen
public int sendMessageToOverallChat(Object newMessage) {
try {
IConnection current = Red5.getConnectionLocal();
- IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+ Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
//log.error(newMessage.getClass().getName());
ArrayList messageMap = (ArrayList) newMessage;
@@ -467,7 +466,7 @@ public class ChatService implements IPen
LinkedList<Client> guestList = new LinkedList<Client>();
LinkedList<Client> overallList = new LinkedList<Client>();
- for (Client rcl : clientListManager.getAllClients()) {
+ for (Client rcl : sessionManager.getAllClients()) {
if (rcl.getUser_id()==null || rcl.getUser_id()<=0) {
guestList.add(rcl);
} else {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java Thu Jan 24 03:51:18 2013
@@ -39,8 +39,8 @@ import org.apache.openmeetings.documents
import org.apache.openmeetings.documents.LibraryWmlLoader;
import org.apache.openmeetings.documents.LoadLibraryPresentation;
import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.crypt.MD5;
import org.red5.logging.Red5LoggerFactory;
@@ -63,7 +63,7 @@ public class ConferenceLibrary implement
ConferenceLibrary.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ISessionStore clientListManager = null;
+ private ISessionManager sessionManager = null;
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
@@ -180,7 +180,7 @@ public class ConferenceLibrary implement
if (authLevelManagement.checkUserLevel(user_level)) {
IConnection current = Red5.getConnectionLocal();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(current.getClient().getId(), null);
if (currentClient == null) {
@@ -223,7 +223,7 @@ public class ConferenceLibrary implement
for (IConnection conn : conset) {
if (conn != null) {
if (conn instanceof IServiceCapableConnection) {
- IClientSession rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByStreamId(conn.getClient()
.getId(), null);
if ((rcl == null)
@@ -294,7 +294,7 @@ public class ConferenceLibrary implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java Thu Jan 24 03:51:18 2013
@@ -44,15 +44,14 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.persistence.beans.rooms.RoomModerators;
import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation;
import org.apache.openmeetings.persistence.beans.user.Users;
-import org.apache.openmeetings.session.Client;
-import org.apache.openmeetings.session.ClientSession;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ServerSession;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
@@ -88,7 +87,7 @@ public class ConferenceService {
@Autowired
private TimezoneUtil timezoneUtil;
@Autowired
- private ISessionStore clientListManager = null;
+ private ISessionManager sessionManager = null;
@Autowired
private ServerDao serverDao;
@@ -151,7 +150,7 @@ public class ConferenceService {
organisation_id);
for (Rooms_Organisation roomOrg : roomOrgsList) {
- roomOrg.getRoom().setCurrentusers(clientListManager.getClientListByRoom(roomOrg.getRoom().getRooms_id(), null));
+ roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getRooms_id(), null));
}
return roomOrgsList;
@@ -231,7 +230,7 @@ public class ConferenceService {
List<Rooms> roomList = roomDao.getPublicRooms();
for (Rooms room : roomList) {
- room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id(), null));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id(), null));
}
return roomList;
@@ -293,7 +292,7 @@ public class ConferenceService {
log.debug("getCurrentRoomClient -2- " + streamid);
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Rooms room = roomDao.get(room_id);
@@ -439,7 +438,7 @@ public class ConferenceService {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
Rooms room = roommanagement.getRoomById(user_level, rooms_id);
- room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id(), null));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id(), null));
return room;
}
@@ -692,7 +691,7 @@ public class ConferenceService {
try {
Rooms room = roomDao.get(room_id);
- if (room.getNumberOfPartizipants() <= this.clientListManager
+ if (room.getNumberOfPartizipants() <= this.sessionManager
.getClientListByRoom(room_id, null).size()) {
return true;
}
@@ -711,7 +710,7 @@ public class ConferenceService {
* @return - all participants of a room
*/
public List<Client> getRoomClientsListByRoomId(Long room_id) {
- return clientListManager.getClientListByRoom(room_id, null);
+ return sessionManager.getClientListByRoom(room_id, null);
}
/**
@@ -724,13 +723,13 @@ public class ConferenceService {
* @param asc
* @return - list of the connections currently open
*/
- public SearchResult<ClientSession> getRoomClientsMap(String SID, int start, int max,
+ public SearchResult<ServerSession> getRoomClientsMap(String SID, int start, int max,
String orderby, boolean asc) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkAdminLevel(user_level)) {
- return this.clientListManager.getListByStartAndMax(start, max,
+ return this.sessionManager.getListByStartAndMax(start, max,
orderby, asc);
}
} catch (Exception err) {
@@ -750,7 +749,7 @@ public class ConferenceService {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkAdminLevel(user_level)) {
- return this.clientListManager.getSessionStatistics();
+ return this.sessionManager.getSessionStatistics();
}
} catch (Exception err) {
log.error("[getRoomClientsMap]", err);
@@ -817,14 +816,14 @@ public class ConferenceService {
//the user will be just redirected to the same server
//check if the user is on master hosted, (serverId == null)
- for (Long activeRoomId : clientListManager.getActiveRoomIdsByServer(null)) {
+ for (Long activeRoomId : sessionManager.getActiveRoomIdsByServer(null)) {
if (activeRoomId.equals(roomId)) {
return null;
}
}
for (Server server : serverList) {
- for (Long activeRoomId : clientListManager.getActiveRoomIdsByServer(server)) {
+ for (Long activeRoomId : sessionManager.getActiveRoomIdsByServer(server)) {
if (activeRoomId.equals(roomId)) {
return new ServerDTO(server);
}
@@ -839,7 +838,7 @@ public class ConferenceService {
//Locally handled sessions are serverId = null
List<Rooms> localRoomList = new ArrayList<Rooms>();
- for (Long activeRoomId : clientListManager.getActiveRoomIdsByServer(null)) {
+ for (Long activeRoomId : sessionManager.getActiveRoomIdsByServer(null)) {
//FIXME / TODO: This is the single query to get the room by its id
localRoomList.add(roomDao.get(activeRoomId));
}
@@ -848,7 +847,7 @@ public class ConferenceService {
//Slave/Server rooms
for (Server server : serverList) {
List<Rooms> roomList = new ArrayList<Rooms>();
- for (Long activeRoomId : clientListManager.getActiveRoomIdsByServer(server)) {
+ for (Long activeRoomId : sessionManager.getActiveRoomIdsByServer(server)) {
//FIXME / TODO: This is the single query to get the room by its id
roomList.add(roomDao.get(activeRoomId));
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java Thu Jan 24 03:51:18 2013
@@ -46,10 +46,9 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.session.Client;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -81,7 +80,7 @@ public class FLVRecorderService implemen
// Spring Beans
@Autowired
- private ISessionStore clientListManager;
+ private ISessionManager sessionManager;
@Autowired
private FlvRecordingDao flvRecordingDaoImpl;
@Autowired
@@ -114,7 +113,7 @@ public class FLVRecorderService implemen
public void resultReceived(IPendingServiceCall arg0) {
}
- public IClientSession checkForRecording() {
+ public Client checkForRecording() {
try {
IConnection current = Red5.getConnectionLocal();
@@ -122,10 +121,10 @@ public class FLVRecorderService implemen
log.debug("getCurrentRoomClient -2- " + streamid);
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
- for (IClientSession rcl : clientListManager.getClientListByRoom(currentClient.getRoom_id(), null)) {
+ for (Client rcl : sessionManager.getClientListByRoom(currentClient.getRoom_id(), null)) {
if (rcl.getIsRecording()) {
return rcl;
}
@@ -156,7 +155,7 @@ public class FLVRecorderService implemen
log.debug(":: recordMeetingStream ::");
IConnection current = Red5.getConnectionLocal();
- Client currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(current.getClient().getId(), null);
Long room_id = currentClient.getRoom_id();
@@ -172,7 +171,7 @@ public class FLVRecorderService implemen
// Update Client and set Flag
currentClient.setIsRecording(true);
currentClient.setFlvRecordingId(flvRecordingId);
- this.clientListManager.updateClientByStreamId(current.getClient()
+ this.sessionManager.updateClientByStreamId(current.getClient()
.getId(), currentClient, false);
// get all stream and start recording them
@@ -182,7 +181,7 @@ public class FLVRecorderService implemen
for (IConnection conn : conset) {
if (conn != null) {
if (conn instanceof IServiceCapableConnection) {
- Client rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByStreamId(conn.getClient()
.getId(), null);
@@ -224,7 +223,7 @@ public class FLVRecorderService implemen
// Add Meta Data
rcl.setFlvRecordingMetaDataId(flvRecordingMetaDataId);
- this.clientListManager
+ this.sessionManager
.updateClientByStreamId(
rcl.getStreamid(), rcl, false);
@@ -266,7 +265,7 @@ public class FLVRecorderService implemen
rcl.setFlvRecordingMetaDataId(flvRecordingMetaDataId);
- this.clientListManager.updateClientByStreamId(
+ this.sessionManager.updateClientByStreamId(
rcl.getStreamid(), rcl, false);
// Start FLV recording
@@ -436,7 +435,7 @@ public class FLVRecorderService implemen
if (conn != null) {
if (conn instanceof IServiceCapableConnection) {
- IClientSession rcl = clientListManager.getClientByStreamId(
+ Client rcl = sessionManager.getClientByStreamId(
conn.getClient().getId(), null);
// FIXME: Check if this function is really in use at
@@ -508,7 +507,7 @@ public class FLVRecorderService implemen
currentClient.setFlvRecordingId(null);
currentClient.setIsRecording(false);
- this.clientListManager.updateClientByStreamId(
+ this.sessionManager.updateClientByStreamId(
currentClient.getStreamid(), currentClient, false);
log.debug("this.flvRecorderConverterTask ",
@@ -539,20 +538,20 @@ public class FLVRecorderService implemen
return new Long(-1);
}
- public IClientSession checkLzRecording() {
+ public Client checkLzRecording() {
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
log.debug("getCurrentRoomClient -2- " + streamid);
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
log.debug("getCurrentRoomClient -#########################- "
+ currentClient.getRoom_id());
- for (IClientSession rcl : clientListManager.getClientListByRoomAll(currentClient.getRoom_id(), null)) {
+ for (Client rcl : sessionManager.getClientListByRoomAll(currentClient.getRoom_id(), null)) {
if (rcl.getIsRecording()) {
return rcl;
}
@@ -564,7 +563,7 @@ public class FLVRecorderService implemen
return null;
}
- public void stopRecordingShowForClient(IConnection conn, IClientSession rcl) {
+ public void stopRecordingShowForClient(IConnection conn, Client rcl) {
try {
// this cannot be handled here, as to stop a stream and to leave a
// room is not
@@ -649,7 +648,7 @@ public class FLVRecorderService implemen
// Add Meta Data
rcl.setFlvRecordingMetaDataId(flvRecordingMetaDataId);
- this.clientListManager.updateClientByStreamId(
+ this.sessionManager.updateClientByStreamId(
rcl.getStreamid(), rcl, false);
}
@@ -688,7 +687,7 @@ public class FLVRecorderService implemen
rcl.setFlvRecordingMetaDataId(flvRecordingMetaDataId);
- this.clientListManager.updateClientByStreamId(
+ this.sessionManager.updateClientByStreamId(
rcl.getStreamid(), rcl, false);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java Thu Jan 24 03:51:18 2013
@@ -51,14 +51,13 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
import org.apache.openmeetings.persistence.beans.basic.SOAPLogin;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.persistence.beans.user.Userdata;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.rss.LoadAtomRssFeed;
-import org.apache.openmeetings.session.Client;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ISessionManager;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
@@ -81,7 +80,7 @@ public class MainService implements IPen
private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ISessionStore clientListManager;
+ private ISessionManager sessionManager;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
@@ -160,7 +159,7 @@ public class MainService implements IPen
return users;
}
- public IClientSession getCurrentRoomClient(String SID) {
+ public Client getCurrentRoomClient(String SID) {
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
@@ -168,7 +167,7 @@ public class MainService implements IPen
log.debug("getCurrentRoomClient -1- " + SID);
log.debug("getCurrentRoomClient -2- " + streamid);
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
return currentClient;
} catch (Exception err) {
@@ -220,12 +219,12 @@ public class MainService implements IPen
public Users loginByRemember(String SID, String remoteHashId) {
try {
- IClientSession currentClient;
+ Client currentClient;
IConnection current = Red5.getConnectionLocal();
Users o = null;
- currentClient = clientListManager.getClientByStreamId(current
+ currentClient = sessionManager.getClientByStreamId(current
.getClient().getId(), null);
o = userManagement.loginUserByRemoteHash(SID, remoteHashId);
@@ -307,7 +306,7 @@ public class MainService implements IPen
try {
log.warn("loginUser: " + SID + " " + usernameOrEmail);
- IClientSession currentClient;
+ Client currentClient;
IConnection current = Red5.getConnectionLocal();
if (current == null)
@@ -318,7 +317,7 @@ public class MainService implements IPen
if (withLdap) {
log.debug("Ldap Login");
- currentClient = clientListManager
+ currentClient = sessionManager
.getClientByStreamId(current.getClient().getId(), null);
// LDAP Loggedin Users cannot use the permanent Login Flag
@@ -336,7 +335,7 @@ public class MainService implements IPen
ldapConfig.getConfigFileName());
} else {
- currentClient = clientListManager.getClientByStreamId(current.getClient().getId(), null);
+ currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
o = userManagement.loginUser(SID, usernameOrEmail, Userpass,
currentClient, current.getClient(), storePermanent);
@@ -360,7 +359,7 @@ public class MainService implements IPen
for (Set<IConnection> conset : conCollection) {
for (IConnection cons : conset) {
if (cons != null) {
- IClientSession rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByStreamId(cons.getClient()
.getId(), null);
if (rcl != null && rcl.getIsScreenClient() != null
@@ -372,7 +371,7 @@ public class MainService implements IPen
// log.error("sending roomDisconnect to "
// + cons);
// RoomClient rcl =
- // this.clientListManager.getClientByStreamId(cons.getClient().getId());
+ // this.sessionManager.getClientByStreamId(cons.getClient().getId());
// Send to all connected users
((IServiceCapableConnection) cons)
.invoke("roomConnect",
@@ -454,7 +453,7 @@ public class MainService implements IPen
IConnection current = Red5.getConnectionLocal();
String streamId = current.getClient().getId();
- Client currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamId, null);
if (currentClient.getUser_id() != null) {
@@ -462,7 +461,7 @@ public class MainService implements IPen
}
currentClient.setAllowRecording(soapLogin.getAllowRecording());
- this.clientListManager.updateClientByStreamId(streamId,
+ this.sessionManager.updateClientByStreamId(streamId,
currentClient, false);
if (loginReturn == null) {
@@ -528,7 +527,7 @@ public class MainService implements IPen
IConnection current = Red5.getConnectionLocal();
String streamId = current.getClient().getId();
- Client currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamId, null);
currentClient.setFirstname(firstname);
@@ -544,7 +543,7 @@ public class MainService implements IPen
currentClient.getMail(), currentClient.getFirstname(),
currentClient.getLastname());
- this.clientListManager.updateClientByStreamId(streamId,
+ this.sessionManager.updateClientByStreamId(streamId,
currentClient, false);
return 1L;
@@ -591,7 +590,7 @@ public class MainService implements IPen
IConnection current = Red5.getConnectionLocal();
String streamId = current.getClient().getId();
- Client currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamId, null);
// Check if this User is simulated in the OpenMeetings
@@ -657,7 +656,7 @@ public class MainService implements IPen
currentClient.getUser_id());
}
- this.clientListManager.updateClientByStreamId(streamId,
+ this.sessionManager.updateClientByStreamId(streamId,
currentClient, false);
return new Long(1);
@@ -706,7 +705,7 @@ public class MainService implements IPen
try {
Long users_id = sessionManagement.checkSession(SID);
IConnection current = Red5.getConnectionLocal();
- Client currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(current.getClient().getId(), null);
scopeApplicationAdapter.roomLeaveByScope(currentClient,current.getScope(), false);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java Thu Jan 24 03:51:18 2013
@@ -30,8 +30,8 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
import org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.session.ISessionManager;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
@@ -52,7 +52,7 @@ public class PollService implements IPen
PollService.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ISessionStore clientListManager;
+ private ISessionManager sessionManager;
@Autowired
private Usermanagement usermanagement;
@Autowired
@@ -66,7 +66,7 @@ public class PollService implements IPen
log.debug("createPoll: " + pollQuestion);
IConnection currentcon = Red5.getConnectionLocal();
- IClientSession rc = clientListManager.getClientByStreamId(currentcon
+ Client rc = sessionManager.getClientByStreamId(currentcon
.getClient().getId(), null);
log.debug("rc: " + rc.getStreamid() + " " + rc.getUsername() + " "
@@ -96,7 +96,7 @@ public class PollService implements IPen
log.debug("closePoll: ");
IConnection currentcon = Red5.getConnectionLocal();
- IClientSession rc = clientListManager.getClientByStreamId(currentcon
+ Client rc = sessionManager.getClientByStreamId(currentcon
.getClient().getId(), null);
log.debug("rc: " + rc.getStreamid() + " " + rc.getUsername() + " "
@@ -118,7 +118,7 @@ public class PollService implements IPen
log.debug("closePoll: ");
IConnection currentcon = Red5.getConnectionLocal();
- IClientSession rc = clientListManager.getClientByStreamId(currentcon
+ Client rc = sessionManager.getClientByStreamId(currentcon
.getClient().getId(), null);
log.debug("rc: " + rc.getStreamid() + " " + rc.getUsername() + " "
@@ -138,7 +138,7 @@ public class PollService implements IPen
public void sendNotification(IConnection current, String clientFunction,
Object[] obj) throws Exception {
// Notify all clients of the same scope (room)
- IClientSession rc = this.clientListManager.getClientByStreamId(current
+ Client rc = this.sessionManager.getClientByStreamId(current
.getClient().getId(), null);
Collection<Set<IConnection>> conCollection = current.getScope()
.getConnections();
@@ -146,7 +146,7 @@ public class PollService implements IPen
for (IConnection conn : conset) {
if (conn != null) {
if (conn instanceof IServiceCapableConnection) {
- IClientSession rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByStreamId(conn.getClient().getId(), null);
if (rcl.getIsScreenClient() != null
&& rcl.getIsScreenClient()) {
@@ -176,7 +176,7 @@ public class PollService implements IPen
log.debug("PollService::vote: Enter");
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession rc = clientListManager.getClientByStreamId(streamid, null);
+ Client rc = sessionManager.getClientByStreamId(streamid, null);
if (rc == null) {
log.error("RoomClient IS NULL for ClientID: "
@@ -227,7 +227,7 @@ public class PollService implements IPen
public RoomPoll getPoll() {
try {
IConnection current = Red5.getConnectionLocal();
- IClientSession rc = this.clientListManager.getClientByStreamId(current
+ Client rc = this.sessionManager.getClientByStreamId(current
.getClient().getId(), null);
// get Poll
@@ -242,7 +242,7 @@ public class PollService implements IPen
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession rc = this.clientListManager
+ Client rc = this.sessionManager
.getClientByStreamId(streamid, null);
long roomId = rc.getRoom_id();
@@ -260,7 +260,7 @@ public class PollService implements IPen
public List<RoomPoll> getArchivedPollList() {
try {
IConnection current = Red5.getConnectionLocal();
- IClientSession rc = this.clientListManager.getClientByStreamId(current
+ Client rc = this.sessionManager.getClientByStreamId(current
.getClient().getId(), null);
// get Poll
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Thu Jan 24 03:51:18 2013
@@ -52,6 +52,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
@@ -59,9 +60,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.user.UserContacts;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.session.Client;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.templates.RequestContactConfirmTemplate;
import org.apache.openmeetings.templates.RequestContactTemplate;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -86,7 +85,7 @@ public class UserService {
UserService.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ISessionStore clientListManager;
+ private ISessionManager sessionManager;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
@@ -538,7 +537,7 @@ public class UserService {
if (serverId == 0) {
- Client rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByStreamId(streamid, null);
if (rcl == null) {
@@ -564,7 +563,7 @@ public class UserService {
} else {
Server server = serverDao.get(serverId);
- IClientSession rcl = clientListManager.getClientByStreamId(
+ Client rcl = sessionManager.getClientByStreamId(
streamid, server);
slaveHTTPConnectionManager.kickSlaveUser(server, rcl.getPublicSID());
@@ -1705,7 +1704,7 @@ public class UserService {
// users only
if (authLevelManagement.checkUserLevel(user_level)) {
- Client rcl = this.clientListManager.getClientByPublicSID(
+ Client rcl = this.sessionManager.getClientByPublicSID(
publicSID, false, null);
if (rcl == null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java?rev=1437854&r1=1437853&r2=1437854&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java Thu Jan 24 03:51:18 2013
@@ -36,12 +36,11 @@ import org.apache.openmeetings.conferenc
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.persistence.beans.rooms.Client;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManager;
import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManagerById;
-import org.apache.openmeetings.session.Client;
-import org.apache.openmeetings.session.IClientSession;
-import org.apache.openmeetings.session.ISessionStore;
+import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
@@ -66,7 +65,7 @@ public class WhiteBoardService implement
@Autowired
private final ScopeApplicationAdapter scopeApplicationAdapter = null;
@Autowired
- private final ISessionStore clientListManager = null;
+ private final ISessionManager sessionManager = null;
@Autowired
private final WhiteBoardObjectListManager whiteBoardObjectListManager = null;
@Autowired
@@ -85,7 +84,7 @@ public class WhiteBoardService implement
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
@@ -105,7 +104,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
@@ -124,7 +123,7 @@ public class WhiteBoardService implement
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
@@ -166,7 +165,7 @@ public class WhiteBoardService implement
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
@@ -218,7 +217,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long users_id = sessionManagement.checkSession(SID);
@@ -227,12 +226,12 @@ public class WhiteBoardService implement
if (authLevelManagement.checkUserLevel(user_level)) {
if (currentClient.getIsMod()) {
- Client rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByPublicSID(publicSID, false, null);
if (rcl != null) {
rcl.setCanDraw(canDraw);
- this.clientListManager.updateClientByStreamId(
+ this.sessionManager.updateClientByStreamId(
rcl.getStreamid(), rcl, false);
HashMap<Integer, Object> newMessage = new HashMap<Integer, Object>();
@@ -260,7 +259,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long users_id = sessionManagement.checkSession(SID);
@@ -269,12 +268,12 @@ public class WhiteBoardService implement
if (authLevelManagement.checkUserLevel(user_level)) {
if (currentClient.getIsMod()) {
- Client rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByPublicSID(publicSID, false, null);
if (rcl != null) {
rcl.setCanShare(canShare);
- this.clientListManager.updateClientByStreamId(
+ this.sessionManager.updateClientByStreamId(
rcl.getStreamid(), rcl, false);
HashMap<Integer, Object> newMessage = new HashMap<Integer, Object>();
@@ -302,7 +301,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long users_id = sessionManagement.checkSession(SID);
@@ -311,12 +310,12 @@ public class WhiteBoardService implement
if (authLevelManagement.checkUserLevel(user_level)) {
if (currentClient.getIsMod()) {
- Client rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByPublicSID(publicSID, false, null);
if (rcl != null) {
rcl.setCanRemote(canRemote);
- this.clientListManager.updateClientByStreamId(
+ this.sessionManager.updateClientByStreamId(
rcl.getStreamid(), rcl, false);
HashMap<Integer, Object> newMessage = new HashMap<Integer, Object>();
@@ -344,7 +343,7 @@ public class WhiteBoardService implement
log.debug("[setCanGiveAudio] " + SID + ", " + publicSID + ", " + canGiveAudio);
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long users_id = sessionManagement.checkSession(SID);
@@ -352,12 +351,12 @@ public class WhiteBoardService implement
if (authLevelManagement.checkUserLevel(user_level)) {
if (currentClient.getIsMod()) {
- Client rcl = this.clientListManager
+ Client rcl = this.sessionManager
.getClientByPublicSID(publicSID, false, null);
if (rcl != null) {
rcl.setCanGiveAudio(canGiveAudio);
- this.clientListManager.updateClientByStreamId(
+ this.sessionManager.updateClientByStreamId(
rcl.getStreamid(), rcl, false);
HashMap<Integer, Object> newMessage = new HashMap<Integer, Object>();
@@ -384,7 +383,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
@@ -419,7 +418,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
@@ -483,7 +482,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
@@ -518,7 +517,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- IClientSession currentClient = this.clientListManager
+ Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoom_id();
@@ -570,7 +569,7 @@ public class WhiteBoardService implement
}
public synchronized void removeUserFromAllLists(IScope scope,
- IClientSession currentClient) {
+ Client currentClient) {
try {
Long room_id = currentClient.getRoom_id();