You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/31 08:03:45 UTC
svn commit: r1367415 - in
/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans:
adresses/ basic/ calendar/ domain/ files/ flvrecord/ invitation/ lang/
logs/ poll/ rooms/ sip/ sip/asterisk/ user/
Author: solomax
Date: Tue Jul 31 06:03:42 2012
New Revision: 1367415
URL: http://svn.apache.org/viewvc?rev=1367415&view=rev
Log:
OPENMEETINGS-107 is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/OmTimeZone.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/SOAPLogin.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Sessiondata.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingLog.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaDelta.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLogType.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/PollType.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/RoomPoll.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomClient.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/OpenXGReturnObject.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java Tue Jul 31 06:03:42 2012
@@ -43,7 +43,7 @@ public class Adresses implements Seriali
private static final long serialVersionUID = 1387576041912128161L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "adresses_id")
+ @Column(name = "id")
private Long adresses_id;
@Column(name = "additionalname")
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java Tue Jul 31 06:03:42 2012
@@ -34,18 +34,24 @@ public class States implements Serializa
private static final long serialVersionUID = -1629546369219451403L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "state_id")
+ @Column(name = "id")
private Long state_id;
+
@Column(name = "name")
private String name;
+
@Column(name = "starttime")
private Date starttime;
+
@Column(name = "updatetime")
private Date updatetime;
+
@Column(name = "deleted")
private boolean deleted;
+
@Column(name = "shortName")
private String shortName;
+
@Column(name = "code")
private int code;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java Tue Jul 31 06:03:42 2012
@@ -48,7 +48,7 @@ public class Configuration implements Se
private static final long serialVersionUID = -6129473946508963339L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="configuration_id")
+ @Column(name="id")
@Element(name="id", data=true)
private Long configuration_id;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java Tue Jul 31 06:03:42 2012
@@ -32,7 +32,7 @@ public class ErrorType implements Serial
private static final long serialVersionUID = 1519570470483604258L;
@Id
- @Column(name = "errortype_id")
+ @Column(name = "id")
private Long errortype_id;
@Column(name = "fieldvalues_id")
@@ -40,8 +40,10 @@ public class ErrorType implements Serial
@Column(name = "starttime")
private Date starttime;
+
@Column(name = "updatetime")
private Date updatetime;
+
@Column(name = "deleted")
private boolean deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java Tue Jul 31 06:03:42 2012
@@ -32,16 +32,21 @@ public class ErrorValues implements Seri
private static final long serialVersionUID = -1892810463706968018L;
@Id
- @Column(name = "errorvalues_id")
+ @Column(name = "id")
private Long errorvalues_id;
+
@Column(name = "errortype_id")
private Long errortype_id;
+
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
+
@Column(name = "starttime")
private Date starttime;
+
@Column(name = "updatetime")
private Date updatetime;
+
@Column(name = "deleted")
private boolean deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java Tue Jul 31 06:03:42 2012
@@ -43,33 +43,43 @@ public class LdapConfig implements Seria
private static final long serialVersionUID = 2839158519803993035L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="ldapconfig_id")
+ @Column(name="id")
public long ldapConfigId;
+
@Column(name="name")
@Element(data=true)
public String name;
+
@Column(name="config_file_name")
@Element(data=true)
public String configFileName;
+
@Column(name="add_domain_to_user_name")
@Element(data=true)
public Boolean addDomainToUserName;
+
@Column(name="domain")
@Element(data=true)
public String domain;
+
@Column(name="is_active")
@Element(data=true)
public Boolean isActive;
+
@Column(name="inserted")
public Date inserted;
+
@Column(name="updated")
public Date updated;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="insertedby_id", updatable=true, insertable=true)
public Users insertedby;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="updatedby_id", updatable=true, insertable=true)
public Users updatedby;
+
@Column(name="deleted")
private boolean deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java Tue Jul 31 06:03:42 2012
@@ -54,39 +54,55 @@ public class Naviglobal implements Seria
private static final long serialVersionUID = 515828033813767719L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "global_id")
+ @Column(name = "id")
private Long global_id;
+
@Column(name = "name")
private String name;
+
@Column(name = "icon")
private String icon;
+
@Column(name = "isleaf")
private Boolean isleaf;
+
@Column(name = "isopen")
private Boolean isopen;
+
@Column(name = "action")
private String action;
+
@Column(name = "updatetime")
private Date updatetime;
+
@Column(name = "starttime")
private Date starttime;
+
@Column(name = "comment_field")
private String comment;
+
@Column(name = "naviorder")
private Integer naviorder;
+
@Column(name = "level_id")
private Long level_id;
+
@Column(name = "deleted")
private boolean deleted;
+
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
+
@Column(name = "tooltip_fieldvalues_id")
private Long tooltip_fieldvalues_id;
+
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "global_id")
private List<Navimain> mainnavi;
+
@Transient
private Fieldlanguagesvalues label;
+
@Transient
private Fieldlanguagesvalues tooltip;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java Tue Jul 31 06:03:42 2012
@@ -37,41 +37,57 @@ public class Navimain implements Seriali
private static final long serialVersionUID = 1691787896183701877L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="main_id")
+ @Column(name="id")
private Long main_id;
+
@Column(name="global_id")
private Long global_id;
+
@Column(name="name")
private String name;
+
@Column(name="icon")
private String icon;
+
@Column(name="isleaf")
private Boolean isleaf;
+
@Column(name="isopen")
private Boolean isopen;
+
@Column(name="action")
private String action;
+
@Column(name="params")
private String params;
+
@Column(name="updatetime")
private Date updatetime;
+
@Column(name="starttime")
private Date starttime;
+
@Column(name="comment_field")
private String comment;
+
@Column(name="naviorder")
private Integer naviorder;
+
@Column(name="level_id")
private Long level_id;
+
@Column(name="fieldvalues_id")
private Long fieldvalues_id;
+
@Column(name="deleted")
private boolean deleted;
+
@Transient
private Fieldlanguagesvalues label;
+
@Transient
private Fieldlanguagesvalues tooltip;
+
@Column(name="tooltip_fieldvalues_id")
private Long tooltip_fieldvalues_id;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/OmTimeZone.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/OmTimeZone.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/OmTimeZone.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/OmTimeZone.java Tue Jul 31 06:03:42 2012
@@ -33,23 +33,27 @@ import javax.persistence.Transient;
@Entity
@Table(name = "om_timezone")
public class OmTimeZone implements Serializable {
-
private static final long serialVersionUID = 6521571695782900198L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="om_timezone_id")
+ @Column(name="id")
private Long omtimezoneId;
+
@Column(name="jname")
private String jname;
+
@Column(name="label")
private String label;
+
@Column(name="ical")
private String ical;
+
@Column(name="inserted")
private Date inserted;
+
@Column(name="order_id")
public Integer orderId;
+
@Transient
public String frontEndLabel;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/SOAPLogin.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/SOAPLogin.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/SOAPLogin.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/SOAPLogin.java Tue Jul 31 06:03:42 2012
@@ -31,39 +31,51 @@ import javax.persistence.Table;
@Entity
@Table(name = "soaplogin")
public class SOAPLogin implements Serializable {
-
private static final long serialVersionUID = 5101010700038221434L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="soapLoginId")
+ @Column(name="id")
private long soapLoginId;
+
@Column(name="hash")
private String hash;
+
@Column(name="room_id")
private Long room_id;
+
@Column(name="session_hash")
private String sessionHash;
+
@Column(name="created")
private Date created;
+
@Column(name="used")
private Boolean used;
+
@Column(name="use_date")
private Date useDate;
+
@Column(name="becomemoderator")
private Boolean becomemoderator;
+
@Column(name="showaudiovideotest")
private Boolean showAudioVideoTest;
+
@Column(name="allow_same_url_multiple_times")
private Boolean allowSameURLMultipleTimes;
+
@Column(name="show_nick_name_dialog")
private Boolean showNickNameDialog;
+
@Column(name="client_url")
private String clientURL;
+
@Column(name="room_recording_id")
private Long roomRecordingId;
+
@Column(name="landing_zone")
private String landingZone;
+
@Column(name="allow_recording")
private Boolean allowRecording;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Sessiondata.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Sessiondata.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Sessiondata.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Sessiondata.java Tue Jul 31 06:03:42 2012
@@ -36,26 +36,34 @@ public class Sessiondata implements Seri
private static final long serialVersionUID = 1928177917452866750L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
@Column(name="id")
private Long id;
+
@Column(name="user_id")
private Long user_id;
+
@Column(name="session_id")
private String session_id;
+
@Column(name="starttermin_time")
private Date starttermin_time;
+
@Column(name="refresh_time")
private Date refresh_time;
+
@Lob
@Column(name="sessionXml")
private String sessionXml;
+
@Column(name="storePermanent")
private Boolean storePermanent;
+
@Column(name="language_id")
private Long language_id;
+
@Column(name="organization_id")
private Long organization_id;
+
public Sessiondata() {
super();
// TODO Auto-generated constructor stub
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java Tue Jul 31 06:03:42 2012
@@ -73,7 +73,7 @@ public class Appointment implements Seri
private static final long serialVersionUID = 2016808778885761525L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "appointment_id")
+ @Column(name = "id")
@Element(data=true)
private Long appointmentId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java Tue Jul 31 06:03:42 2012
@@ -39,25 +39,28 @@ import javax.persistence.Table;
@Entity
@Table(name = "appointmentcategory")
public class AppointmentCategory implements Serializable {
-
private static final long serialVersionUID = 595713649933692774L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="category_id")
+ @Column(name="id")
private Long categoryId;
+
@Column(name="name")
private String name;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="user_id", nullable=true)
private Users user;
@Column(name="starttime")
private Date starttime;
+
@Column(name="updatetime")
private Date updatetime;
+
@Column(name="deleted")
private boolean deleted;
+
@Lob
@Column(name="comment_field", length=2048)
private String comment;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java Tue Jul 31 06:03:42 2012
@@ -37,26 +37,25 @@ import org.openmeetings.app.persistence.
@Entity
@Table(name = "appointmentremindertyps")
public class AppointmentReminderTyps implements Serializable {
-
- /**
- *
- */
private static final long serialVersionUID = -6543593995706839669L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="typ_id")
+ @Column(name="id")
private Long typId;
+
@Column(name="name")
private String name;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="user_id", nullable=true)
private Users user;
@Column(name="starttime")
private Date starttime;
+
@Column(name="updatetime")
private Date updatetime;
+
@Column(name="deleted")
private boolean deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java Tue Jul 31 06:03:42 2012
@@ -45,7 +45,7 @@ public class MeetingMember implements Se
private static final long serialVersionUID = -3864571325368787524L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="meeting_member_id")
+ @Column(name="id")
@Element(data=true)
private Long meetingMemberId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java Tue Jul 31 06:03:42 2012
@@ -50,7 +50,7 @@ public class Organisation implements Ser
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="organisation_id")
+ @Column(name="id")
@Element(data=true)
private Long organisation_id;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java Tue Jul 31 06:03:42 2012
@@ -51,7 +51,7 @@ public class Organisation_Users implemen
private static final long serialVersionUID = 7206870465903375817L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "organisation_users_id")
+ @Column(name = "id")
private Long organisation_users_id;
@ManyToOne(fetch = FetchType.EAGER)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java Tue Jul 31 06:03:42 2012
@@ -46,7 +46,7 @@ public class FileExplorerItem implements
private static final long serialVersionUID = 242843782142620566L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="fileexploreritem_id")
+ @Column(name="id")
@Element(data=true)
private long fileExplorerItemId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java Tue Jul 31 06:03:42 2012
@@ -52,7 +52,7 @@ public class FlvRecording implements Ser
private static final long serialVersionUID = -2234874663310617072L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="flvrecording_id")
+ @Column(name="id")
@Element(data=true)
private long flvRecordingId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingLog.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingLog.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingLog.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingLog.java Tue Jul 31 06:03:42 2012
@@ -39,19 +39,23 @@ public class FlvRecordingLog implements
private static final long serialVersionUID = -2577533628675416706L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="flvrecording_log_id")
+ @Column(name="id")
private long flvRecordingLogId;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="flvrecording_id", nullable=true)
private FlvRecording flvRecording;
+
@Column(name="inserted")
private Date inserted;
+
@Column(name="msg_type")
private String msgType;
+
@Lob
@Column(name="ful_message")
private String fullMessage;
+
@Column(name="exit_value")
private String exitValue;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java Tue Jul 31 06:03:42 2012
@@ -43,7 +43,7 @@ public class FlvRecordingMetaData implem
private static final long serialVersionUID = 8444176152324513716L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="flv_meta_id")
+ @Column(name="id")
@Element(data=true, required=false)
private long flvRecordingMetaDataId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaDelta.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaDelta.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaDelta.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaDelta.java Tue Jul 31 06:03:42 2012
@@ -34,47 +34,60 @@ import javax.persistence.Table;
@Entity
@Table(name = "flvrecording_meta_delta")
public class FlvRecordingMetaDelta implements Serializable {
-
- /**
- *
- */
private static final long serialVersionUID = -733483974696234137L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="flv_delta_id")
+ @Column(name="id")
private long flvRecordingMetaDeltaId;
+
@Column(name="flvrecording_metadata_id")
private Long flvRecordingMetaDataId;
+
@Column(name="time_stamp")
private Integer timeStamp;
+
@Column(name="delta_time")
private Long deltaTime;
+
@Column(name="last_time_stamp")
private Long lastTimeStamp;
+
@Column(name="start_time")
private Date startTime;
+
@Column(name="current_event_time")
private Date currentTime;
+
@Column(name="delta_time_stamp")
private Long deltaTimeStamp;
+
@Column(name="missing_time")
private Long missingTime;
+
@Column(name="duration")
private Integer duration;
+
@Column(name="start_time_stamp")
private Integer startTimeStamp;
+
@Column(name="packet_time_stamp")
private Integer packetTimeStamp;
+
@Column(name="wave_out_put_name")
private String waveOutPutName;
+
@Column(name="data_length_packet")
private Integer dataLengthPacket;
+
@Column(name="received_audio_data_length")
private Long receivedAudioDataLength;
+
@Column(name="is_end_padding")
private Boolean isEndPadding;
+
@Column(name="is_start_padding")
private Boolean isStartPadding;
+
@Column(name="debug_status")
private String debugStatus;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java Tue Jul 31 06:03:42 2012
@@ -37,21 +37,23 @@ import org.openmeetings.app.persistence.
@Entity
@Table(name = "invitations")
public class Invitations implements Serializable {
-
private static final long serialVersionUID = 1153321347974705506L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "invitations_id")
+ @Column(name = "id")
private Long invitations_id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "invitedBy", nullable = true)
private Users invitedBy;
+
@Column(name = "starttime")
private Date starttime;
+
@Column(name = "updatetime")
private Date updatetime;
+
@Column(name = "deleted")
private boolean deleted;
@@ -62,12 +64,16 @@ public class Invitations implements Seri
// the hash for the link
@Column(name = "hash")
private String hash;
+
@Column(name = "invitedname")
private String invitedname;
+
@Column(name = "invitedEMail")
private String invitedEMail;
+
@Column(name = "ispasswordprotected")
private Boolean isPasswordProtected;
+
@Column(name = "invitationpass")
private String invitationpass;
@@ -80,16 +86,20 @@ public class Invitations implements Seri
// TimeStamp
@Column(name = "isValidByTime")
private Boolean isValidByTime = false;
+
@Column(name = "validFrom")
private Date validFrom;
+
@Column(name = "validTo")
private Date validTo;
// An invitation which is canBeUsedOnlyOneTime = true can be only used
// one-time
@Column(name = "canBeUsedOnlyOneTime")
private Boolean canBeUsedOnlyOneTime = false;
+
@Column(name = "invitationWasUsed")
private Boolean invitationWasUsed = false;
+
@Column(name = "appointment_id")
private Long appointmentId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java Tue Jul 31 06:03:42 2012
@@ -36,21 +36,26 @@ import javax.persistence.Table;
@Entity
@Table(name = "fieldlanguage")
public class FieldLanguage implements Serializable {
-
private static final long serialVersionUID = 3501643212388395425L;
@Id
- @Column(name="language_id")
+ @Column(name="id")
private Long language_id;
+
@Column(name="name")
private String name;
+
@Column(name="starttime")
private Date starttime;
+
@Column(name="updatetime")
private Date updatetime;
+
@Column(name="deleted")
private boolean deleted;
+
@Column(name="rtl")
private Boolean rtl;
+
@Column(name="code")
private String code;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java Tue Jul 31 06:03:42 2012
@@ -53,22 +53,27 @@ import javax.persistence.Table;
})
@Table(name = "fieldlanguagesvalues")
public class Fieldlanguagesvalues implements Serializable {
-
private static final long serialVersionUID = 1965055047163639210L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="lang_val_id")
+ @Column(name="id")
private Long fieldlanguagesvalues_id;
+
@Column(name="fieldvalues_id")
private Long fieldvalues_id;
+
@Column(name="language_id")
private Long language_id;
+
@Column(name="starttime")
private Date starttime;
+
@Column(name="updatetime")
private Date updatetime;
+
@Column(name="deleted")
private boolean deleted;
+
@Lob
@Column(name="value")
private String value;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java Tue Jul 31 06:03:42 2012
@@ -41,14 +41,18 @@ import javax.persistence.Transient;
public class Fieldvalues implements Serializable {
private static final long serialVersionUID = -3439614511218028085L;
@Id
- @Column(name="fieldvalues_id")
+ @Column(name="id")
private Long fieldvalues_id;
+
@Column(name="name")
private String name;
+
@Column(name="starttime")
private Date starttime;
+
@Column(name="updatetime")
private Date updatetime;
+
@Column(name="deleted")
private boolean deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java Tue Jul 31 06:03:42 2012
@@ -36,41 +36,50 @@ import javax.persistence.Table;
@Entity
@Table(name = "conferencelog")
public class ConferenceLog implements Serializable {
-
-
private static final long serialVersionUID = 147341496943518159L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="conferencelog_id")
+ @Column(name="id")
private long conferenceLogId;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="conferencelogtype_id", updatable=true, insertable=true)
private ConferenceLogType conferenceLogType;
+
@Column(name="inserted")
private Date inserted;
+
@Column(name="insertedby")
private long insertedby;
//NULL means its a Guest/Invited User
@Column(name="user_id")
private Long userId;
+
@Column(name="external_user_id")
private String externalUserId;
+
@Column(name="external_user_type")
private String externalUserType;
+
@Column(name="streamid")
private String streamid;
+
@Column(name="room_id")
private Long room_id;
+
@Column(name="userip")
private String userip;
+
@Column(name="scopename")
private String scopeName;
+
@Column(name="email")
private String email;
+
@Column(name="firstname")
private String firstname;
+
@Column(name="lastname")
private String lastname;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLogType.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLogType.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLogType.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLogType.java Tue Jul 31 06:03:42 2012
@@ -33,20 +33,18 @@ import javax.persistence.Table;
@Entity
@Table(name = "conferencelogtype")
public class ConferenceLogType implements Serializable {
-
- /**
- *
- */
private static final long serialVersionUID = 4388958579350356294L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="conferencelogtype_id")
+ @Column(name="id")
private long conferenceLogTypeId;
+
@Column(name="eventtype")
private String eventType;
+
@Column(name="inserted")
private Date inserted;
+
@Column(name="insertedby")
private long insertedby;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/PollType.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/PollType.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/PollType.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/PollType.java Tue Jul 31 06:03:42 2012
@@ -35,11 +35,13 @@ import org.openmeetings.app.persistence.
public class PollType {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "poll_type_id")
+ @Column(name = "id")
private Long pollTypesId;
+
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "fieldvalues_id")
private Fieldvalues label;
+
@Column(name = "numeric_answer")
private Boolean isNumericAnswer;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/RoomPoll.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/RoomPoll.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/RoomPoll.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/poll/RoomPoll.java Tue Jul 31 06:03:42 2012
@@ -46,7 +46,7 @@ import org.simpleframework.xml.Root;
public class RoomPoll {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "room_poll_id")
+ @Column(name = "id")
private Long roomPollId;
@Column(name = "poll_name")
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomClient.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomClient.java Tue Jul 31 06:03:42 2012
@@ -56,7 +56,7 @@ public class RoomClient implements Seria
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="roomclient_id")
+ @Column(name="id")
private Long roomClientId = null;
/*
@@ -76,10 +76,13 @@ public class RoomClient implements Seria
@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;
/**
@@ -112,20 +115,28 @@ public class RoomClient implements Seria
*/
@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;
/**
@@ -186,18 +197,25 @@ public class RoomClient implements Seria
*/
@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 = "";
@@ -207,6 +225,7 @@ public class RoomClient implements Seria
*/
@Column(name="is_chat_notification")
private Boolean isChatNotification = false;
+
@Column(name="chat_user_room_id")
private Long chatUserRoomId = null;
@@ -222,23 +241,31 @@ public class RoomClient implements Seria
@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;
@@ -252,6 +279,7 @@ public class RoomClient implements Seria
//Vars to simulate external Users
@Column(name="externalUserId")
private String externalUserId;
+
@Column(name="externalUserType")
private String externalUserType;
@@ -261,6 +289,7 @@ public class RoomClient implements Seria
//Session values for handling the Interviwe Room Type
@Column(name="interviewPodId")
private Integer interviewPodId = null;
+
@Column(name="allowRecording")
private Boolean allowRecording = true;
@@ -269,6 +298,7 @@ public class RoomClient implements Seria
*/
@Column(name="zombieCheckFlag")
private Boolean zombieCheckFlag = false;
+
@Column(name="micMuted")
private Boolean micMuted = false;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java Tue Jul 31 06:03:42 2012
@@ -44,7 +44,7 @@ public class RoomModerators implements S
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="room_moderators_id")
+ @Column(name="id")
private long roomModeratorsId;
@Column(name = "roomId")
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java Tue Jul 31 06:03:42 2012
@@ -31,19 +31,21 @@ import javax.persistence.Table;
@Entity
@Table(name = "roomtypes")
public class RoomTypes implements Serializable {
-
private static final long serialVersionUID = -4441029424324591356L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="roomtypes_id")
+ @Column(name="id")
private Long roomtypes_id;
+
@Column(name = "starttime")
private Date starttime;
+
@Column(name = "updatetime")
private Date updatetime;
+
@Column(name="name")
private String name;
+
@Column(name = "deleted")
private boolean deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java Tue Jul 31 06:03:42 2012
@@ -49,7 +49,7 @@ public class Rooms implements Serializab
private static final long serialVersionUID = -2860312283159251568L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="rooms_id")
+ @Column(name="id")
@Element(data=true)
private Long rooms_id;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java Tue Jul 31 06:03:42 2012
@@ -42,7 +42,7 @@ public class Rooms_Organisation implemen
private static final long serialVersionUID = 4153935045968138984L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="rooms_organisation_id")
+ @Column(name="id")
@Element(data=true)
private Long rooms_organisation_id;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/OpenXGReturnObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/OpenXGReturnObject.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/OpenXGReturnObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/OpenXGReturnObject.java Tue Jul 31 06:03:42 2012
@@ -31,26 +31,27 @@ import javax.persistence.Table;
@Entity
@Table(name = "open_xg_return_object")
public class OpenXGReturnObject implements Serializable {
-
- /**
- *
- */
private static final long serialVersionUID = -5240675684036197687L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="object_id")
+ @Column(name="id")
private Long openXGReturnObjectId;
@Column(name="method_name")
private String methodName;
+
@Column(name="inserted")
private Date inserted;
+
@Column(name="status_code")
private String status_code;
+
@Column(name="status_string")
private String status_string;
+
@Column(name="conference_number")
private String conferenceNumber;
+
@Column(name="conference_pin")
private String conferencePin;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java Tue Jul 31 06:03:42 2012
@@ -37,12 +37,15 @@ public class MeetMe implements Serializa
@Column(name = "confno", nullable = false)
@Element(data=true)
private String confno = "0";
+
@Column(name = "pin")
@Element(data=true)
private String pin;
+
@Column(name = "adminpin")
@Element(data=true)
private String adminpin;
+
@Column(name = "members", nullable = false)
@Element(data=true)
private Integer members = 0;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java Tue Jul 31 06:03:42 2012
@@ -39,17 +39,21 @@ public class PrivateMessageFolder implem
private static final long serialVersionUID = 3689814412815025816L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="msg_folder_id")
+ @Column(name="id")
@Element(data=true)
private long privateMessageFolderId;
+
@Column(name="folder_name")
@Element(data=true)
private String folderName;
+
@Column(name="user_id")
@Element(data=true)
private Long userId;
+
@Column(name="inserted")
private Date inserted;
+
@Column(name="updated")
private Date updated;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java Tue Jul 31 06:03:42 2012
@@ -44,7 +44,7 @@ public class PrivateMessages implements
private static final long serialVersionUID = 7541117437029707792L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="msg_id")
+ @Column(name="id")
@Element(data=true)
private long privateMessageId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java Tue Jul 31 06:03:42 2012
@@ -34,22 +34,27 @@ import javax.persistence.Transient;
@Entity
@Table(name = "salutations")
public class Salutations implements Serializable {
-
private static final long serialVersionUID = -5806449519074435223L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="salutations_id")
+ @Column(name="id")
private Long salutations_id;
+
@Column(name="name")
private String name;
+
@Column(name="starttime")
private Date starttime;
+
@Column(name="updatetime")
private Date updatetime;
+
@Column(name="deleted")
private boolean deleted;
+
@Column(name="fieldvalues_id")
private Long fieldvalues_id;
+
@Transient
private Fieldlanguagesvalues label;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java Tue Jul 31 06:03:42 2012
@@ -42,7 +42,7 @@ public class UserContacts implements Ser
private static final long serialVersionUID = 2391405538978996206L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="user_contact_id")
+ @Column(name="id")
@Element(data=true)
private long userContactId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java Tue Jul 31 06:03:42 2012
@@ -39,7 +39,7 @@ public class UserSipData implements Seri
private static final long serialVersionUID = 3438146320304686554L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="user_sip_data_id")
+ @Column(name="id")
private long userSipDataId;
@Column(name="username")
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java Tue Jul 31 06:03:42 2012
@@ -33,26 +33,31 @@ import javax.persistence.Table;
@Entity
@Table(name = "userdata")
public class Userdata implements Serializable {
-
private static final long serialVersionUID = 8365799229794940172L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="data_id")
+ @Column(name="id")
private Long data_id;
+
@Column(name="user_id")
- private Long user_id;
+ private Long user_id;
+
@Column(name="data_key")
private String data_key;
+
@Column(name="data")
private String data;
+
@Column(name = "starttime")
private Date starttime;
+
@Column(name = "updatetime")
private Date updatetime;
+
@Lob
@Column(name = "comment_field")
private String comment;
+
@Column(name = "deleted")
private boolean deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java Tue Jul 31 06:03:42 2012
@@ -31,20 +31,24 @@ import javax.persistence.Table;
@Entity
@Table(name = "userlevel")
public class Userlevel implements Serializable {
-
private static final long serialVersionUID = -1779037202328443340L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="level_id")
+ @Column(name="id")
private Long level_id;
+
@Column(name="description")
private String description;
+
@Column(name="statuscode")
private Integer statuscode;
+
@Column(name="starttime")
private Date starttime;
+
@Column(name="updatetime")
private Date updatetime;
+
@Column(name="deleted")
private boolean deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java?rev=1367415&r1=1367414&r2=1367415&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java Tue Jul 31 06:03:42 2012
@@ -62,7 +62,7 @@ public class Users implements Serializab
private static final long serialVersionUID = -2265479712596674065L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "user_id")
+ @Column(name = "id")
@Element(data=true)
private Long user_id;