openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1442000 - in /openmeetings/trunk/singlewebapp: WebContent/src/modules/admin/connections/ src/org/apache/openmeetings/data/conference/dao/ src/org/apache/openmeetings/persistence/beans/rooms/ src/org/apache/openmeetings/remote/
Date Mon, 04 Feb 2013 01:31:51 GMT
Author: sebawagner
Date: Mon Feb  4 01:31:51 2013
New Revision: 1442000

URL: http://svn.apache.org/viewvc?rev=1442000&view=rev
Log:
OPENMEETINGS-460 Fixing server force "FETCH" of lazy loaded server attribute in Client object,
in case its a query for the admin-UI where there is a column "server" (and probably the info
needed to kick the user later) 

Modified:
    openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx?rev=1442000&r1=1441999&r2=1442000&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
Mon Feb  4 01:31:51 2013
@@ -75,11 +75,11 @@
 	    	<![CDATA[
 	    	this.clearList();
 	    	for (var i=0;i<records.length;i++){
-	    		var tServer = "master";
+	    		var tServer = "no cluster";
 	    		var serverId = 0;
 	    		if (records[i].server != null) {
-	    			serverId = records[i].server.id;
-	    			tServer = "slave " + " ["+serverId+"]";
+	    		    serverId = records[i].server.id;
+	    			tServer = records[i].server.address + " ["+records[i].server.id+"]";
 	    		}
 	    	
 	    		new lz.roomClientListItem(this._innerlist._inn._inn,{

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java?rev=1442000&r1=1441999&r2=1442000&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java
Mon Feb  4 01:31:51 2013
@@ -134,6 +134,10 @@ public class ClientDao {
 	public List<Client> getClients() {
 		return em.createNamedQuery("getClients", Client.class).getResultList();
 	}
+	
+	public List<Client> getClientsWithServer() {
+		return em.createNamedQuery("getClientsWithServer", Client.class).getResultList();
+	}
 
 	public List<Client> getClientsByUserId(Server server, Long userId) {
 		TypedQuery<Client> q = em.createNamedQuery("getClientsByUserId", Client.class);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java?rev=1442000&r1=1441999&r2=1442000&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java
Mon Feb  4 01:31:51 2013
@@ -55,6 +55,7 @@ import org.apache.openmeetings.utils.mat
 	@NamedQuery(name = "getClientsByPublicSID", query = "SELECT c FROM Client c WHERE c.publicSID
LIKE :publicSID"),
 	@NamedQuery(name = "getClientsByServer", query = "SELECT c FROM Client c WHERE c.server
= :server"),
 	@NamedQuery(name = "getClients", query = "SELECT c FROM Client c"),
+	@NamedQuery(name = "getClientsWithServer", query = "SELECT c FROM Client c LEFT JOIN FETCH
c.server"),
 	@NamedQuery(name = "getClientsByUserId", query = "SELECT c FROM Client c WHERE c.server
= :server AND c.user_id = :user_id"),
 	@NamedQuery(name = "getClientsByRoomId", query = "SELECT c FROM Client c WHERE c.room_id
= :room_id")
 })

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java?rev=1442000&r1=1441999&r2=1442000&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java Mon
Feb  4 01:31:51 2013
@@ -466,7 +466,7 @@ public class ChatService implements IPen
 			LinkedList<Client> guestList = new LinkedList<Client>();
 			LinkedList<Client> overallList = new LinkedList<Client>();
 			
-			for (Client rcl : sessionManager.getAllClients()) {
+			for (Client rcl : sessionManager.getClients()) {
 				if (rcl.getUser_id()==null || rcl.getUser_id()<=0) {
 					guestList.add(rcl);
 				} else {



Mime
View raw message