Author: sebawagner
Date: Thu Nov 1 13:04:16 2012
New Revision: 1404574
URL: http://svn.apache.org/viewvc?rev=1404574&view=rev
Log:
Fixes: OPENMEETINGS-459 Remove RoomClient from database
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/RoomClient.java
- copied, changed from r1388584,
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ClientListDatabaseStore.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx
incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.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/RoomDAO.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/ClientListHashMapStore.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/IClientList.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
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=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Thu Nov 1 13:04:16 2012
@@ -51,7 +51,7 @@
<!-- New Class for the Streaming Handlers -->
<bean id="web.handler"
class="org.apache.openmeetings.remote.red5.ScopeApplicationAdapter" />
- <bean id="openmeetings.ClientListManager"
class="org.apache.openmeetings.remote.red5.ClientListDatabaseStore" />
+ <bean id="openmeetings.ClientListManager"
class="org.apache.openmeetings.remote.red5.ClientListHashMapStore" />
<bean id="openmeetings.EmoticonsManager"
class="org.apache.openmeetings.remote.red5.EmoticonsManager" />
<bean id="openmeetings.WhiteBoardObjectListManager"
class="org.apache.openmeetings.remote.red5.WhiteBoardObjectListManager" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx
Thu Nov 1 13:04:16 2012
@@ -23,19 +23,6 @@
<!--- list of conference/audience rooms -->
<class name="roomClientListItem" extends="baseContentListItem">
- <!--
- RoomClient(Long roomClientId, String username, String streamid,
- String scope, String publicSID, Boolean isMod, Date connectedSince,
- String formatedDate, String usercolor, Integer userpos,
- String userip, int userport, Long room_id, Date roomEnter,
- long broadCastID, Long user_id, String firstname, String lastname,
- String mail, String lastLogin, String official_code,
- String picture_uri, String language
- String avsettings, String swfurl,
- Boolean isRecording, String roomRecordingName,
- Boolean zombieCheckFlag)
- -->
-
<attribute name="streamid" value="0" type="number" />
<attribute name="login" value="" type="string" />
<attribute name="dateConnected" value="" type="string" />
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
Thu Nov 1 13:04:16 2012
@@ -53,7 +53,6 @@
<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
Thu Nov 1 13:04:16 2012
@@ -53,7 +53,6 @@
<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
Thu Nov 1 13:04:16 2012
@@ -53,7 +53,6 @@
<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
Thu Nov 1 13:04:16 2012
@@ -53,7 +53,6 @@
<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
Thu Nov 1 13:04:16 2012
@@ -53,7 +53,6 @@
<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.apache.openmeetings.persistence.beans.rooms.RoomClient</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import org.apache.axis2.AxisFault;
import org.apache.openmeetings.OpenmeetingsVariables;
+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;
@@ -41,7 +42,6 @@ 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.RoomClient;
import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.user.Users;
Copied:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/RoomClient.java
(from r1388584,
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java)
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/RoomClient.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/RoomClient.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java&r1=1388584&r2=1404574&rev=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/RoomClient.java
Thu Nov 1 13:04:16 2012
@@ -16,79 +16,39 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.rooms;
+package org.apache.openmeetings.conference.room;
+/**
+ * Session object to store client values
+ *
+ * @author sebawagner
+ */
import java.io.Serializable;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import javax.persistence.Cacheable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-@Entity
-@Cacheable
-@Table(name = "roomclient")
-@NamedQueries({
- @NamedQuery(name="getAllRoomClients", query="SELECT rc FROM RoomClient
rc")
- , @NamedQuery(name="getByStreamId", query="SELECT rc FROM RoomClient rc
WHERE rc.streamid = :streamid")
- , @NamedQuery(name="getByStreamIdNonScreen", query="SELECT rc FROM
RoomClient rc WHERE rc.streamid = :streamid AND (rc.isScreenClient IS NULL OR
rc.isScreenClient = false)")
- , @NamedQuery(name="getByPublicSidAvClient", query="SELECT rc FROM
RoomClient rc WHERE rc.publicSID = :publicSID AND rc.isAVClient = :isAVClient")
- , @NamedQuery(name="getByUserId", query="SELECT rc FROM RoomClient rc
WHERE rc.user_id = :userId")
- , @NamedQuery(name="getByRoomId", query="SELECT rc FROM RoomClient rc
WHERE rc.room_id = :room_id AND rc.isScreenClient = false AND rc.isAVClient <>
true")
- , @NamedQuery(name="getByRoomIdAll", query="SELECT rc FROM RoomClient
rc WHERE rc.room_id = :room_id")
- , @NamedQuery(name="getByRoomIdMod", query="SELECT rc FROM RoomClient
rc WHERE rc.room_id = :room_id AND rc.isMod = true")
- , @NamedQuery(name="deleteByStreamId", query="DELETE FROM RoomClient rc
WHERE rc.streamid = :streamid")
- , @NamedQuery(name="deleteAll", query="DELETE FROM RoomClient rc")
- , @NamedQuery(name="getRecordingCountByRoomId", query="SELECT COUNT(rc)
FROM RoomClient rc WHERE rc.room_id = :room_id AND rc.startRecording = true")
- , @NamedQuery(name="getPublisingCountByRoomId", query="SELECT COUNT(rc)
FROM RoomClient rc WHERE rc.room_id = :room_id AND rc.streamPublishStarted =
true")
-})
public class RoomClient implements Serializable {
+
private static final long serialVersionUID = 1831858089607111565L;
-
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- private Long roomClientId = null;
- /*
+ /**
* login name
*/
- @Column(name="username")
private String username = "";
- /*
+ /**
* a unique id
*/
- @Column(name="streamid")
private String streamid = "";
-
- @Column(name="scope")
private String scope = "";
-
- @Column(name="vWidth")
private int vWidth = 0;
-
- @Column(name="vHeight")
private int vHeight = 0;
-
- @Column(name="vX")
private int vX = 0;
-
- @Column(name="vY")
private int vY = 0;
/**
* StreamPublishName is used in the screen sharing client to publish
the stream
*/
- @Column(name="streamPublishName")
private String streamPublishName = "";
/**
@@ -104,40 +64,22 @@ public class RoomClient implements Seria
* didn't choose any device settings or the connection really just
* has been initialized
*/
- @Column(name="public_sid")
private String publicSID = "";
- /*
+ /**
* true indicates that this user is Moderating
* in Events rooms (only 1 Video) this means that this user is
currently
* sharing its video/audio
*
*/
- @Column(name="is_mod")
private Boolean isMod = false;
-
- @Column(name="is_super_mod")
private Boolean isSuperModerator = false;
-
- @Column(name="canDraw")
private Boolean canDraw = false;
-
- @Column(name="canShare")
private Boolean canShare = false;
-
- @Column(name="canRemote")
private Boolean canRemote = false;
-
- @Column(name="canGiveAudio")
private Boolean canGiveAudio = false;
-
- @Column(name="connected_since")
private Date connectedSince;
-
- @Column(name="formated_date")
private String formatedDate;
-
- @Column(name="isScreenClient")
private Boolean isScreenClient = false;
/**
* If true this client is only used to stream audio/video events,
@@ -147,149 +89,91 @@ public class RoomClient implements Seria
* false the user is a regular user with full session object<br/>
*
*/
- @Column(name="isAVClient", nullable=false)
private boolean isAVClient = false;
- /*
+ /**
* the color of the user, only needed in 4x4 Conference, in these rooms
each user has its own
* color
*/
- @Column(name="usercolor")
private String usercolor;
/*
* no longer needed since broadCastId is now the new unique id
- *
- * @deprecated
*/
- @Column(name="userpos")
+ @Deprecated
private Integer userpos;
- /*
+ /**
* client IP
*/
- @Column(name="userip")
private String userip;
- /*
+ /**
* client Port
*/
- @Column(name="userport")
private int userport;
- /*
+ /**
* current room id while conferencing
*/
- @Column(name="room_id")
private Long room_id;
-
- @Column(name="room_enter")
private Date roomEnter = null;
- /*
+ /**
* this is the id this user is currently using to broadcast a stream
* default value is -2 cause otherwise this can due to disconnect
*/
- @Column(name="broadcast_id")
private long broadCastID = -2;
- /*
+ /**
* some vars _not_ directly connected to the user-record from the
database
* cause a user is not _forced_ to login he can also be an invited
user, so user_id
* might be null or 0 even if somebody is already in a conference room
*
*/
- @Column(name="user_id")
private Long user_id = null;
-
- @Column(name="firstname")
private String firstname = "";
-
- @Column(name="lastname")
private String lastname = "";
-
- @Column(name="mail")
private String mail;
-
- @Column(name="last_login")
private String lastLogin;
-
- @Column(name="official_code")
private String official_code;
-
- @Column(name="picture_uri")
private String picture_uri;
-
- @Column(name="language")
private String language = "";
- /*
+ /**
* avsettings can be:
* av - video and audio
* a - audio only
* v - video only
* n - no av only static Image
*/
- @Column(name="avsettings")
private String avsettings = "";
-
- @Column(name="swfurl")
private String swfurl;
-
- @Column(name="is_recording")
private Boolean isRecording = false;
-
- @Column(name="room_recording_name")
private String roomRecordingName;
-
- @Column(name="flvRecordingId")
private Long flvRecordingId;
-
- @Column(name="flvRecordingMetaDataId")
private Long flvRecordingMetaDataId;
-
- @Column(name="organization_id")
private Long organization_id;
-
- @Column(name="startRecording")
private boolean startRecording = false;
-
- @Column(name="startStreaming")
private boolean startStreaming = false;
-
- @Column(name="screenPublishStarted")
private boolean screenPublishStarted = false;
-
- @Column(name="streamPublishStarted")
private boolean streamPublishStarted = false;
- /*
+ /**
* Indicates if this User is broadcasting his stream at all
* Only interesting in the Event Modus
*/
- @Column(name="isBroadcasting")
private Boolean isBroadcasting = false;
//Vars to simulate external Users
- @Column(name="externalUserId")
private String externalUserId;
-
- @Column(name="externalUserType")
private String externalUserType;
-
- @Transient
private List<String> sharerSIDs = new LinkedList<String>();
//Session values for handling the Interviwe Room Type
- @Column(name="interviewPodId")
private Integer interviewPodId = null;
-
- @Column(name="allowRecording")
private Boolean allowRecording = true;
/*
* Zombie Flag
*/
- @Column(name="zombieCheckFlag")
private Boolean zombieCheckFlag = false;
-
- @Column(name="micMuted")
private Boolean micMuted = false;
public void setUserObject(Long user_id, String username, String
firstname, String lastname) {
@@ -304,13 +188,6 @@ public class RoomClient implements Seria
this.firstname = firstname;
this.lastname = lastname;
}
-
- public Long getRoomClientId() {
- return roomClientId;
- }
- public void setRoomClientId(Long roomClientId) {
- this.roomClientId = roomClientId;
- }
public Date getConnectedSince() {
return connectedSince;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -20,7 +20,7 @@ package org.apache.openmeetings.conferen
import java.util.List;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
+import org.apache.openmeetings.conference.room.RoomClient;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -32,8 +32,8 @@ import javax.persistence.criteria.Predic
import javax.persistence.criteria.Root;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.remote.red5.IClientList;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -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.persistence.beans.rooms.RoomClient;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
Thu Nov 1 13:04:16 2012
@@ -77,15 +77,13 @@ public class RoomDAO implements IDataPro
}
public List<Rooms> getPublicRooms() {
- //TypedQuery<Rooms> q =
em.createNamedQuery("getNondeletedRooms", Rooms.class);
- TypedQuery<Rooms> q = em.createQuery(
- "SELECT r from Rooms r LEFT JOIN FETCH
r.currentusers WHERE r.ispublic= true AND r.deleted= false AND r.appointment =
false ORDER BY r.name ASC", Rooms.class);
- return q.getResultList();
+ return em.createNamedQuery("getPublicRoomsOrdered", Rooms.class)
+ .getResultList();
}
public List<Rooms> getOrganisationRooms(long orgId) {
TypedQuery<Rooms> q = em.createQuery(
- "SELECT DISTINCT c.room FROM Rooms_Organisation
c LEFT JOIN FETCH c.room LEFT JOIN FETCH c.room.currentusers "
+ "SELECT DISTINCT c.room FROM Rooms_Organisation
c LEFT JOIN FETCH c.room "
+ "WHERE c.organisation.organisation_id =
:orgId "
+ "AND c.deleted = false AND c.room.deleted =
false AND c.room.appointment = false "
+ "AND c.organisation.deleted = false "
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -1000,7 +1000,7 @@ public class Roommanagement {
if (authLevelManagement.checkUserLevel(user_level)) {
String hql = "SELECT c FROM Rooms_Organisation
c "
- + "LEFT JOIN FETCH c.room LEFT
JOIN FETCH c.room.currentusers "
+ + "LEFT JOIN FETCH c.room "
+ "WHERE
c.organisation.organisation_id = :organisation_id "
+ "AND c.deleted <> :deleted
AND c.room.deleted <> :deleted AND c.room.appointment = false "
+ "AND c.organisation.deleted
<> :deleted "
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -38,6 +38,7 @@ import javax.persistence.criteria.Root;
import org.apache.commons.lang.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
+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;
@@ -53,7 +54,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.persistence.beans.user.UserSipData;
import org.apache.openmeetings.persistence.beans.user.Userdata;
import org.apache.openmeetings.persistence.beans.user.Userlevel;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -27,6 +27,7 @@ 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;
@@ -36,7 +37,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.ldap.config.ConfigReader;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.utils.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -38,8 +38,10 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
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.basic.Server;
import org.simpleframework.xml.Element;
@@ -48,10 +50,11 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Rooms r
WHERE r.deleted = false")
- , @NamedQuery(name = "getRoomById", query = "SELECT r FROM Rooms r
WHERE r.deleted = false AND r.rooms_id = :id")
- , @NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Rooms
r WHERE r.deleted = false")
- , @NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Rooms r
LEFT JOIN FETCH r.moderators WHERE r.deleted = false ")
+ @NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Rooms r
WHERE r.deleted = false"),
+ @NamedQuery(name = "getPublicRoomsOrdered", query = "SELECT r from
Rooms r WHERE r.ispublic= true AND r.deleted= false AND r.appointment = false
ORDER BY r.name ASC"),
+ @NamedQuery(name = "getRoomById", query = "SELECT r FROM Rooms r WHERE
r.deleted = false AND r.rooms_id = :id"),
+ @NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Rooms r
WHERE r.deleted = false"),
+ @NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Rooms r
LEFT JOIN FETCH r.moderators WHERE r.deleted = false ")
})
@Table(name = "rooms")
@Root(name = "room")
@@ -215,8 +218,7 @@ public class Rooms implements Serializab
@org.simpleframework.xml.Transient
private List<Rooms_Organisation> roomOrganisations = new
ArrayList<Rooms_Organisation>();
- @OneToMany(fetch = FetchType.LAZY)
- @JoinColumn(name = "room_id")
+ @Transient
private List<RoomClient> currentusers;
public String getComment() {
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
+import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.remote.red5.EmoticonsManager;
import org.apache.openmeetings.remote.red5.IClientList;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -28,6 +28,7 @@ import java.util.Set;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
+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;
@@ -40,7 +41,6 @@ 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.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.remote.red5.IClientList;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.crypt.MD5;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
+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;
@@ -38,7 +39,6 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.persistence.beans.rooms.RoomModerators;
import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
@@ -141,6 +141,10 @@ public class ConferenceService {
List<Rooms_Organisation> roomOrgsList = roommanagement
.getRoomsOrganisationByOrganisationId(user_level,
organisation_id);
+
+ for (Rooms_Organisation roomOrg : roomOrgsList) {
+
roomOrg.getRoom().setCurrentusers(clientListManager.getClientListByRoom(roomOrg.getRoom().getRooms_id()));
+ }
return roomOrgsList;
} catch (Exception err) {
@@ -217,6 +221,10 @@ public class ConferenceService {
log.debug("getRoomsPublic user_level: " + user_level);
List<Rooms> roomList = roomDao.getPublicRooms();
+
+ for (Rooms room : roomList) {
+
room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id()));
+ }
return roomList;
} catch (Exception err) {
@@ -423,7 +431,9 @@ public class ConferenceService {
public Rooms getRoomWithCurrentUsersById(String SID, long rooms_id) {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- return roommanagement.getRoomById(user_level, rooms_id);
+ Rooms room = roommanagement.getRoomById(user_level, rooms_id);
+
room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id()));
+ return room;
}
/**
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.openmeetings.OpenmeetingsVariables;
+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;
@@ -46,7 +47,6 @@ 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.RoomClient;
import org.apache.openmeetings.remote.red5.IClientList;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.utils.OmFileHelper;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.openmeetings.OpenmeetingsVariables;
+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;
@@ -51,7 +52,6 @@ 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.RoomClient;
import org.apache.openmeetings.persistence.beans.user.Userdata;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.remote.red5.IClientList;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -24,12 +24,12 @@ import java.util.List;
import java.util.Set;
import org.apache.openmeetings.OpenmeetingsVariables;
+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.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.remote.red5.IClientList;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
+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;
@@ -50,7 +51,6 @@ import org.apache.openmeetings.data.user
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.RoomClient;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
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=1404574&r1=1404573&r2=1404574&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 Nov 1 13:04:16 2012
@@ -29,6 +29,7 @@ import java.util.LinkedList;
import java.util.Map;
import org.apache.commons.collections.ComparatorUtils;
+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;
@@ -36,7 +37,6 @@ 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.RoomClient;
import org.apache.openmeetings.remote.red5.IClientList;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManager;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ClientListHashMapStore.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ClientListHashMapStore.java?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ClientListHashMapStore.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ClientListHashMapStore.java
Thu Nov 1 13:04:16 2012
@@ -28,8 +28,8 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -89,8 +89,6 @@ public class ClientListHashMapStore impl
clientList.put(rcm.getStreamid(), rcm);
- log.debug(" :: addClientListItem :: " +
rcm.getRoomClientId());
-
return rcm;
} catch (Exception err) {
log.error("[addClientListItem]", err);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/IClientList.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/IClientList.java?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/IClientList.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/IClientList.java
Thu Nov 1 13:04:16 2012
@@ -21,8 +21,8 @@ package org.apache.openmeetings.remote.r
import java.util.Collection;
import java.util.List;
+import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
public interface IClientList {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Thu Nov 1 13:04:16 2012
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.conference.whiteboard.BrowserStatus;
import org.apache.openmeetings.conference.whiteboard.RoomStatus;
import org.apache.openmeetings.conference.whiteboard.WhiteboardManagement;
@@ -44,7 +45,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.remote.FLVRecorderService;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1404574&r1=1404573&r2=1404574&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Thu Nov 1 13:04:16 2012
@@ -30,10 +30,10 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.data.basic.Fieldmanagment;
import org.apache.openmeetings.data.basic.Sessionmanagement;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.remote.red5.IClientList;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.velocity.VelocityContext;
