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 2014/06/23 10:47:11 UTC
svn commit: r1604715 [3/7] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/
openmeetings-core/src/main/java/org/ap...
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.basic;
-import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -37,22 +36,23 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
@Entity
@NamedQueries({
- @NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng " + "LEFT JOIN ng.mainnavi nm "
- + "WHERE nm.deleted = false " + "AND ng.level_id <= :level_id " + "AND nm.level_id <= :level_id "
- + "AND ng.deleted = false " + "order by ng.naviorder, nm.naviorder"),
- @NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.global_id = :global_id") })
+ @NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng LEFT JOIN ng.mainnavi nm "
+ + "WHERE nm.deleted = false AND ng.level_id <= :level_id AND nm.level_id <= :level_id "
+ + "AND ng.deleted = false order by ng.naviorder, nm.naviorder"),
+ @NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.id = :id") })
@Table(name = "naviglobal")
-public class Naviglobal implements Serializable {
+public class Naviglobal implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
- private static final long serialVersionUID = 515828033813767719L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long global_id;
+ private Long id;
@Column(name = "name")
private String name;
@@ -104,6 +104,14 @@ public class Naviglobal implements Seria
@Transient
private Fieldlanguagesvalues tooltip;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public String getAction() {
return action;
}
@@ -120,14 +128,6 @@ public class Naviglobal implements Seria
this.comment = comment;
}
- public Long getGlobal_id() {
- return global_id;
- }
-
- public void setGlobal_id(Long global_id) {
- this.global_id = global_id;
- }
-
public String getIcon() {
return icon;
}
@@ -242,7 +242,7 @@ public class Naviglobal implements Seria
@Override
public String toString() {
- return "Naviglobal [global_id=" + global_id + ", name=" + name + ", action=" + action + ", naviorder=" + naviorder + ", deleted="
+ return "Naviglobal [id=" + id + ", name=" + name + ", action=" + action + ", naviorder=" + naviorder + ", deleted="
+ deleted + ", fieldvalues_id=" + fieldvalues_id + ", tooltip_fieldvalues_id=" + tooltip_fieldvalues_id + "]";
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.basic;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -29,17 +28,19 @@ import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
@Entity
@Table(name = "navimain")
-public class Navimain implements Serializable {
- private static final long serialVersionUID = 1691787896183701877L;
+public class Navimain implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long main_id;
-
+ private Long id;
+
@Column(name = "global_id")
private Long global_id;
@@ -91,6 +92,14 @@ public class Navimain implements Seriali
@Column(name = "tooltip_fieldvalues_id")
private Long tooltip_fieldvalues_id;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public String getAction() {
return action;
}
@@ -123,14 +132,6 @@ public class Navimain implements Seriali
this.comment = comment;
}
- public Long getMain_id() {
- return main_id;
- }
-
- public void setMain_id(Long main_id) {
- this.main_id = main_id;
- }
-
public String getIcon() {
return icon;
}
@@ -237,7 +238,7 @@ public class Navimain implements Seriali
@Override
public String toString() {
- return "Navimain [main_id=" + main_id + ", global_id=" + global_id + ", name=" + name + ", action=" + action + ", params=" + params
+ return "Navimain [id=" + id + ", global_id=" + global_id + ", name=" + name + ", action=" + action + ", params=" + params
+ ", naviorder=" + naviorder + ", fieldvalues_id=" + fieldvalues_id + ", deleted=" + deleted + ", tooltip_fieldvalues_id="
+ tooltip_fieldvalues_id + "]";
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.calendar;
-import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -40,6 +39,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
@@ -57,12 +57,12 @@ import org.simpleframework.xml.Root;
+ " OR (a.end BETWEEN :starttime AND :endtime) "
+ " OR (a.start < :starttime AND a.end > :endtime) "
+ " )"
- + " AND a.owner.user_id = :userId"
+ + " AND a.owner.id = :userId"
)
, @NamedQuery(name="joinedAppointmentsInRange",
query="SELECT a FROM MeetingMember mm INNER JOIN mm.appointment a "
- + "WHERE mm.deleted = false AND mm.user.user_id <> a.owner.user_id AND mm.user.user_id = :userId "
- + " AND a.id NOT IN (SELECT a.id FROM Appointment a WHERE a.owner.user_id = :userId)"
+ + "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
+ + " AND a.id NOT IN (SELECT a.id FROM Appointment a WHERE a.owner.id = :userId)"
+ " AND mm.connectedEvent = false " //TODO review: isConnectedEvent is set for the MeetingMember if event is created from "Private Messages", it is weird
+ " AND ( "
+ " (a.start BETWEEN :starttime AND :endtime) "
@@ -74,19 +74,19 @@ import org.simpleframework.xml.Root;
query="SELECT a FROM Appointment a "
//only ReminderType simple mail is concerned!
+ "WHERE a.deleted = false AND a.reminderEmailSend = false"
- + " AND (a.remind.typId = 2 OR a.remind.typId = 3) "
+ + " AND (a.remind.id = 2 OR a.remind.id = 3) "
+ " AND ( "
+ " (a.start BETWEEN :starttime AND :endtime) "
+ " OR (a.end BETWEEN :starttime AND :endtime) "
+ " OR (a.start < :starttime AND a.end > :endtime) "
+ " )"
)
- , @NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.room.rooms_id = :room_id")
+ , @NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.room.id = :room_id")
//TODO this query returns duplicates if the user books an appointment with
//his own user as second meeting-member, swagner 19.02.2012
, @NamedQuery(name="appointmentsInRangeByUser",
query="SELECT a FROM MeetingMember mm, IN(mm.appointment) a "
- + "WHERE mm.deleted = false AND mm.user.user_id <> a.owner.user_id AND mm.user.user_id = :userId "
+ + "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
+ " AND ( "
+ " (a.start BETWEEN :starttime AND :endtime) "
+ " OR (a.end BETWEEN :starttime AND :endtime) "
@@ -95,7 +95,7 @@ import org.simpleframework.xml.Root;
)
, @NamedQuery(name="appointedRoomsInRangeByUser",
query="SELECT a.room FROM MeetingMember mm, IN(mm.appointment) a "
- + "WHERE mm.deleted <> true AND mm.user.user_id <> a.owner.user_id AND mm.user.user_id = :userId "
+ + "WHERE mm.deleted <> true AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
+ " AND ( "
+ " (a.start BETWEEN :starttime AND :endtime) "
+ " OR (a.end BETWEEN :starttime AND :endtime) "
@@ -104,8 +104,8 @@ import org.simpleframework.xml.Root;
)
})
@Root(name="appointment")
-public class Appointment implements Serializable {
- private static final long serialVersionUID = 2016808778885761525L;
+public class Appointment implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.calendar;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -33,16 +32,17 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.user.User;
@Entity
@Table(name = "appointmentcategory")
-public class AppointmentCategory implements Serializable {
- private static final long serialVersionUID = 595713649933692774L;
+public class AppointmentCategory implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private Long categoryId;
+ private Long id;
@Column(name="name")
private String name;
@@ -65,11 +65,11 @@ public class AppointmentCategory impleme
@Column(name="comment_field", length=2048)
private String comment;
- public Long getCategoryId() {
- return categoryId;
+ public Long getId() {
+ return id;
}
- public void setCategoryId(Long categoryId) {
- this.categoryId = categoryId;
+ public void setId(Long id) {
+ this.id = id;
}
public String getName() {
@@ -113,6 +113,4 @@ public class AppointmentCategory impleme
public void setComment(String comment) {
this.comment = comment;
}
-
-
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.calendar;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -33,6 +32,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
@@ -40,12 +40,12 @@ import org.simpleframework.xml.Element;
@Entity
@Table(name = "appointmentremindertyps")
-public class AppointmentReminderTyps implements Serializable {
- private static final long serialVersionUID = -6543593995706839669L;
+public class AppointmentReminderTyps implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private Long typId;
+ private Long id;
@Column(name="name")
private String name;
@@ -71,11 +71,11 @@ public class AppointmentReminderTyps imp
@Transient
private Fieldlanguagesvalues label;
- public Long getTypId() {
- return typId;
+ public Long getId() {
+ return id;
}
- public void setTypId(Long typId) {
- this.typId = typId;
+ public void setId(Long id) {
+ this.id = id;
}
public String getName() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.calendar;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.CascadeType;
@@ -35,6 +34,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
@@ -50,8 +50,8 @@ import org.simpleframework.xml.Root;
, query="SELECT mm.id FROM MeetingMember mm WHERE mm.deleted = false AND mm.appointment.id = :id")
})
@Root(name = "meetingmember")
-public class MeetingMember implements Serializable {
- private static final long serialVersionUID = -3864571325368787524L;
+public class MeetingMember implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.file;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -30,24 +29,25 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name="getAllFiles", query="SELECT c FROM FileExplorerItem c ORDER BY c.fileExplorerItemId")
- , @NamedQuery(name="getById", query="SELECT c FROM FileExplorerItem c WHERE c.fileExplorerItemId = :fileExplorerItemId")
- , @NamedQuery(name="getByHash", query="SELECT c FROM FileExplorerItem c WHERE c.fileHash = :fileHash")
+ @NamedQuery(name="getAllFiles", query="SELECT c FROM FileExplorerItem c ORDER BY c.id")
+ , @NamedQuery(name="getFileById", query="SELECT c FROM FileExplorerItem c WHERE c.id = :id")
+ , @NamedQuery(name="getFileByHash", query="SELECT c FROM FileExplorerItem c WHERE c.fileHash = :fileHash")
})
@Table(name = "fileexploreritem")
@Root
-public class FileExplorerItem implements Serializable {
- private static final long serialVersionUID = 242843782142620566L;
+public class FileExplorerItem implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- @Element(data=true)
- private long fileExplorerItemId;
+ @Column(name = "id")
+ @Element(data = true, name = "fileExplorerItemId")
+ private Long id;
@Column(name="filename")
@Element(data=true, required = false)
@@ -137,11 +137,11 @@ public class FileExplorerItem implements
private String externalType;
- public long getFileExplorerItemId() {
- return fileExplorerItemId;
+ public Long getId() {
+ return id;
}
- public void setFileExplorerItemId(long fileExplorerItemId) {
- this.fileExplorerItemId = fileExplorerItemId;
+ public void setId(Long id) {
+ this.id = id;
}
public String getFileName() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.label;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -35,13 +34,14 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
@Entity
@Table(name = "fieldlanguage")
-public class FieldLanguage implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = 3501643212388395425L;
+public class FieldLanguage implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@Column(name="id")
- private Long language_id;
+ private Long id;
@Column(name="name")
private String name;
@@ -65,11 +65,11 @@ public class FieldLanguage implements Se
@JoinColumn(name = "language_id", insertable = true, updatable = true)
private Collection<Fieldlanguagesvalues> languageValues;
- public Long getLanguage_id() {
- return language_id;
+ public Long getId() {
+ return id;
}
- public void setLanguage_id(Long language_id) {
- this.language_id = language_id;
+ public void setId(Long id) {
+ this.id = id;
}
public String getName() {
@@ -126,14 +126,14 @@ public class FieldLanguage implements Se
Collection<Fieldlanguagesvalues> langVals = getLanguageValues();
Map<Long, Fieldlanguagesvalues> result = new Hashtable<Long, Fieldlanguagesvalues>(langVals.size());
for (Fieldlanguagesvalues flv : langVals) {
- result.put(flv.getFieldvalues().getFieldvalues_id(), flv);
+ result.put(flv.getFieldvalues().getId(), flv);
}
return result;
}
@Override
public String toString() {
- return "FieldLanguage [id=" + language_id + ", name=" + name + ", deleted=" + deleted + ", rtl=" + rtl + ", code=" + code
+ return "FieldLanguage [id=" + id + ", name=" + name + ", deleted=" + deleted + ", rtl=" + rtl + ", code=" + code
+ "]";
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.label;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -42,27 +41,27 @@ import org.apache.openmeetings.db.entity
@NamedQuery(name = "allFieldLanguageValues", query = "SELECT flv FROM Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
- + " AND flv.language_id = :language_id ORDER BY flv.fieldvalues.fieldvalues_id ASC")
- , @NamedQuery(name="allFieldValuesIds", query = "SELECT flv.fieldvalues.fieldvalues_id FROM Fieldlanguagesvalues flv "
+ + " AND flv.language_id = :language_id ORDER BY flv.fieldvalues.id ASC")
+ , @NamedQuery(name="allFieldValuesIds", query = "SELECT flv.fieldvalues.id FROM Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
+ " AND flv.language_id = :language_id")
, @NamedQuery(name="allNotTranslatedValues", query = "SELECT flv FROM Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
- + " AND flv.language_id = 1 AND flv.fieldvalues.fieldvalues_id NOT IN (:id_list)")
+ + " AND flv.language_id = 1 AND flv.fieldvalues.id NOT IN (:id_list)")
, @NamedQuery(name="getFieldLanguagesValuesById"
- , query = "SELECT f FROM Fieldlanguagesvalues f WHERE f.fieldlanguagesvalues_id = :id")
+ , query = "SELECT f FROM Fieldlanguagesvalues f WHERE f.id = :id")
, @NamedQuery(name="getFieldLanguagesValuesByValueAndLang"
- , query = "SELECT f FROM Fieldlanguagesvalues f WHERE f.fieldvalues.fieldvalues_id = :fieldValuesId AND f.language_id = :lang AND f.deleted = false")
+ , query = "SELECT f FROM Fieldlanguagesvalues f WHERE f.fieldvalues.id = :fieldValuesId AND f.language_id = :lang AND f.deleted = false")
})
@Table(name = "fieldlanguagesvalues")
-public class Fieldlanguagesvalues implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = 1965055047163639210L;
+public class Fieldlanguagesvalues implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private Long fieldlanguagesvalues_id;
+ private Long id;
@Column(name="language_id")
private Long language_id;
@@ -89,11 +88,11 @@ public class Fieldlanguagesvalues implem
super();
}
- public Long getFieldlanguagesvalues_id() {
- return fieldlanguagesvalues_id;
+ public Long getId() {
+ return id;
}
- public void setFieldlanguagesvalues_id(Long fieldlanguagesvalues_id) {
- this.fieldlanguagesvalues_id = fieldlanguagesvalues_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.label;
-import java.io.Serializable;
import java.util.Date;
import java.util.Set;
@@ -39,16 +38,15 @@ import org.apache.openmeetings.db.entity
@NamedQueries({
@NamedQuery(name = "getFieldCount", query = "SELECT COUNT(fv) FROM Fieldvalues fv WHERE fv.deleted = false ")
, @NamedQuery(name = "getFieldByIdAndLanguage", query = "SELECT fv FROM Fieldvalues fv " +
- "LEFT OUTER JOIN FETCH fv.fieldlanguagesvalues WHERE " +
- "fv.fieldvalues_id = :id AND fv.deleted = false")
+ "LEFT OUTER JOIN FETCH fv.fieldlanguagesvalues WHERE fv.id = :id AND fv.deleted = false")
, @NamedQuery(name = "getFieldByLanguage", query = "SELECT fv FROM Fieldvalues fv WHERE fv.deleted = false") //FIXME no language yet
})
@Table(name = "fieldvalues")
-public class Fieldvalues implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = -3439614511218028085L;
+public class Fieldvalues implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@Column(name="id")
- private Long fieldvalues_id;
+ private Long id;
@Column(name="name")
private String name;
@@ -73,11 +71,11 @@ public class Fieldvalues implements Seri
super();
}
- public Long getFieldvalues_id() {
- return fieldvalues_id;
+ public Long getId() {
+ return id;
}
- public void setFieldvalues_id(Long fieldvalues_id) {
- this.fieldvalues_id = fieldvalues_id;
+ public void setId(Long id) {
+ this.id = id;
}
public String getName() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.log;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -32,17 +31,16 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-
-
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
@Table(name = "conferencelog")
-public class ConferenceLog implements Serializable {
- private static final long serialVersionUID = 147341496943518159L;
+public class ConferenceLog implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private long conferenceLogId;
+ private Long id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="conferencelogtype_id", updatable=true, insertable=true)
@@ -86,11 +84,11 @@ public class ConferenceLog implements Se
@Column(name="lastname")
private String lastname;
- public long getConferenceLogId() {
- return conferenceLogId;
+ public Long getId() {
+ return id;
}
- public void setConferenceLogId(long conferenceLogId) {
- this.conferenceLogId = conferenceLogId;
+ public void setId(Long id) {
+ this.id = id;
}
public ConferenceLogType getConferenceLogType() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.log;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -30,18 +29,20 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
@Entity
@NamedQueries({
@NamedQuery(name = "getConferenceLogTypeByEventName", query = "select a from ConferenceLogType a " +
"WHERE a.eventType = :eventType")
})
@Table(name = "conferencelogtype")
-public class ConferenceLogType implements Serializable {
- private static final long serialVersionUID = 4388958579350356294L;
+public class ConferenceLogType implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private long conferenceLogTypeId;
+ private Long id;
@Column(name="eventtype")
private String eventType;
@@ -52,11 +53,11 @@ public class ConferenceLogType implement
@Column(name="insertedby")
private long insertedby;
- public long getConferenceLogTypeId() {
- return conferenceLogTypeId;
+ public Long getId() {
+ return id;
}
- public void setConferenceLogTypeId(long conferenceLogTypeId) {
- this.conferenceLogTypeId = conferenceLogTypeId;
+ public void setId(Long id) {
+ this.id = id;
}
public String getEventType() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.record;
-import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -42,6 +41,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
@@ -65,11 +65,11 @@ import org.simpleframework.xml.Root;
*/
@Entity
@NamedQueries({
- @NamedQuery(name = "getRecordingById", query = "SELECT f FROM FlvRecording f WHERE f.flvRecordingId = :id")
+ @NamedQuery(name = "getRecordingById", query = "SELECT f FROM FlvRecording f WHERE f.id = :id")
, @NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM FlvRecording f WHERE f.fileHash = :fileHash")
, @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT NEW org.apache.openmeetings.db.dto.file.RecordingObject(c) "
+ "FROM FlvRecording c, User u "
- + "WHERE c.insertedBy = u.user_id AND u.externalUserId = :externalUserId AND u.externalUserType = :externalUserType "
+ + "WHERE c.insertedBy = u.id AND u.externalUserId = :externalUserId AND u.externalUserType = :externalUserType "
+ "AND c.deleted = false")
, @NamedQuery(name = "getRecordingsPublic", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.ownerId IS NULL "
+ "AND f.organization_id IS NULL AND (f.parentFileExplorerItemId IS NULL OR f.parentFileExplorerItemId = 0) "
@@ -86,8 +86,8 @@ import org.simpleframework.xml.Root;
@Root(name = "flvrecording")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
-public class FlvRecording implements Serializable {
- private static final long serialVersionUID = -2234874663310617072L;
+public class FlvRecording implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@XmlType(namespace="org.apache.openmeetings.record")
public enum Status {
@@ -99,8 +99,8 @@ public class FlvRecording implements Ser
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- @Element(data = true)
- private long flvRecordingId;
+ @Element(data = true, name = "flvRecordingId")
+ private Long id;
@Column(name = "filename")
@Element(data = true, required = false)
@@ -232,12 +232,12 @@ public class FlvRecording implements Ser
@Transient
private List<FlvRecordingLog> flvRecordingLog;
- public long getFlvRecordingId() {
- return flvRecordingId;
+ public Long getId() {
+ return id;
}
- public void setFlvRecordingId(long flvRecordingId) {
- this.flvRecordingId = flvRecordingId;
+ public void setId(Long id) {
+ this.id = id;
}
public String getFileName() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.record;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -33,18 +32,20 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
@NamedQueries({
- @NamedQuery(name = "getRecordingLogsByRecording", query = "SELECT fl FROM FlvRecordingLog fl WHERE fl.flvRecording.flvRecordingId = :recId")
- , @NamedQuery(name = "countErrorRecordingLogsByRecording", query = "SELECT COUNT(fl) FROM FlvRecordingLog fl WHERE fl.flvRecording.flvRecordingId = :recId AND fl.exitValue <> '0'")
+ @NamedQuery(name = "getRecordingLogsByRecording", query = "SELECT fl FROM FlvRecordingLog fl WHERE fl.flvRecording.id = :recId")
+ , @NamedQuery(name = "countErrorRecordingLogsByRecording", query = "SELECT COUNT(fl) FROM FlvRecordingLog fl WHERE fl.flvRecording.id = :recId AND fl.exitValue <> '0'")
})
@Table(name = "flvrecording_log")
-public class FlvRecordingLog implements Serializable {
- private static final long serialVersionUID = -2577533628675416706L;
+public class FlvRecordingLog implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private long flvRecordingLogId;
+ private Long id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="flvrecording_id", nullable=true)
@@ -63,11 +64,11 @@ public class FlvRecordingLog implements
@Column(name="exit_value")
private String exitValue;
- public long getFlvRecordingLogId() {
- return flvRecordingLogId;
+ public Long getId() {
+ return id;
}
- public void setFlvRecordingLogId(long flvRecordingLogId) {
- this.flvRecordingLogId = flvRecordingLogId;
+ public void setId(Long id) {
+ this.id = id;
}
public FlvRecording getFlvRecording() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.record;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -35,6 +34,7 @@ import javax.persistence.Table;
import javax.xml.bind.annotation.XmlType;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -50,7 +50,7 @@ import org.simpleframework.xml.Root;
@Entity
@Table(name = "flvrecording_metadata")
@Root(name = "flvrecordingmetadata")
-public class FlvRecordingMetaData implements Serializable {
+public class FlvRecordingMetaData implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@XmlType(namespace="org.apache.openmeetings.record.meta")
public enum Status {
@@ -63,8 +63,8 @@ public class FlvRecordingMetaData implem
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- @Element(data = true, required = false)
- private long flvRecordingMetaDataId;
+ @Element(data = true, required = false, name = "flvRecordingMetaDataId")
+ private Long id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "flvrecording_id", nullable = true)
@@ -142,12 +142,12 @@ public class FlvRecordingMetaData implem
@Enumerated(EnumType.STRING)
private Status streamStatus = Status.NONE;
- public long getFlvRecordingMetaDataId() {
- return flvRecordingMetaDataId;
+ public Long getId() {
+ return id;
}
- public void setFlvRecordingMetaDataId(long flvRecordingMetaDataId) {
- this.flvRecordingMetaDataId = flvRecordingMetaDataId;
+ public void setId(Long id) {
+ this.id = id;
}
public FlvRecording getFlvRecording() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.record;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -27,18 +26,20 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
/**
*
*
*/
@Entity
@Table(name = "flvrecording_meta_delta")
-public class FlvRecordingMetaDelta implements Serializable {
- private static final long serialVersionUID = -733483974696234137L;
+public class FlvRecordingMetaDelta implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private long flvRecordingMetaDeltaId;
+ private Long id;
@Column(name="flvrecording_metadata_id")
private Long flvRecordingMetaDataId;
@@ -91,11 +92,11 @@ public class FlvRecordingMetaDelta imple
@Column(name="debug_status")
private String debugStatus;
- public long getFlvRecordingMetaDeltaId() {
- return flvRecordingMetaDeltaId;
+ public Long getId() {
+ return id;
}
- public void setFlvRecordingMetaDeltaId(long flvRecordingMetaDeltaId) {
- this.flvRecordingMetaDeltaId = flvRecordingMetaDeltaId;
+ public void setId(Long id) {
+ this.id = id;
}
public Long getFlvRecordingMetaDataId() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.room;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -67,13 +66,13 @@ import org.apache.openmeetings.util.Cale
@Table(name = "client")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
-public class Client implements IDataProviderEntity, Serializable {
- private static final long serialVersionUID = -5980636447877077730L;
+public class Client implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private long id;
+ private Long id;
/**
* @see Client#getUsername()
@@ -431,11 +430,11 @@ public class Client implements IDataProv
this.lastname = lastname;
}
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.room;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.CascadeType;
@@ -37,6 +36,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.user.User;
@@ -50,7 +50,7 @@ import org.apache.openmeetings.db.entity
+ "WHERE i.appointment.id = :appointmentId ")
})
@Table(name = "invitations")
-public class Invitation implements Serializable {
+public class Invitation implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
public enum MessageType {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java Mon Jun 23 08:47:06 2014
@@ -31,20 +31,22 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.label.Fieldvalues;
@Entity
@NamedQueries({
@NamedQuery(name = "getPollTypes", query = "SELECT pt FROM PollType pt"),
- @NamedQuery(name = "getPollType", query = "SELECT pt FROM PollType pt " +
- "WHERE pt.pollTypesId = :pollTypesId")
+ @NamedQuery(name = "getPollType", query = "SELECT pt FROM PollType pt WHERE pt.id = :pollTypesId")
})
@Table(name = "poll_types")
-public class PollType {
+public class PollType implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long pollTypesId;
+ private Long id;
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "fieldvalues_id")
@@ -57,14 +59,14 @@ public class PollType {
/**
* @return the pollTypesId
*/
- public Long getPollTypesId() {
- return pollTypesId;
+ public Long getId() {
+ return id;
}
/**
- * @param pollTypesId the pollTypesId to set
+ * @param id the pollTypesId to set
*/
- public void setPollTypesId(Long pollTypesId) {
- this.pollTypesId = pollTypesId;
+ public void setId(Long id) {
+ this.id = id;
}
/**
* @return the isNumericAnswer
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.room;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -64,32 +63,32 @@ import org.simpleframework.xml.Root;
+ "AND c.roomtype.roomtypes_id = :roomtypesId "
+ "AND c.deleted <> :deleted"),
- @NamedQuery(name = "selectMaxFromRooms", query = "select count(c.rooms_id) from Room c "
+ @NamedQuery(name = "selectMaxFromRooms", query = "select count(c.id) from Room c "
+ "where c.deleted <> true AND c.name LIKE :search "),
@NamedQuery(name = "getRoomByExternalId", query = "select c from Room as c JOIN c.roomtype as rt "
+ "where c.externalRoomId = :externalRoomId AND c.externalRoomType = :externalRoomType "
+ "AND rt.roomtypes_id = :roomtypes_id AND c.deleted <> :deleted"),
@NamedQuery(name = "getPublicRoomsOrdered", query = "SELECT r from Room r WHERE r.ispublic= true AND r.deleted= false AND r.appointment = false ORDER BY r.name ASC"),
- @NamedQuery(name = "getRoomById", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.rooms_id = :id"),
- @NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.rooms_id FROM Room r WHERE r.deleted = false AND r.sipEnabled = true AND r.rooms_id IN :ids"),
+ @NamedQuery(name = "getRoomById", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.id = :id"),
+ @NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.id FROM Room r WHERE r.deleted = false AND r.sipEnabled = true AND r.id IN :ids"),
@NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Room r WHERE r.deleted = false"),
- @NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r ORDER BY r.rooms_id"),
- @NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT SUM(r.numberOfPartizipants) FROM Room r WHERE r.deleted = false AND r.rooms_id IN :ids")
+ @NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r ORDER BY r.id"),
+ @NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT SUM(r.numberOfPartizipants) FROM Room r WHERE r.deleted = false AND r.id IN :ids")
, @NamedQuery(name = "getOrganisationRooms", query = "SELECT DISTINCT c.room FROM RoomOrganisation c LEFT JOIN FETCH c.room "
- + "WHERE c.organisation.organisation_id = :orgId AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false "
+ + "WHERE c.organisation.id = :orgId AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false "
+ "AND c.organisation.deleted = false ORDER BY c.room.name ASC")
})
@Table(name = "room")
@Root(name = "room")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
-public class Room implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = -2860312283159251568L;
+public class Room implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@Element(data = true, required=false)
- private Long rooms_id;
+ private Long id;
@Column(name = "name")
@Element(data = true, required=false)
@@ -278,12 +277,12 @@ public class Room implements Serializabl
this.name = name;
}
- public Long getRooms_id() {
- return rooms_id;
+ public Long getId() {
+ return id;
}
- public void setRooms_id(Long rooms_id) {
- this.rooms_id = rooms_id;
+ public void setId(Long id) {
+ this.id = id;
}
public RoomType getRoomtype() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java Mon Jun 23 08:47:06 2014
@@ -44,14 +44,12 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getRoomModeratorsByIds", query = "select c from RoomModerator as c where c.roomModeratorsId IN :ids"),
@NamedQuery(name = "getRoomModeratorByRoomId", query = "select c from RoomModerator as c where c.roomId = :roomId AND c.deleted = false"),
@NamedQuery(name = "getRoomModeratorByUserAndRoomId", query = "select c from RoomModerator as c "
- + "where c.roomId = :roomId "
- + "AND c.deleted <> :deleted "
- + "AND c.user.user_id = :user_id")
+ + "where c.roomId = :roomId AND c.deleted false AND c.user.id = :user_id")
})
@Table(name = "rooms_moderator")
@Root(name = "room_moderator")
public class RoomModerator implements Serializable {
- private static final long serialVersionUID = 5407758673591515018L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.room;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -34,43 +33,43 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "getAllRoomsOrganisations", query = "select ro from RoomOrganisation ro ORDER BY ro.rooms_organisation_id"),
+ @NamedQuery(name = "getAllRoomsOrganisations", query = "select ro from RoomOrganisation ro ORDER BY ro.id"),
@NamedQuery(name = "getRoomsOrganisationByOrganisationIdAndRoomType", query = "select c from RoomOrganisation as c "
- + "where c.room.roomtypes_id = :roomtypes_id "
- + "AND c.organisation.organisation_id = :organisation_id "
+ + "where c.room.roomtypes_id = :roomtypes_id AND c.organisation.id = :organisation_id "
+ "AND c.deleted <> :deleted"),
@NamedQuery(name = "getRoomsOrganisationByOrganisationId", query = "SELECT c FROM RoomOrganisation c "
+ "LEFT JOIN FETCH c.room "
- + "WHERE c.organisation.organisation_id = :organisation_id "
+ + "WHERE c.organisation.id = :organisation_id "
+ "AND c.deleted <> :deleted AND c.room.deleted <> :deleted AND c.room.appointment = false "
+ "AND c.organisation.deleted <> :deleted "
+ "ORDER BY c.room.name ASC"),
@NamedQuery(name = "selectMaxFromRoomsByOrganisation", query = "select c from Rooms_Organisation as c "
- + "where c.organisation.organisation_id = :organisation_id "
+ + "where c.organisation.id = :organisation_id "
+ "AND c.deleted <> :deleted"),
@NamedQuery(name = "getRoomsOrganisationByOrganisationIdAndRoomId", query = "select c from RoomOrganisation as c "
- + "where c.room.rooms_id = :rooms_id "
- + "AND c.organisation.organisation_id = :organisation_id "
+ + "where c.room.id = :rooms_id "
+ + "AND c.organisation.id = :organisation_id "
+ "AND c.deleted <> :deleted"),
@NamedQuery(name = "getRoomsOrganisationByRoomsId", query = "select c from RoomOrganisation as c "
- + "where c.room.rooms_id = :rooms_id "
+ + "where c.room.id = :rooms_id "
+ "AND c.deleted <> :deleted")
})
@Table(name = "rooms_organisation")
@Root(name="room_organisation")
-public class RoomOrganisation implements Serializable {
- private static final long serialVersionUID = 4153935045968138984L;
+public class RoomOrganisation implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- @Element(data=true)
- private Long rooms_organisation_id;
+ @Column(name = "id")
+ @Element(data = true, name = "rooms_organisation_id")
+ private Long id;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name="rooms_id", nullable=true)
@@ -115,11 +114,11 @@ public class RoomOrganisation implements
this.room = room;
}
- public Long getRooms_organisation_id() {
- return rooms_organisation_id;
+ public Long getId() {
+ return id;
}
- public void setRooms_organisation_id(Long rooms_organisation_id) {
- this.rooms_organisation_id = rooms_organisation_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Mon Jun 23 08:47:06 2014
@@ -45,15 +45,15 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET rp.archived = :archived " +
- "WHERE rp.room.rooms_id = :rooms_id"),
+ "WHERE rp.room.id = :rooms_id"),
@NamedQuery(name = "deletePoll", query = "DELETE FROM RoomPoll rp WHERE rp.roomPollId = :roomPollId"),
@NamedQuery(name = "getPoll", query = "SELECT rp FROM RoomPoll rp " +
- "WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived"),
+ "WHERE rp.room.id = :room_id AND rp.archived = :archived"),
@NamedQuery(name = "getPollListBackup", query = "SELECT rp FROM RoomPoll rp ORDER BY rp.roomPollId"),
@NamedQuery(name = "getArchivedPollList", query = "SELECT rp FROM RoomPoll rp " +
- "WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived"),
+ "WHERE rp.room.id = :room_id AND rp.archived = :archived"),
@NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp " +
- "WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived")
+ "WHERE rp.room.id = :room_id AND rp.archived = :archived")
})
@Table(name = "room_polls")
@Root(name="roompoll")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java Mon Jun 23 08:47:06 2014
@@ -39,9 +39,8 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswers rpa "
- + "WHERE rpa.roomPoll.room.rooms_id = :room_id " +
- "AND rpa.votedUser.user_id = :userid AND rpa.roomPoll.archived = :archived")
+ @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswers rpa WHERE rpa.roomPoll.room.id = :room_id " +
+ "AND rpa.votedUser.id = :userid AND rpa.roomPoll.archived = :archived")
})
@Table(name = "room_poll_answers")
@Root(name="roompollanswer")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java Mon Jun 23 08:47:06 2014
@@ -42,7 +42,7 @@ import org.simpleframework.xml.Element;
})
@Table(name = "roomtype")
public class RoomType implements Serializable {
- private static final long serialVersionUID = -4441029424324591356L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java Mon Jun 23 08:47:06 2014
@@ -31,15 +31,17 @@ import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
@Table(name = "whiteboard")
-public class Whiteboard {
+public class Whiteboard implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private long id;
+ private Long id;
@Column(name = "room_id")
private Integer roomId = 0;
@@ -64,11 +66,11 @@ public class Whiteboard {
@ForeignKey(enabled = true)
private Collection<WhiteboardItem> roomItems;
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java Mon Jun 23 08:47:06 2014
@@ -25,14 +25,17 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
@Entity
@Table(name = "whiteboard_item")
-public class WhiteboardItem {
-
+public class WhiteboardItem implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private long id;
+ private Long id;
@Column(name = "keyx")
private String key;
@@ -40,11 +43,11 @@ public class WhiteboardItem {
@Column(name = "value")
private String value;
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.server;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -43,16 +42,16 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name="getNondeletedLdapConfigs", query="SELECT u FROM LdapConfig u WHERE u.deleted = false")
- , @NamedQuery(name="getActiveLdapConfigs", query="SELECT c FROM LdapConfig c WHERE c.deleted = false AND c.isActive = :isActive ORDER BY c.ldapConfigId")
+ , @NamedQuery(name="getActiveLdapConfigs", query="SELECT c FROM LdapConfig c WHERE c.deleted = false AND c.isActive = :isActive ORDER BY c.id")
})
@Table(name = "ldapconfig")
@Root(name="ldapconfig")
-public class LdapConfig implements Serializable, IDataProviderEntity {
+public class LdapConfig implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private long ldapConfigId = 0L;
+ private Long id;
@Column(name="name")
@Element(data=true)
@@ -98,11 +97,11 @@ public class LdapConfig implements Seria
@Element(data = true, required = false)
private String comment;
- public long getLdapConfigId() {
- return ldapConfigId;
+ public Long getId() {
+ return id;
}
- public void setLdapConfigId(long ldapConfigId) {
- this.ldapConfigId = ldapConfigId;
+ public void setId(Long id) {
+ this.id = id;
}
public String getName() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java Mon Jun 23 08:47:06 2014
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.db.entity.server;
-import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -41,9 +39,9 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getAllOAuthServers", query = "SELECT s FROM OAuthServer s WHERE s.deleted = false ORDER BY s.id"),
@NamedQuery(name = "countOAuthServers", query = "select count(s) from OAuthServer s WHERE s.deleted = false") })
@Root
-public class OAuthServer implements Serializable, IDataProviderEntity {
+public class OAuthServer implements IDataProviderEntity {
- private static final long serialVersionUID = -9034438721147720175L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Mon Jun 23 08:47:06 2014
@@ -31,7 +31,7 @@ import javax.persistence.Table;
@Entity
@Table(name = "soaplogin")
public class SOAPLogin implements Serializable {
- private static final long serialVersionUID = 5101010700038221434L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.server;
-import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
@@ -59,9 +58,9 @@ import org.simpleframework.xml.Root;
@Root
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
-public class Server implements Serializable, IDataProviderEntity {
+public class Server implements IDataProviderEntity {
- private static final long serialVersionUID = -6822732074549167727L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Mon Jun 23 08:47:06 2014
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlRoot
@Table(name = "sessiondata")
@XmlRootElement
public class Sessiondata implements Serializable {
- private static final long serialVersionUID = 1928177917452866750L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java Mon Jun 23 08:47:06 2014
@@ -40,7 +40,7 @@ import org.simpleframework.xml.Root;
@Root(name="address")
public class Address implements Serializable {
- private static final long serialVersionUID = 1387576041912128161L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java Mon Jun 23 08:47:06 2014
@@ -37,7 +37,7 @@ import org.simpleframework.xml.Root;
@Table(name = "sipusers")
@Root(name="asterisksipuser")
public class AsteriskSipUser implements Serializable {
- private static final long serialVersionUID = -565831761546365623L;
+ private static final long serialVersionUID = 1L;
@XmlType(namespace="org.apache.openmeetings.user.asterisk")
public enum Type {
friend,
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.user;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -37,24 +36,24 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name="getOrganisationById",
- query="SELECT c FROM Organisation AS c WHERE c.organisation_id = :organisation_id AND c.deleted = :deleted")
+ query="SELECT c FROM Organisation AS c WHERE c.id = :organisation_id AND c.deleted = :deleted")
, @NamedQuery(name="getAnyOrganisationById",
- query="SELECT c FROM Organisation AS c WHERE c.organisation_id = :organisation_id")
+ query="SELECT c FROM Organisation AS c WHERE c.id = :organisation_id")
, @NamedQuery(name="getOrganisationsByUserId",
- query="SELECT ou.organisation FROM User u, IN(u.organisation_users) ou WHERE u.deleted = false AND u.user_id = :user_id")
- , @NamedQuery(name="getNondeletedOrganisations", query="SELECT o FROM Organisation o WHERE o.deleted = false ORDER BY o.organisation_id")
+ query="SELECT ou.organisation FROM User u, IN(u.organisation_users) ou WHERE u.deleted = false AND u.id = :user_id")
+ , @NamedQuery(name="getNondeletedOrganisations", query="SELECT o FROM Organisation o WHERE o.deleted = false ORDER BY o.id")
, @NamedQuery(name="countOrganisations", query="SELECT COUNT(c) FROM Organisation AS c WHERE c.deleted = false")
})
@Table(name = "organisation")
@Root(name="organisation")
-public class Organisation implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = 99123580264065654L;
+public class Organisation implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- @Element(data=true)
- private Long organisation_id;
+ @Column(name = "id")
+ @Element(data = true, name = "organisation_id")
+ private Long id;
@Column(name="name")
@Element(data=true)
@@ -91,11 +90,11 @@ public class Organisation implements Ser
this.name = name;
}
- public Long getOrganisation_id() {
- return organisation_id;
+ public Long getId() {
+ return id;
}
- public void setOrganisation_id(Long organisation_id) {
- this.organisation_id = organisation_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Long getUpdatedby() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.user;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -40,20 +39,20 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name="deleteUsersFromOrganisation", query="DELETE FROM Organisation_Users c WHERE c.organisation.organisation_id = :id")
- , @NamedQuery(name="countOrganisationUsers", query="SELECT COUNT(c) FROM Organisation_Users c WHERE c.organisation.organisation_id = :id")
+ @NamedQuery(name="deleteUsersFromOrganisation", query="DELETE FROM Organisation_Users c WHERE c.organisation.id = :id")
+ , @NamedQuery(name="countOrganisationUsers", query="SELECT COUNT(c) FROM Organisation_Users c WHERE c.organisation.id = :id")
, @NamedQuery(name="getOrganisationUsersById", query="SELECT c FROM Organisation_Users c WHERE c.organisation_users_id = :id")
- , @NamedQuery(name="getOrganisationUsersByOrgId", query="SELECT c FROM Organisation_Users c WHERE c.organisation.organisation_id = :id")
- , @NamedQuery(name="isUserInOrganization", query="SELECT c FROM Organisation_Users c WHERE c.organisation.organisation_id = :orgId AND c.user.user_id = :userId")
+ , @NamedQuery(name="getOrganisationUsersByOrgId", query="SELECT c FROM Organisation_Users c WHERE c.organisation.id = :id")
+ , @NamedQuery(name="isUserInOrganization", query="SELECT c FROM Organisation_Users c WHERE c.organisation.id = :orgId AND c.user.id = :userId")
})
@Table(name = "organisation_users")
@Root(name="user_organisation")
-public class Organisation_Users implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = 7206870465903375817L;
+public class Organisation_Users implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long organisation_users_id;
+ private Long id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "organisation_id", insertable = true, updatable = true)
@@ -95,12 +94,12 @@ public class Organisation_Users implemen
this.organisation = organisation;
}
- public Long getOrganisation_users_id() {
- return organisation_users_id;
+ public Long getId() {
+ return id;
}
- public void setOrganisation_users_id(Long organisation_users_id) {
- this.organisation_users_id = organisation_users_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
@@ -147,7 +146,7 @@ public class Organisation_Users implemen
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((organisation_users_id == null) ? 0 : organisation_users_id.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
return result;
}
@@ -160,10 +159,10 @@ public class Organisation_Users implemen
if (getClass() != obj.getClass())
return false;
Organisation_Users other = (Organisation_Users) obj;
- if (organisation_users_id == null) {
- if (other.organisation_users_id != null)
+ if (id == null) {
+ if (other.id != null)
return false;
- } else if (!organisation_users_id.equals(other.organisation_users_id))
+ } else if (!id.equals(other.id))
return false;
return true;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.user;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -49,11 +48,11 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "moveMailsToFolder", query = "UPDATE PrivateMessage c SET c.folderId = :folderId " +
"WHERE c.id IN (:ids) "),
@NamedQuery(name = "deletePrivateMessages", query = "DELETE FROM PrivateMessage c WHERE c.id IN (:ids) "),
- @NamedQuery(name = "getPrivateMessagesByRoom", query = "SELECT c FROM PrivateMessage c WHERE c.room.rooms_id = :roomId ")
+ @NamedQuery(name = "getPrivateMessagesByRoom", query = "SELECT c FROM PrivateMessage c WHERE c.room.id = :roomId ")
})
@Table(name = "private_message")
@Root(name = "privatemessage")
-public class PrivateMessage implements Serializable, IDataProviderEntity {
+public class PrivateMessage implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
public final static long INBOX_FOLDER_ID = 0;
public final static long SENT_FOLDER_ID = -1;
@@ -63,7 +62,7 @@ public class PrivateMessage implements S
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@Element(data = true, name = "privateMessageId")
- private long id;
+ private Long id;
@Column(name = "subject")
@Element(data = true, required = false)
@@ -147,11 +146,11 @@ public class PrivateMessage implements S
userContactId = copy.userContactId;
}
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.user;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -35,13 +34,13 @@ import org.simpleframework.xml.Root;
@Entity
@Table(name = "private_messages_folder")
@Root(name="privatemessagefolder")
-public class PrivateMessageFolder implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = 3689814412815025816L;
+public class PrivateMessageFolder implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- @Element(data=true)
- private long privateMessageFolderId;
+ @Column(name = "id")
+ @Element(data = true, name = "privateMessageFolderId")
+ private Long id;
@Column(name="folder_name")
@Element(data=true)
@@ -57,11 +56,11 @@ public class PrivateMessageFolder implem
@Column(name="updated")
private Date updated;
- public long getPrivateMessageFolderId() {
- return privateMessageFolderId;
+ public Long getId() {
+ return id;
}
- public void setPrivateMessageFolderId(long privateMessageFolderId) {
- this.privateMessageFolderId = privateMessageFolderId;
+ public void setId(Long id) {
+ this.id = id;
}
public String getFolderName() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java Mon Jun 23 08:47:06 2014
@@ -43,7 +43,7 @@ import org.simpleframework.xml.Root;
})
@Root
public class Salutation implements Serializable {
- private static final long serialVersionUID = -5806449519074435223L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java Mon Jun 23 08:47:06 2014
@@ -40,7 +40,7 @@ import javax.persistence.Table;
})
@Table(name = "state")
public class State implements Serializable {
- private static final long serialVersionUID = -1629546369219451403L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")