Author: sebawagner
Date: Thu Mar 1 14:39:46 2012
New Revision: 1295588
URL: http://svn.apache.org/viewvc?rev=1295588&view=rev
Log:
Fixes OPENMEETINGS-76 Remove Event Recording
Added:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/session/
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/session/RoomClient.java
- copied, changed from r1295557,
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RoomClient.java
incubator/openmeetings/trunk/singlewebapp/test/dist-debug-trace.txt (with
props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/recording/
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.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/app/org/openmeetings/app/conference/whiteboard/RoomStatus.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Sessionmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
Thu Mar 1 14:39:46 2012
@@ -34,9 +34,6 @@
<!-- -->
<include href="meetings/" />
- <!--
- <include href="recording/" />
- -->
<include href="admin/" />
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=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
Thu Mar 1 14:39:46 2012
@@ -53,14 +53,6 @@
<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class>
-
<class>org.openmeetings.app.persistence.beans.recording.Recording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomStream</class>
-
<class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class>
<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
<class>org.openmeetings.app.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=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
Thu Mar 1 14:39:46 2012
@@ -53,14 +53,6 @@
<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class>
-
<class>org.openmeetings.app.persistence.beans.recording.Recording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomStream</class>
-
<class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class>
<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
<class>org.openmeetings.app.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=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
Thu Mar 1 14:39:46 2012
@@ -53,14 +53,6 @@
<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class>
-
<class>org.openmeetings.app.persistence.beans.recording.Recording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomStream</class>
-
<class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class>
<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
<class>org.openmeetings.app.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=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
Thu Mar 1 14:39:46 2012
@@ -53,14 +53,6 @@
<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class>
-
<class>org.openmeetings.app.persistence.beans.recording.Recording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomStream</class>
-
<class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class>
<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
<class>org.openmeetings.app.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=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
Thu Mar 1 14:39:46 2012
@@ -53,14 +53,6 @@
<class>org.openmeetings.app.persistence.beans.poll.PollType</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class>
-
<class>org.openmeetings.app.persistence.beans.recording.Recording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomStream</class>
-
<class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class>
<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
Copied:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/session/RoomClient.java
(from r1295557,
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RoomClient.java)
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/session/RoomClient.java?p2=incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/session/RoomClient.java&p1=incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RoomClient.java&r1=1295557&r2=1295588&rev=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RoomClient.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/session/RoomClient.java
Thu Mar 1 14:39:46 2012
@@ -16,60 +16,38 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.persistence.beans.recording;
+package org.openmeetings.app.conference.session;
import java.io.Serializable;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-
-@Entity
-@Table(name = "roomclient")
public class RoomClient implements Serializable {
private static final long serialVersionUID = 1831858089607111565L;
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="roomclient_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 = "";
/**
@@ -85,7 +63,6 @@ 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 = "";
/*
@@ -94,23 +71,14 @@ public class RoomClient implements Seria
* 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,
@@ -121,46 +89,38 @@ public class RoomClient implements Seria
* false the user is a regular user with full session object<br/>
*
*/
- @Column(name="isAVClient")
private Boolean isAVClient = null;
/*
* 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")
private Integer userpos;
/*
* client IP
*/
- @Column(name="userip")
private String userip;
/*
* client Port
*/
- @Column(name="userport")
private int userport;
/*
* current room idd 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;
/*
@@ -169,30 +129,20 @@ public class RoomClient implements Seria
* 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 = "";
/*
* these vars are necessary to send notifications from the chatroom of
a
* conference to outside of the conference room
*/
- @Column(name="is_chat_notification")
private Boolean isChatNotification = false;
- @Column(name="chat_user_room_id")
private Long chatUserRoomId = null;
/*
@@ -202,58 +152,39 @@ public class RoomClient implements Seria
* 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") //FIXME need to add reference to org
private Long organization_id;
- @Column(name="startRecording")
boolean startRecording = false;
- @Column(name="startStreaming")
boolean startStreaming = false;
- @Column(name="screenPublishStarted")
private boolean screenPublishStarted = 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 Long 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) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/whiteboard/RoomStatus.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/whiteboard/RoomStatus.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/whiteboard/RoomStatus.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/conference/whiteboard/RoomStatus.java
Thu Mar 1 14:39:46 2012
@@ -20,7 +20,7 @@ package org.openmeetings.app.conference.
import java.util.HashMap;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
+import org.openmeetings.app.conference.session.RoomClient;
public class RoomStatus {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Sessionmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Sessionmanagement.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Sessionmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Sessionmanagement.java
Thu Mar 1 14:39:46 2012
@@ -33,8 +33,8 @@ import javax.persistence.criteria.Predic
import javax.persistence.criteria.Root;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
Thu Mar 1 14:39:46 2012
@@ -27,12 +27,12 @@ import javax.persistence.PersistenceCont
import javax.persistence.Query;
import javax.persistence.TypedQuery;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.poll.PollType;
import org.openmeetings.app.persistence.beans.poll.RoomPoll;
import org.openmeetings.app.persistence.beans.poll.RoomPollAnswers;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Thu Mar 1 14:39:46 2012
@@ -33,13 +33,13 @@ import javax.persistence.criteria.Criter
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.beans.basic.SearchResult;
import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
import org.openmeetings.app.data.user.Organisationmanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
import org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Thu Mar 1 14:39:46 2012
@@ -38,6 +38,7 @@ import javax.persistence.criteria.Root;
import org.apache.commons.lang.StringUtils;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
@@ -50,7 +51,6 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.user.UserSipData;
import org.openmeetings.app.persistence.beans.user.Userdata;
import org.openmeetings.app.persistence.beans.user.Userlevel;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Thu Mar 1 14:39:46 2012
@@ -26,6 +26,7 @@ import java.util.Random;
import java.util.Vector;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl;
@@ -36,7 +37,6 @@ import org.openmeetings.app.ldap.config.
import org.openmeetings.app.persistence.beans.adresses.States;
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.persistence.beans.basic.LdapConfig;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java
Thu Mar 1 14:39:46 2012
@@ -18,7 +18,7 @@
*/
package org.openmeetings.app.persistence.beans.rooms;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
+import org.openmeetings.app.conference.session.RoomClient;
import java.io.Serializable;
import java.util.Date;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java
Thu Mar 1 14:39:46 2012
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Set;
import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.EmoticonsManager;
import org.openmeetings.utils.stringhandlers.ChatString;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Thu Mar 1 14:39:46 2012
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.conference.whiteboard.WhiteboardManagement;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
@@ -39,7 +40,6 @@ import org.openmeetings.app.documents.Li
import org.openmeetings.app.documents.LibraryWmlLoader;
import org.openmeetings.app.documents.LoadLibraryPresentation;
import org.openmeetings.app.persistence.beans.files.FileExplorerItem;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.utils.crypt.MD5;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
Thu Mar 1 14:39:46 2012
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.TimeZone;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.beans.basic.SearchResult;
@@ -37,7 +38,6 @@ import org.openmeetings.app.data.confere
import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.calendar.Appointment;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.rooms.RoomModerators;
import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Thu Mar 1 14:39:46 2012
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Set;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.conference.Roommanagement;
@@ -45,7 +46,6 @@ import org.openmeetings.app.data.user.Us
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.flvrecord.FlvRecording;
import org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.utils.math.CalendarPatterns;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Thu Mar 1 14:39:46 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Navimanagement;
@@ -51,7 +52,6 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.persistence.beans.basic.RemoteSessionObject;
import org.openmeetings.app.persistence.beans.basic.SOAPLogin;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.user.Userdata;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.red5.ClientListManager;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
Thu Mar 1 14:39:46 2012
@@ -24,12 +24,12 @@ import java.util.List;
import java.util.Set;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.conference.PollManagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.poll.PollType;
import org.openmeetings.app.persistence.beans.poll.RoomPoll;
import org.openmeetings.app.persistence.beans.poll.RoomPollAnswers;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Thu Mar 1 14:39:46 2012
@@ -27,6 +27,7 @@ import java.util.LinkedList;
import java.util.List;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
@@ -45,7 +46,6 @@ import org.openmeetings.app.data.user.da
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.domain.Organisation;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
import org.openmeetings.app.persistence.beans.user.PrivateMessageFolder;
import org.openmeetings.app.persistence.beans.user.PrivateMessages;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
Thu Mar 1 14:39:46 2012
@@ -31,6 +31,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.collections.ComparatorUtils;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.conference.whiteboard.Cliparts;
import org.openmeetings.app.conference.whiteboard.WhiteboardObject;
import org.openmeetings.app.conference.whiteboard.WhiteboardObjectList;
@@ -38,7 +39,6 @@ import org.openmeetings.app.conference.w
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.app.remote.red5.WhiteBoardObjectListManager;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
Thu Mar 1 14:39:46 2012
@@ -26,8 +26,8 @@ import java.util.LinkedList;
import java.util.List;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.beans.basic.SearchResult;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Thu Mar 1 14:39:46 2012
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Set;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.conference.whiteboard.BrowserStatus;
import org.openmeetings.app.conference.whiteboard.RoomStatus;
import org.openmeetings.app.conference.whiteboard.WhiteboardManagement;
@@ -44,7 +45,6 @@ import org.openmeetings.app.data.user.da
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.persistence.beans.calendar.Appointment;
import org.openmeetings.app.persistence.beans.calendar.MeetingMember;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.FLVRecorderService;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java?rev=1295588&r1=1295587&r2=1295588&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
Thu Mar 1 14:39:46 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import org.apache.axis2.AxisFault;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.beans.basic.SearchResult;
@@ -40,7 +41,6 @@ import org.openmeetings.app.data.user.Us
import org.openmeetings.app.persistence.beans.calendar.Appointment;
import org.openmeetings.app.persistence.beans.flvrecord.FlvRecording;
import org.openmeetings.app.persistence.beans.invitation.Invitations;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
import org.openmeetings.app.persistence.beans.user.Users;
