openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1435723 [1/3] - in /incubator/openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ src/org/apache/openmeetings/axis/services/ src/org/apache/openmeetings/cluster/beans/ src/org/apache/openmeetings/conference/room/ src/org/apache/openmeetin...
Date Sat, 19 Jan 2013 21:49:19 GMT
Author: sebawagner
Date: Sat Jan 19 21:49:18 2013
New Revision: 1435723

URL: http://svn.apache.org/viewvc?rev=1435723&view=rev
Log:
OPENMEETINGS-460 Re-factor Session handling for RoomClient's RoomClient object is now simply "Client" is abstracted by an Interface to make it prepare possibilities to store it in the database (and alternatively in memory)

Added:
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/Client.java
      - copied, changed from r1435703, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/RoomClient.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientDatabaseStore.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientHashMapStore.java
      - copied, changed from r1435703, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSession.java
      - copied, changed from r1435703, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientSession.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSessionInfo.java
      - copied, changed from r1435703, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientSessionInfo.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/IClientSession.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionStore.java
      - copied, changed from r1435703, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/IClientList.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/cache/
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/cache/HashMapStore.java
      - copied, changed from r1435703, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/cache/HashMapStore.java
Removed:
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientSession.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientSessionInfo.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/IClientList.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/RoomClient.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/cache/HashMapStore.java
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/beans/ServerDTO.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/ldap/LdapLoginManagement.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/ScreenController.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=1435723&r1=1435722&r2=1435723&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Sat Jan 19 21:49:18 2013
@@ -55,7 +55,7 @@
 	<!-- In memory / session stores -->
 	
 	<bean id="openmeetings.ClientListManager" 
-		class="org.apache.openmeetings.conference.room.ClientListHashMapStore" />
+		class="org.apache.openmeetings.session.ClientHashMapStore" />
 	<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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -29,8 +29,6 @@ import java.util.Map;
 import org.apache.axis2.AxisFault;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
@@ -49,6 +47,9 @@ import org.apache.openmeetings.persisten
 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.utils.math.CalendarPatterns;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -85,7 +86,7 @@ public class RoomWebService {
 	@Autowired
 	private ConferenceService conferenceService;
 	@Autowired
-	private IClientList clientListManager;
+	private ISessionStore clientListManager;
 	@Autowired
 	private MeetingMemberLogic meetingMemberLogic;
 	@Autowired
@@ -570,13 +571,13 @@ public class RoomWebService {
 				roomReturn.setName(room.getName());
 				roomReturn.setRoom_id(room.getRooms_id());
 
-				List<RoomClient> map = clientListManager
+				List<Client> map = clientListManager
 						.getClientListByRoom(room.getRooms_id(), null);
 
 				RoomUser[] roomUsers = new RoomUser[map.size()];
 
 				int i = 0;
-				for (RoomClient rcl : map) {
+				for (IClientSession rcl : map) {
 					RoomUser roomUser = new RoomUser();
 					roomUser.setFirstname(rcl.getFirstname());
 					roomUser.setLastname(rcl.getLastname());
@@ -2063,7 +2064,7 @@ public class RoomWebService {
 				RoomUser[] rUser = new RoomUser[room.getCurrentusers().size()];
 
 				int i = 0;
-				for (RoomClient rcl : room.getCurrentusers()) {
+				for (IClientSession rcl : room.getCurrentusers()) {
 
 					RoomUser ru = new RoomUser();
 					ru.setFirstname(rcl.getFirstname());
@@ -2130,7 +2131,7 @@ public class RoomWebService {
 				RoomUser[] rUser = new RoomUser[room.getCurrentusers().size()];
 
 				int i = 0;
-				for (RoomClient rcl : room.getCurrentusers()) {
+				for (IClientSession rcl : room.getCurrentusers()) {
 
 					RoomUser ru = new RoomUser();
 					ru.setFirstname(rcl.getFirstname());

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/beans/ServerDTO.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/beans/ServerDTO.java?rev=1435723&r1=1435722&r2=1435723&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/beans/ServerDTO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/beans/ServerDTO.java Sat Jan 19 21:49:18 2013
@@ -20,6 +20,14 @@ package org.apache.openmeetings.cluster.
 
 import org.apache.openmeetings.persistence.beans.basic.Server;
 
+/**
+ * 
+ * Bean send to the client about the server he is going to use for the conference 
+ * session
+ * 
+ * @author sebawagner
+ *
+ */
 public class ServerDTO {
 
 	private Long id;

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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -20,18 +20,18 @@ package org.apache.openmeetings.conferen
 
 import java.util.List;
 
-import org.apache.openmeetings.conference.room.RoomClient;
+import org.apache.openmeetings.session.Client;
 
 public class RoomStatus {
 	
-	List<RoomClient> clientList;
+	List<Client> clientList;
 	BrowserStatus browserStatus;
 	Boolean roomFull = false;
 	
-	public List<RoomClient> getClientList() {
+	public List<Client> getClientList() {
 		return clientList;
 	}
-	public void setClientList(List<RoomClient> clientList) {
+	public void setClientList(List<Client> clientList) {
 		this.clientList = clientList;
 	}
 	public BrowserStatus getBrowserStatus() {

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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -32,9 +32,9 @@ import javax.persistence.criteria.Predic
 import javax.persistence.criteria.Root;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
+import org.apache.openmeetings.session.IClientSession;
+import org.apache.openmeetings.session.ISessionStore;
 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 IClientList clientListManager;
+	private ISessionStore clientListManager;
 
 	/**
 	 * creates a new session-object in the database
@@ -484,7 +484,7 @@ public class Sessionmanagement {
 	 */
 	public void clearSessionByRoomId(Long room_id) {
 		try {
-			for (RoomClient rcl : clientListManager.getClientListByRoom(room_id, null)) {
+			for (IClientSession rcl : clientListManager.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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -27,12 +27,12 @@ import javax.persistence.PersistenceCont
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.basic.Fieldmanagment;
 import org.apache.openmeetings.data.user.Usermanagement;
 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.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,7 +74,7 @@ public class PollManagement {
 		return q.getSingleResult();
 	}
 	
-	public RoomPoll createPoll(RoomClient rc, String pollName, String pollQuestion, Long pollTypeId) {
+	public RoomPoll createPoll(IClientSession 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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -32,7 +32,6 @@ import javax.persistence.criteria.Criter
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.openmeetings.conference.room.IClientList;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
@@ -45,6 +44,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.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +73,7 @@ public class Roommanagement {
 	@Autowired
 	private AuthLevelmanagement authLevelManagement;
 	@Autowired
-	private IClientList clientListManager;
+	private ISessionStore clientListManager;
     @Autowired
 	private ConfigurationDao configurationDaoImpl;
     @Autowired

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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -38,8 +38,6 @@ import javax.persistence.criteria.Root;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Fieldmanagment;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
@@ -58,6 +56,9 @@ import org.apache.openmeetings.persisten
 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.templates.ResetPasswordTemplate;
 import org.apache.openmeetings.utils.DaoHelper;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -112,7 +113,7 @@ public class Usermanagement {
 	@Autowired
 	private AuthLevelmanagement authLevelManagement;
 	@Autowired
-	private IClientList clientListManager;
+	private ISessionStore clientListManager;
 	@Autowired
 	private ServerDao serverDao;
 
@@ -228,7 +229,7 @@ public class Usermanagement {
 	 * @return
 	 */
 	public Object loginUser(String SID, String userOrEmail, String userpass,
-			RoomClient currentClient, IClient client, Boolean storePermanent) {
+			IClientSession currentClient, IClient client, Boolean storePermanent) {
 		try {
 			log.debug("Login user SID : " + SID + " Stored Permanent :"
 					+ storePermanent);
@@ -1457,7 +1458,7 @@ public class Usermanagement {
 
 				sessionManagement.clearSessionByRoomId(room_id);
 
-				for (RoomClient rcl : clientListManager.getClientListByRoom(room_id, null)) {
+				for (Client rcl : clientListManager.getClientListByRoom(room_id, null)) {
 					if (rcl == null) {
 						return true;
 					}
@@ -1493,7 +1494,7 @@ public class Usermanagement {
 			// admins only
 			if (authLevelManagement.checkWebServiceLevel(user_level)) {
 
-				RoomClient rcl = clientListManager
+				Client rcl = clientListManager
 						.getClientByPublicSID(publicSID, false, null);
 
 				if (rcl == null) {

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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -27,7 +27,6 @@ import java.util.Random;
 import java.util.Vector;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
@@ -40,6 +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.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,
-			RoomClient currentClient, IClient client, String SID, String domain) {
+			IClientSession 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/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -42,9 +42,9 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 
 import org.apache.openjpa.persistence.ElementDependent;
-import org.apache.openmeetings.conference.room.RoomClient;
 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;
@@ -227,7 +227,7 @@ public class Rooms implements Serializab
 	private List<Rooms_Organisation> roomOrganisations = new ArrayList<Rooms_Organisation>();
 
 	@Transient
-	private List<RoomClient> currentusers;
+	private List<Client> currentusers;
 
 	public String getComment() {
 		return comment;
@@ -293,11 +293,11 @@ public class Rooms implements Serializab
 		this.ispublic = ispublic;
 	}
 
-	public List<RoomClient> getCurrentusers() {
+	public List<Client> getCurrentusers() {
 		return currentusers;
 	}
 
-	public void setCurrentusers(List<RoomClient> currentusers) {
+	public void setCurrentusers(List<Client> currentusers) {
 		this.currentusers = currentusers;
 	}
 

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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -30,14 +30,15 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.conference.Roommanagement;
 import org.apache.openmeetings.data.user.Usermanagement;
 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.utils.stringhandlers.ChatString;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.IClient;
@@ -60,7 +61,7 @@ public class ChatService implements IPen
 	@Autowired
 	private ScopeApplicationAdapter scopeApplicationAdapter;
 	@Autowired
-	private IClientList clientListManager = null;
+	private ISessionStore clientListManager = null;
 	@Autowired
 	private EmoticonsManager emoticonsManager;
 	@Autowired
@@ -108,7 +109,7 @@ public class ChatService implements IPen
 	public int sendMessageWithClient(Object newMessage) {
 		try {
 			IConnection current = Red5.getConnectionLocal();
-			RoomClient currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+			IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
 			Long room_id = currentClient.getRoom_id();			
 			log.debug("room_id: " + room_id);
 			
@@ -139,7 +140,7 @@ public class ChatService implements IPen
 				hsm.put("client", clientListManager.getClientByPublicSID("" + messageMap.get(6), false, null));
 				//need to remove unconfirmed chat message if any
 				for (int i = myChatList.size() - 1; i > -1; --i) {
-					RoomClient msgClient = (RoomClient)myChatList.get(i).get("client");
+					IClientSession msgClient = (IClientSession)myChatList.get(i).get("client");
 					@SuppressWarnings("rawtypes")
 					List msgList = (List)myChatList.get(i).get("message");
 					if (publicSID.equals(msgClient.getPublicSID())
@@ -169,7 +170,7 @@ public class ChatService implements IPen
     				if (conn != null) {
     					if (conn instanceof IServiceCapableConnection) {
     						
-    						RoomClient rcl = this.clientListManager.getClientByStreamId(conn.getClient().getId(), null);
+    						IClientSession rcl = this.clientListManager.getClientByStreamId(conn.getClient().getId(), null);
     						
     						if (rcl == null) {
     							continue;
@@ -200,7 +201,7 @@ public class ChatService implements IPen
 	public int sendMessageWithClientByPublicSID(Object newMessage, String publicSID) {
 		try {
 			IConnection current = Red5.getConnectionLocal();
-			RoomClient currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+			IClientSession currentClient = this.clientListManager.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);
@@ -259,7 +260,7 @@ public class ChatService implements IPen
 	public List<HashMap<String,Object>> clearChat() {
 		try {
 			IConnection current = Red5.getConnectionLocal();
-			RoomClient currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+			IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
 			Long room_id = currentClient.getRoom_id();
 			
 			Long chatroom = room_id;
@@ -285,7 +286,7 @@ public class ChatService implements IPen
 	public List<HashMap<String,Object>> getRoomChatHistory() {
 		try {
 			IConnection current = Red5.getConnectionLocal();
-			RoomClient currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+			IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
 			Long room_id = currentClient.getRoom_id();
 			
 			log.debug("GET CHATROOM: " + room_id);
@@ -350,7 +351,7 @@ public class ChatService implements IPen
 	public int sendMessageToOverallChat(Object newMessage) {
 		try {
 			IConnection current = Red5.getConnectionLocal();
-			RoomClient currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
+			IClientSession currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId(), null);
 			
 			//log.error(newMessage.getClass().getName());
 			ArrayList messageMap = (ArrayList) newMessage;
@@ -460,13 +461,13 @@ public class ChatService implements IPen
 		}
 	}
 	
-	public LinkedHashMap<String,LinkedList<RoomClient>> getChatOverallUsers(){
+	public LinkedHashMap<String,LinkedList<Client>> getChatOverallUsers(){
 		try {
-			LinkedHashMap<String,LinkedList<RoomClient>> clientList = new LinkedHashMap<String,LinkedList<RoomClient>>();
-			LinkedList<RoomClient> guestList = new LinkedList<RoomClient>();
-			LinkedList<RoomClient> overallList = new LinkedList<RoomClient>();
+			LinkedHashMap<String,LinkedList<Client>> clientList = new LinkedHashMap<String,LinkedList<Client>>();
+			LinkedList<Client> guestList = new LinkedList<Client>();
+			LinkedList<Client> overallList = new LinkedList<Client>();
 			
-			for (RoomClient rcl : clientListManager.getAllClients()) {
+			for (Client rcl : clientListManager.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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -28,8 +28,6 @@ import java.util.Set;
 
 import org.apache.commons.transaction.util.FileHelper;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.conference.whiteboard.WhiteboardManagement;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
@@ -41,6 +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.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 IClientList clientListManager = null;
+	private ISessionStore clientListManager = null;
 	@Autowired
 	private Sessionmanagement sessionManagement;
 	@Autowired
@@ -180,7 +180,7 @@ public class ConferenceLibrary implement
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
 				IConnection current = Red5.getConnectionLocal();
-				RoomClient currentClient = this.clientListManager
+				IClientSession currentClient = this.clientListManager
 						.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) {
-								RoomClient rcl = this.clientListManager
+								IClientSession rcl = this.clientListManager
 										.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();
 
-				RoomClient currentClient = this.clientListManager
+				IClientSession currentClient = this.clientListManager
 						.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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -33,9 +33,6 @@ import java.util.TimeZone;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.cluster.beans.ServerDTO;
-import org.apache.openmeetings.conference.room.ClientSession;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
 import org.apache.openmeetings.data.basic.dao.ServerDao;
@@ -52,6 +49,10 @@ import org.apache.openmeetings.persisten
 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.utils.math.CalendarPatterns;
 import org.apache.openmeetings.utils.math.TimezoneUtil;
 import org.red5.logging.Red5LoggerFactory;
@@ -87,7 +88,7 @@ public class ConferenceService {
 	@Autowired
 	private TimezoneUtil timezoneUtil;
 	@Autowired
-	private IClientList clientListManager = null;
+	private ISessionStore clientListManager = null;
 	@Autowired
 	private ServerDao serverDao;
 
@@ -292,7 +293,7 @@ public class ConferenceService {
 	
 			log.debug("getCurrentRoomClient -2- " + streamid);
 	
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 	
 			Rooms room = roomDao.get(room_id);
@@ -709,7 +710,7 @@ public class ConferenceService {
 	 * @param room_id
 	 * @return - all participants of a room
 	 */
-	public List<RoomClient> getRoomClientsListByRoomId(Long room_id) {
+	public List<Client> getRoomClientsListByRoomId(Long room_id) {
 		return clientListManager.getClientListByRoom(room_id, null);
 	}
 

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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -27,8 +27,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
 import org.apache.openmeetings.data.conference.RoomDAO;
@@ -49,6 +47,9 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog;
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
 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.utils.OmFileHelper;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.red5.logging.Red5LoggerFactory;
@@ -80,7 +81,7 @@ public class FLVRecorderService implemen
 
 	// Spring Beans
 	@Autowired
-	private IClientList clientListManager;
+	private ISessionStore clientListManager;
 	@Autowired
 	private FlvRecordingDao flvRecordingDaoImpl;
 	@Autowired
@@ -113,7 +114,7 @@ public class FLVRecorderService implemen
 	public void resultReceived(IPendingServiceCall arg0) {
 	}
 
-	public RoomClient checkForRecording() {
+	public IClientSession checkForRecording() {
 		try {
 
 			IConnection current = Red5.getConnectionLocal();
@@ -121,10 +122,10 @@ public class FLVRecorderService implemen
 
 			log.debug("getCurrentRoomClient -2- " + streamid);
 
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 
-			for (RoomClient rcl : clientListManager.getClientListByRoom(currentClient.getRoom_id(), null)) {
+			for (IClientSession rcl : clientListManager.getClientListByRoom(currentClient.getRoom_id(), null)) {
 				if (rcl.getIsRecording()) {
 					return rcl;
 				}
@@ -155,7 +156,7 @@ public class FLVRecorderService implemen
 			log.debug(":: recordMeetingStream ::");
 
 			IConnection current = Red5.getConnectionLocal();
-			RoomClient currentClient = this.clientListManager
+			Client currentClient = this.clientListManager
 					.getClientByStreamId(current.getClient().getId(), null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -181,7 +182,7 @@ public class FLVRecorderService implemen
 				for (IConnection conn : conset) {
 					if (conn != null) {
 						if (conn instanceof IServiceCapableConnection) {
-							RoomClient rcl = this.clientListManager
+							Client rcl = this.clientListManager
 									.getClientByStreamId(conn.getClient()
 											.getId(), null);
 
@@ -422,7 +423,7 @@ public class FLVRecorderService implemen
 		}
 	}
 
-	public Long stopRecordAndSave(IScope scope, RoomClient currentClient,
+	public Long stopRecordAndSave(IScope scope, Client currentClient,
 			Long storedFlvRecordingId) {
 		try {
 			log.debug("stopRecordAndSave " + currentClient.getUsername() + ","
@@ -435,7 +436,7 @@ public class FLVRecorderService implemen
 					if (conn != null) {
 						if (conn instanceof IServiceCapableConnection) {
 
-							RoomClient rcl = clientListManager.getClientByStreamId(
+							IClientSession rcl = clientListManager.getClientByStreamId(
 											conn.getClient().getId(), null);
 
 							// FIXME: Check if this function is really in use at
@@ -538,20 +539,20 @@ public class FLVRecorderService implemen
 		return new Long(-1);
 	}
 
-	public RoomClient checkLzRecording() {
+	public IClientSession checkLzRecording() {
 		try {
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
 
 			log.debug("getCurrentRoomClient -2- " + streamid);
 
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 
 			log.debug("getCurrentRoomClient -#########################- "
 					+ currentClient.getRoom_id());
 
-			for (RoomClient rcl : clientListManager.getClientListByRoomAll(currentClient.getRoom_id(), null)) {
+			for (IClientSession rcl : clientListManager.getClientListByRoomAll(currentClient.getRoom_id(), null)) {
 				if (rcl.getIsRecording()) {
 					return rcl;
 				}
@@ -563,7 +564,7 @@ public class FLVRecorderService implemen
 		return null;
 	}
 
-	public void stopRecordingShowForClient(IConnection conn, RoomClient rcl) {
+	public void stopRecordingShowForClient(IConnection conn, IClientSession rcl) {
 		try {
 			// this cannot be handled here, as to stop a stream and to leave a
 			// room is not
@@ -612,7 +613,7 @@ public class FLVRecorderService implemen
 	}
 
 	public void addRecordingByStreamId(IConnection conn, String streamId,
-			RoomClient rcl, Long flvRecordingId) {
+			Client rcl, Long flvRecordingId) {
 		try {
 
 			FlvRecording flvRecording = this.flvRecordingDaoImpl

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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -28,8 +28,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Navimanagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
@@ -58,6 +56,9 @@ import org.apache.openmeetings.persisten
 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.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.IConnection;
 import org.red5.server.api.Red5;
@@ -80,7 +81,7 @@ public class MainService implements IPen
 	private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, OpenmeetingsVariables.webAppRootKey);
 
 	@Autowired
-	private IClientList clientListManager;
+	private ISessionStore clientListManager;
 	@Autowired
 	private ScopeApplicationAdapter scopeApplicationAdapter;
 	@Autowired
@@ -159,7 +160,7 @@ public class MainService implements IPen
 		return users;
 	}
 
-	public RoomClient getCurrentRoomClient(String SID) {
+	public IClientSession getCurrentRoomClient(String SID) {
 		try {
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
@@ -167,7 +168,7 @@ public class MainService implements IPen
 			log.debug("getCurrentRoomClient -1- " + SID);
 			log.debug("getCurrentRoomClient -2- " + streamid);
 
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			return currentClient;
 		} catch (Exception err) {
@@ -219,7 +220,7 @@ public class MainService implements IPen
 	public Users loginByRemember(String SID, String remoteHashId) {
 		try {
 
-			RoomClient currentClient;
+			IClientSession currentClient;
 			IConnection current = Red5.getConnectionLocal();
 
 			Users o = null;
@@ -306,7 +307,7 @@ public class MainService implements IPen
 		try {
 			log.warn("loginUser: " + SID + " " + usernameOrEmail);
 
-			RoomClient currentClient;
+			IClientSession currentClient;
 			IConnection current = Red5.getConnectionLocal();
 
 			if (current == null)
@@ -359,7 +360,7 @@ public class MainService implements IPen
 				for (Set<IConnection> conset : conCollection) {
 					for (IConnection cons : conset) {
 						if (cons != null) {
-							RoomClient rcl = this.clientListManager
+							IClientSession rcl = this.clientListManager
 									.getClientByStreamId(cons.getClient()
 											.getId(), null);
 							if (rcl != null && rcl.getIsScreenClient() != null
@@ -453,7 +454,7 @@ public class MainService implements IPen
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamId = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			Client currentClient = this.clientListManager
 					.getClientByStreamId(streamId, null);
 
 			if (currentClient.getUser_id() != null) {
@@ -527,7 +528,7 @@ public class MainService implements IPen
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamId = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			Client currentClient = this.clientListManager
 					.getClientByStreamId(streamId, null);
 
 			currentClient.setFirstname(firstname);
@@ -590,7 +591,7 @@ public class MainService implements IPen
 
 					IConnection current = Red5.getConnectionLocal();
 					String streamId = current.getClient().getId();
-					RoomClient currentClient = this.clientListManager
+					Client currentClient = this.clientListManager
 							.getClientByStreamId(streamId, null);
 
 					// Check if this User is simulated in the OpenMeetings
@@ -704,7 +705,7 @@ public class MainService implements IPen
 		try {
 			Long users_id = sessionManagement.checkSession(SID);
 			IConnection current = Red5.getConnectionLocal();
-			RoomClient currentClient = this.clientListManager
+			Client currentClient = this.clientListManager
 					.getClientByStreamId(current.getClient().getId(), null);
 			
 			scopeApplicationAdapter.roomLeaveByScope(currentClient,current.getScope(), false);
@@ -969,12 +970,12 @@ public class MainService implements IPen
 	 * @return - empty map
 	 */
 	@Deprecated
-	public LinkedHashMap<Integer, RoomClient> getUsersByDomain(String SID,
+	public LinkedHashMap<Integer, Client> getUsersByDomain(String SID,
 			String domain) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
 		if (authLevelManagement.checkUserLevel(user_level)) {
-			LinkedHashMap<Integer, RoomClient> lMap = new LinkedHashMap<Integer, RoomClient>();
+			LinkedHashMap<Integer, Client> lMap = new LinkedHashMap<Integer, Client>();
 			// Integer counter = 0;
 			// for (Iterator<String> it =
 			// Application.getClientList().keySet().iterator();it.hasNext();) {

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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -24,14 +24,14 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.conference.PollManagement;
 import org.apache.openmeetings.data.user.Usermanagement;
 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.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.session.IClientSession;
+import org.apache.openmeetings.session.ISessionStore;
 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 IClientList clientListManager;
+	private ISessionStore clientListManager;
 	@Autowired
 	private Usermanagement usermanagement;
 	@Autowired
@@ -66,7 +66,7 @@ public class PollService implements IPen
 			log.debug("createPoll: " + pollQuestion);
 
 			IConnection currentcon = Red5.getConnectionLocal();
-			RoomClient rc = clientListManager.getClientByStreamId(currentcon
+			IClientSession rc = clientListManager.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();
-			RoomClient rc = clientListManager.getClientByStreamId(currentcon
+			IClientSession rc = clientListManager.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();
-			RoomClient rc = clientListManager.getClientByStreamId(currentcon
+			IClientSession rc = clientListManager.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)
-		RoomClient rc = this.clientListManager.getClientByStreamId(current
+		IClientSession rc = this.clientListManager.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) {
-						RoomClient rcl = this.clientListManager
+						IClientSession rcl = this.clientListManager
 								.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();
-			RoomClient rc = clientListManager.getClientByStreamId(streamid, null);
+			IClientSession rc = clientListManager.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();
-			RoomClient rc = this.clientListManager.getClientByStreamId(current
+			IClientSession rc = this.clientListManager.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();
-			RoomClient rc = this.clientListManager
+			IClientSession rc = this.clientListManager
 					.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();
-			RoomClient rc = this.clientListManager.getClientByStreamId(current
+			IClientSession rc = this.clientListManager.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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -29,8 +29,6 @@ import java.util.TimeZone;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.cluster.SlaveHTTPConnectionManager;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Fieldmanagment;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
@@ -61,6 +59,9 @@ 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.templates.RequestContactConfirmTemplate;
 import org.apache.openmeetings.templates.RequestContactTemplate;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -85,7 +86,7 @@ public class UserService {
 			UserService.class, OpenmeetingsVariables.webAppRootKey);
 
 	@Autowired
-	private IClientList clientListManager;
+	private ISessionStore clientListManager;
 	@Autowired
 	private ScopeApplicationAdapter scopeApplicationAdapter;
 	@Autowired
@@ -537,7 +538,7 @@ public class UserService {
 
 				if (serverId == 0) {
 
-					RoomClient rcl = this.clientListManager
+					Client rcl = this.clientListManager
 							.getClientByStreamId(streamid, null);
 
 					if (rcl == null) {
@@ -563,7 +564,7 @@ public class UserService {
 				} else {
 
 					Server server = serverDao.get(serverId);
-					RoomClient rcl = clientListManager.getClientByStreamId(
+					IClientSession rcl = clientListManager.getClientByStreamId(
 							streamid, server);
 					slaveHTTPConnectionManager.kickSlaveUser(server, rcl.getPublicSID());
 					
@@ -1704,7 +1705,7 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				RoomClient rcl = this.clientListManager.getClientByPublicSID(
+				Client rcl = this.clientListManager.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=1435723&r1=1435722&r2=1435723&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 Sat Jan 19 21:49:18 2013
@@ -29,8 +29,6 @@ import java.util.LinkedList;
 import java.util.Map;
 
 import org.apache.commons.collections.ComparatorUtils;
-import org.apache.openmeetings.conference.room.IClientList;
-import org.apache.openmeetings.conference.room.RoomClient;
 import org.apache.openmeetings.conference.whiteboard.Cliparts;
 import org.apache.openmeetings.conference.whiteboard.WhiteboardObject;
 import org.apache.openmeetings.conference.whiteboard.WhiteboardObjectList;
@@ -41,6 +39,9 @@ import org.apache.openmeetings.data.user
 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.utils.OmFileHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.IConnection;
@@ -65,7 +66,7 @@ public class WhiteBoardService implement
 	@Autowired
 	private final ScopeApplicationAdapter scopeApplicationAdapter = null;
 	@Autowired
-	private final IClientList clientListManager = null;
+	private final ISessionStore clientListManager = null;
 	@Autowired
 	private final WhiteBoardObjectListManager whiteBoardObjectListManager = null;
 	@Autowired
@@ -84,7 +85,7 @@ public class WhiteBoardService implement
 		try {
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -104,7 +105,7 @@ public class WhiteBoardService implement
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -123,7 +124,7 @@ public class WhiteBoardService implement
 		try {
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -165,7 +166,7 @@ public class WhiteBoardService implement
 		try {
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -217,7 +218,7 @@ public class WhiteBoardService implement
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 
 			Long users_id = sessionManagement.checkSession(SID);
@@ -226,7 +227,7 @@ public class WhiteBoardService implement
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
 				if (currentClient.getIsMod()) {
-					RoomClient rcl = this.clientListManager
+					Client rcl = this.clientListManager
 							.getClientByPublicSID(publicSID, false, null);
 
 					if (rcl != null) {
@@ -259,7 +260,7 @@ public class WhiteBoardService implement
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 
 			Long users_id = sessionManagement.checkSession(SID);
@@ -268,7 +269,7 @@ public class WhiteBoardService implement
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
 				if (currentClient.getIsMod()) {
-					RoomClient rcl = this.clientListManager
+					Client rcl = this.clientListManager
 							.getClientByPublicSID(publicSID, false, null);
 
 					if (rcl != null) {
@@ -301,7 +302,7 @@ public class WhiteBoardService implement
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 
 			Long users_id = sessionManagement.checkSession(SID);
@@ -310,7 +311,7 @@ public class WhiteBoardService implement
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
 				if (currentClient.getIsMod()) {
-					RoomClient rcl = this.clientListManager
+					Client rcl = this.clientListManager
 							.getClientByPublicSID(publicSID, false, null);
 
 					if (rcl != null) {
@@ -343,7 +344,7 @@ public class WhiteBoardService implement
             log.debug("[setCanGiveAudio] " + SID + ", " + publicSID + ", " + canGiveAudio);
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 
 			Long users_id = sessionManagement.checkSession(SID);
@@ -351,7 +352,7 @@ public class WhiteBoardService implement
 
 			if (authLevelManagement.checkUserLevel(user_level)) {
 				if (currentClient.getIsMod()) {
-					RoomClient rcl = this.clientListManager
+					Client rcl = this.clientListManager
 							.getClientByPublicSID(publicSID, false, null);
 
 					if (rcl != null) {
@@ -383,7 +384,7 @@ public class WhiteBoardService implement
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -418,7 +419,7 @@ public class WhiteBoardService implement
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -482,7 +483,7 @@ public class WhiteBoardService implement
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -517,7 +518,7 @@ public class WhiteBoardService implement
 
 			IConnection current = Red5.getConnectionLocal();
 			String streamid = current.getClient().getId();
-			RoomClient currentClient = this.clientListManager
+			IClientSession currentClient = this.clientListManager
 					.getClientByStreamId(streamid, null);
 			Long room_id = currentClient.getRoom_id();
 
@@ -569,7 +570,7 @@ public class WhiteBoardService implement
 	}
 
 	public synchronized void removeUserFromAllLists(IScope scope,
-			RoomClient currentClient) {
+			IClientSession currentClient) {
 		try {
 
 			Long room_id = currentClient.getRoom_id();



Mime
View raw message