Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Fri Nov 13 01:24:41 2015 @@ -42,14 +42,13 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ @NamedQuery(name = "forceGetConfigurationByKey", query = "SELECT c FROM Configuration c " - + "WHERE c.conf_key LIKE :conf_key"), + + "WHERE c.key LIKE :key"), @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM Configuration c " - + "WHERE c.conf_key IN :conf_keys and c.deleted = false"), + + "WHERE c.key IN :keys and c.deleted = false"), @NamedQuery(name = "getNondeletedConfiguration", query = "SELECT c FROM Configuration c " + "LEFT JOIN FETCH c.user WHERE c.deleted = false"), @NamedQuery(name = "getConfigurationById", query = "SELECT c FROM Configuration c " - + "LEFT JOIN FETCH c.user " - + "WHERE c.configuration_id = :configuration_id and c.deleted = false"), + + "LEFT JOIN FETCH c.user WHERE c.id = :id and c.deleted = false"), @NamedQuery(name = "countConfigurations", query = "SELECT COUNT(c) FROM Configuration c WHERE c.deleted = false") }) @Table(name = "configuration") @@ -61,26 +60,26 @@ public class Configuration implements ID @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") @Element(name = "id", data = true) - private Long configuration_id; - - @Column(name = "conf_key", unique = true) + private Long id; + + @Column(name = "key", unique = true) @Element(name = "key", data = true, required = false) - private String conf_key; + private String key; - @Column(name = "conf_value") + @Column(name = "value") @Element(name = "value", data = true, required = false) - private String conf_value; + private String value; - @Column(name = "starttime") + @Column(name = "inserted") @Element(name = "created", data = true, required = false) - private Date starttime; + private Date inserted; - @Column(name = "updatetime") + @Column(name = "updated") @Element(name = "updated", data = true, required = false) - private Date updatetime; + private Date updated; @Lob - @Column(name = "comment_field", length = 2048) + @Column(name = "comment", length = 2048) @Element(data = true, required = false) private String comment; @@ -102,44 +101,44 @@ public class Configuration implements ID this.comment = comment; } - public String getConf_key() { - return conf_key; + public String getKey() { + return key; } - public void setConf_key(String conf_key) { - this.conf_key = conf_key; + public void setKey(String key) { + this.key = key; } - public String getConf_value() { - return conf_value; + public String getValue() { + return value; } - public void setConf_value(String conf_value) { - this.conf_value = conf_value; + public void setValue(String value) { + this.value = value; } public Long getId() { - return configuration_id; + return id; } - public void setId(Long configuration_id) { - this.configuration_id = configuration_id; + public void setId(Long id) { + this.id = id; } - public Date getStarttime() { - return starttime; + public Date getInserted() { + return inserted; } - public void setStarttime(Date starttime) { - this.starttime = starttime; + public void setInserted(Date inserted) { + this.inserted = inserted; } - public Date getUpdatetime() { - return updatetime; + public Date getUpdated() { + return updated; } - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; + public void setUpdated(Date updated) { + this.updated = updated; } public boolean isDeleted() {
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java Fri Nov 13 01:24:41 2015 @@ -37,8 +37,7 @@ import org.apache.openmeetings.db.entity @Entity @NamedQueries({ @NamedQuery(name = "getMailMessageById", query = "SELECT m FROM MailMessage m WHERE m.id = :id") - , @NamedQuery(name = "getMailMessages" - , query = "SELECT m FROM MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted") + , @NamedQuery(name = "getMailMessages", query = "SELECT m FROM MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted") , @NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM MailMessage m WHERE m.status = :status") }) @Table(name = "email_queue") Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Fri Nov 13 01:24:41 2015 @@ -61,12 +61,12 @@ import org.simpleframework.xml.Root; + " OR (a.end BETWEEN :start AND :end) " + " OR (a.start < :start AND a.end > :end) " + " )" - + " 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 :start AND :end) " @@ -85,13 +85,12 @@ import org.simpleframework.xml.Root; + " OR (a.start < :start AND a.end > :end) " + " )" ) - , @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.room.id = :roomId") , @NamedQuery(name="getAppointmentByOwnerRoomId", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.owner.id = :userId AND a.room.id = :roomId") - //TODO this query returns duplicates if the user books an appointment with - //his own user as second meeting-member, swagner 19.02.2012 + //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 :start AND :end) " + " OR (a.end BETWEEN :start AND :end) " @@ -100,15 +99,15 @@ import org.simpleframework.xml.Root; ) , @NamedQuery(name="appointedRoomsInRangeByUser", query="SELECT a.room 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 :start AND :end) " + " OR (a.end BETWEEN :start AND :end) " + " OR (a.start < :start AND a.end > :end) " + " )" ) - , @NamedQuery(name="getNextAppointment", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.start > :start AND a.owner.user_id = :userId") - , @NamedQuery(name="getAppointmentsByTitle", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.title LIKE :title AND a.owner.user_id = :userId") + , @NamedQuery(name="getNextAppointment", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.start > :start AND a.owner.id = :userId") + , @NamedQuery(name="getAppointmentsByTitle", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.title LIKE :title AND a.owner.id = :userId") }) @Root(name="appointment") public class Appointment implements IDataProviderEntity { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java Fri Nov 13 01:24:41 2015 @@ -68,13 +68,13 @@ import org.simpleframework.xml.Root; @NamedQuery(name = "getRecordingById", query = "SELECT f FROM Recording f WHERE f.id = :id") , @NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM Recording f WHERE f.fileHash = :fileHash") , @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT c FROM Recording c, User u " - + "WHERE c.insertedBy = u.user_id AND u.externalUserId = :externalUserId AND u.externalUserType = :externalUserType " + + "WHERE c.insertedBy = u.id AND u.externalId = :externalId AND u.externalType = :externalType " + "AND c.deleted = false") , @NamedQuery(name = "getRecordingsPublic", query = "SELECT f FROM Recording f WHERE f.deleted = false AND f.ownerId IS NULL " - + "AND f.organization_id IS NULL AND (f.parentItemId IS NULL OR f.parentItemId = 0) " + + "AND f.groupId IS NULL AND (f.parentItemId IS NULL OR f.parentItemId = 0) " + "ORDER BY f.type DESC, f.inserted") - , @NamedQuery(name = "getRecordingsByOrganization", query = "SELECT f FROM Recording f WHERE f.deleted = false AND f.ownerId IS NULL " - + "AND f.organization_id = :organization_id AND (f.parentItemId IS NULL OR f.parentItemId = 0) " + , @NamedQuery(name = "getRecordingsByGroup", query = "SELECT f FROM Recording f WHERE f.deleted = false AND f.ownerId IS NULL " + + "AND f.groupId = :groupId AND (f.parentItemId IS NULL OR f.parentItemId = 0) " + "ORDER BY f.type DESC, f.inserted") , @NamedQuery(name = "getRecordingsByOwner", query = "SELECT f FROM Recording f WHERE f.deleted = false AND f.ownerId = :ownerId " + "AND (f.parentItemId IS NULL OR f.parentItemId = 0) " @@ -90,8 +90,8 @@ import org.simpleframework.xml.Root; , @NamedQuery(name = "getRecordingsByParent", query = "SELECT f FROM Recording f WHERE f.deleted = false AND f.parentItemId = :parentId " + "ORDER BY f.type ASC, f.inserted") , @NamedQuery(name = "getRecordingsByExternalType", query = "SELECT rec FROM Recording rec, Room r, User u " - + "WHERE rec.deleted = false AND rec.room_id = r.rooms_id AND rec.insertedBy = u.user_id " - + "AND (r.externalRoomType = :externalType OR u.externalUserType = :externalType)") + + "WHERE rec.deleted = false AND rec.roomId = r.id AND rec.insertedBy = u.id " + + "AND (r.externalType = :externalType OR u.externalType = :externalType)") }) @Table(name = "recording") @Root(name = "flvrecording") @@ -118,7 +118,7 @@ public class Recording extends FileItem @Element(data = true, required = false) private String alternateDownload; - @Column(name = "comment_field") + @Column(name = "comment") @Element(data = true, required = false) private String comment; @@ -148,11 +148,11 @@ public class Recording extends FileItem @Column(name = "group_id") @Element(data = true, required = false) - private Long organization_id; + private Long groupId; @Column(name = "is_interview") @Element(data = true, required = false) - private Boolean isInterview; + private boolean interview; @Column(name = "progress_post_processing") @Element(data = true, required = false) @@ -226,12 +226,12 @@ public class Recording extends FileItem this.recorderStreamId = recorderStreamId; } - public Long getOrganization_id() { - return organization_id; + public Long getGroupId() { + return groupId; } - public void setOrganization_id(Long organization_id) { - this.organization_id = organization_id; + public void setGroupId(Long groupId) { + this.groupId = groupId; } public List<RecordingMetaData> getMetaData() { @@ -290,12 +290,12 @@ public class Recording extends FileItem this.log = log; } - public Boolean getIsInterview() { - return isInterview; + public boolean isInterview() { + return interview; } - public void setIsInterview(Boolean isInterview) { - this.isInterview = isInterview; + public void setInterview(boolean interview) { + this.interview = interview; } public Integer getProgressPostProcessing() { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Fri Nov 13 01:24:41 2015 @@ -59,9 +59,9 @@ import org.apache.openmeetings.util.Cale @NamedQuery(name = "getClientsByServer", query = "SELECT c FROM Client c WHERE c.server = :server"), @NamedQuery(name = "getClients", query = "SELECT c FROM Client c"), @NamedQuery(name = "getClientsWithServer", query = "SELECT c FROM Client c LEFT JOIN FETCH c.server"), - @NamedQuery(name = "getClientsByUserId", query = "SELECT c FROM Client c WHERE c.server = :server AND c.user_id = :user_id"), - @NamedQuery(name = "getClientsByRoomId", query = "SELECT c FROM Client c WHERE c.room_id = :room_id"), - @NamedQuery(name = "getRoomsIdsByServer", query = "SELECT c.room_id FROM Client c WHERE c.server = :server GROUP BY c.room_id") + @NamedQuery(name = "getClientsByUserId", query = "SELECT c FROM Client c WHERE c.server = :server AND c.userId = :userId"), + @NamedQuery(name = "getClientsByRoomId", query = "SELECT c FROM Client c WHERE c.roomId = :roomId"), + @NamedQuery(name = "getRoomsIdsByServer", query = "SELECT c.roomId FROM Client c WHERE c.server = :server GROUP BY c.roomId") }) @Table(name = "client") @XmlRootElement @@ -183,13 +183,13 @@ public class Client implements IDataProv * @see Client#isScreenClient() */ @Column(name = "is_screenclient") - private boolean isScreenClient; + private boolean screenClient; /** * @see Client#isAvClient() */ @Column(name = "is_avclient") - private boolean isAVClient; + private boolean avClient; /** * @see Client#getUsercolor() @@ -219,7 +219,7 @@ public class Client implements IDataProv * @see Client#getRoomId() */ @Column(name = "room_id") - private Long room_id; + private Long roomId; /** * @see Client#getRoomEnter() @@ -237,7 +237,7 @@ public class Client implements IDataProv * @see Client#getUserId() */ @Column(name = "user_id") - private Long user_id = null; + private Long userId = null; /** * @see Client#getFirstname() @@ -310,19 +310,19 @@ public class Client implements IDataProv * @see Client#getRecordingId() */ @Column(name = "recording_id") - private Long flvRecordingId; + private Long recordingId; /** * @see Client#getRecordingMetaDataId() */ @Column(name = "recording_metadata_id") - private Long flvRecordingMetaDataId; + private Long recordingMetaDataId; /** - * @see Client#getOrganization_id() + * @see Client#getGroupId() */ - @Column(name = "organization_id") - private Long organization_id; + @Column(name = "group_id") + private Long groupId; /** * @see Client#isStartRecording() @@ -411,18 +411,18 @@ public class Client implements IDataProv super(); this.streamid = streamid; this.publicSID = publicSID; - this.room_id = roomId; - this.user_id = userId; + this.roomId = roomId; + this.userId = userId; this.firstname = firstname; this.lastname = lastname; - this.isAVClient = avClient; + this.avClient = avClient; this.username = username; this.connectedSince = CalendarPatterns.parseDateWithHour(connectedSince); this.scope = scope; } public void setUserObject(Long userId, String username, String firstname, String lastname) { - this.user_id = userId; + this.userId = userId; this.username = username; this.firstname = firstname; this.lastname = lastname; @@ -587,19 +587,19 @@ public class Client implements IDataProv } public Long getUserId() { - return user_id; + return userId; } public void setUserId(Long userId) { - this.user_id = userId; + this.userId = userId; } public Long getRoomId() { - return room_id; + return roomId; } public void setRoomId(Long roomId) { - this.room_id = roomId; + this.roomId = roomId; } public Date getRoomEnter() { @@ -715,11 +715,11 @@ public class Client implements IDataProv } public boolean isScreenClient() { - return isScreenClient; + return screenClient; } public void setScreenClient(boolean screenClient) { - this.isScreenClient = screenClient; + this.screenClient = screenClient; } public int getVWidth() { @@ -763,19 +763,19 @@ public class Client implements IDataProv } public Long getRecordingId() { - return flvRecordingId; + return recordingId; } public void setRecordingId(Long recordingId) { - this.flvRecordingId = recordingId; + this.recordingId = recordingId; } public Long getRecordingMetaDataId() { - return flvRecordingMetaDataId; + return recordingMetaDataId; } public void setRecordingMetaDataId(Long recordingMetaDataId) { - this.flvRecordingMetaDataId = recordingMetaDataId; + this.recordingMetaDataId = recordingMetaDataId; } public boolean isScreenPublishStarted() { @@ -786,12 +786,12 @@ public class Client implements IDataProv this.screenPublishStarted = screenPublishStarted; } - public Long getOrganization_id() { - return organization_id; + public Long getGroupId() { + return groupId; } - public void setOrganization_id(Long organization_id) { - this.organization_id = organization_id; + public void setGroupId(Long groupId) { + this.groupId = groupId; } public boolean isStartRecording() { @@ -851,11 +851,11 @@ public class Client implements IDataProv } public boolean isAvClient() { - return isAVClient; + return avClient; } public void setAvClient(boolean avClient) { - this.isAVClient = avClient; + this.avClient = avClient; } public boolean isStreamPublishStarted() { @@ -892,10 +892,10 @@ public class Client implements IDataProv @Override public String toString() { - return "Client [streamid=" + streamid + ", publicSID=" + publicSID + ", isScreenClient=" + isScreenClient - + ", avClient=" + isAVClient + ", isMobile = " + mobile + ", roomId=" + room_id + ", broadCastID=" + broadCastID + ", userId=" - + user_id + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", recordingId=" - + flvRecordingId + ", recordingMetaDataId=" + flvRecordingMetaDataId + ", screenPublishStarted=" + return "Client [streamid=" + streamid + ", publicSID=" + publicSID + ", isScreenClient=" + screenClient + + ", avClient=" + avClient + ", isMobile = " + mobile + ", roomId=" + roomId + ", broadCastID=" + broadCastID + ", userId=" + + userId + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", recordingId=" + + recordingId + ", recordingMetaDataId=" + recordingMetaDataId + ", screenPublishStarted=" + screenPublishStarted + ", interviewPodId=" + interviewPodId + ", server=" + server + "]"; } } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Fri Nov 13 01:24:41 2015 @@ -62,21 +62,21 @@ import org.simpleframework.xml.Root; @NamedQuery(name = "getRoomByOwnerAndTypeId", query = "select c from Room as c where c.ownerId = :ownerId " + "AND c.type = :type AND c.deleted = false"), - @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 = false AND c.name LIKE :search "), @NamedQuery(name = "getRoomByExternalId", query = "select r from Room as r " - + "where r.externalRoomId = :externalId AND c.externalRoomType = :externalType " + + "where r.externalId = :externalId AND c.externalType = :externalType " + "AND r.type = :type AND c.deleted = false"), @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 = "getRoomsByIds", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.rooms_id IN :ids"), - @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 = "getRoomsByIds", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.id IN :ids"), + @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 = "getGroupRooms", query = "SELECT DISTINCT c.room FROM RoomGroup c LEFT JOIN FETCH c.room " - + "WHERE c.organisation.organisation_id = :orgId AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false " - + "AND c.organisation.deleted = false ORDER BY c.room.name ASC") + + "WHERE c.group.id = :groupId AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false " + + "AND c.group.deleted = false ORDER BY c.room.name ASC") }) @Table(name = "room") @Root(name = "room") @@ -132,14 +132,14 @@ public class Room implements IDataProvid @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") @Element(data = true, required = false, name = "rooms_id") - private Long rooms_id; + private Long id; @Column(name = "name") @Element(data = true, required=false) private String name; @Lob - @Column(name = "comment_field") + @Column(name = "comment") @Element(data = true, required = false) private String comment; @@ -149,10 +149,10 @@ public class Room implements IDataProvid private Type type = Type.conference; @Column(name = "inserted") - private Date starttime; + private Date inserted; @Column(name = "updated") - private Date updatetime; + private Date updated; @Column(name = "deleted") @Element(data = true) @@ -173,11 +173,11 @@ public class Room implements IDataProvid // Vars to simulate external Room @Column(name = "externalId") @Element(data = true, required = false) - private Long externalRoomId; + private Long externalId; @Column(name = "externalType") @Element(data = true, required = false) - private String externalRoomType; + private String externalType; @Column(name = "isdemoroom") @Element(data = true, required = false) @@ -191,7 +191,7 @@ public class Room implements IDataProvid // moderator to come into the room @Column(name = "ismoderatedroom") @Element(name="isModeratedRoom", data = true, required = false) - private boolean isModeratedRoom; + private boolean moderated; @Column(name = "allow_user_questions") @Element(data = true, required = false) @@ -199,7 +199,7 @@ public class Room implements IDataProvid @Column(name = "is_audio_only") @Element(name = "isAudioOnly", data = true, required = false) - private boolean isAudioOnly; + private boolean audioOnly; @Column(name = "allow_font_styles", nullable = false) @Element(data = true, required = false) @@ -207,7 +207,7 @@ public class Room implements IDataProvid @Column(name = "is_closed") @Element(data = true, required = false) - private boolean isClosed; + private boolean closed; @Column(name = "redirect_url") @Element(data = true, required = false) @@ -234,11 +234,11 @@ public class Room implements IDataProvid @Column(name = "hide_chat") @Element(name = "hideChat", data = true, required = false) - private boolean hideChat; + private boolean chatHidden; @Column(name = "hide_activities_and_actions") @Element(name = "hideActivitiesAndActions", data = true, required = false) - private boolean hideActivitiesAndActions; + private boolean activitiesHidden; @Column(name = "hide_files_explorer") @Element(data = true, required = false) @@ -320,11 +320,11 @@ public class Room implements IDataProvid } public Long getId() { - return rooms_id; + return id; } public void setId(Long id) { - this.rooms_id = id; + this.id = id; } public Type getType() { @@ -336,19 +336,19 @@ public class Room implements IDataProvid } public Date getInserted() { - return starttime; + return inserted; } public void setInserted(Date inserted) { - this.starttime = inserted; + this.inserted = inserted; } public Date getUpdated() { - return updatetime; + return updated; } public void setUpdated(Date updated) { - this.updatetime = updated; + this.updated = updated; } public boolean isDeleted() { @@ -408,27 +408,27 @@ public class Room implements IDataProvid } public boolean isModerated() { - return isModeratedRoom; + return moderated; } public void setModerated(boolean moderated) { - this.isModeratedRoom = moderated; + this.moderated = moderated; } public Long getExternalId() { - return externalRoomId; + return externalId; } public void setExternalId(Long externalId) { - this.externalRoomId = externalId; + this.externalId = externalId; } public String getExternalType() { - return externalRoomType; + return externalType; } public void setExternalType(String externalType) { - this.externalRoomType = externalType; + this.externalType = externalType; } public boolean getAllowUserQuestions() { @@ -440,11 +440,11 @@ public class Room implements IDataProvid } public boolean isAudioOnly() { - return isAudioOnly; + return audioOnly; } public void setAudioOnly(boolean audioOnly) { - this.isAudioOnly = audioOnly; + this.audioOnly = audioOnly; } public boolean getAllowFontStyles() { @@ -456,11 +456,11 @@ public class Room implements IDataProvid } public boolean isClosed() { - return isClosed; + return closed; } public void setClosed(boolean closed) { - this.isClosed = closed; + this.closed = closed; } public String getRedirectURL() { @@ -504,19 +504,19 @@ public class Room implements IDataProvid } public boolean isChatHidden() { - return hideChat; + return chatHidden; } - public void setChatHidden(boolean hideChat) { - this.hideChat = hideChat; + public void setChatHidden(boolean chatHidden) { + this.chatHidden = chatHidden; } public boolean isActivitiesHidden() { - return hideActivitiesAndActions; + return activitiesHidden; } public void setActivitiesHidden(boolean activitiesHidden) { - this.hideActivitiesAndActions = activitiesHidden; + this.activitiesHidden = activitiesHidden; } public boolean getHideFilesExplorer() { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java Fri Nov 13 01:24:41 2015 @@ -34,7 +34,7 @@ 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.apache.openmeetings.db.entity.user.Group; import org.simpleframework.xml.Element; import org.simpleframework.xml.Root; @@ -42,23 +42,23 @@ import org.simpleframework.xml.Root; @NamedQueries({ @NamedQuery(name = "getAllRoomGroups", query = "select ro from RoomGroup ro ORDER BY ro.id"), @NamedQuery(name = "getRoomGroupByGroupIdAndRoomType", query = "select c from RoomGroup as c " - + "where c.room.type = :type AND c.organisation.organisation_id = :groupId " + + "where c.room.type = :type AND c.group.id = :groupId " + "AND c.deleted = false"), @NamedQuery(name = "getRoomGroupByGroupId", query = "SELECT c FROM RoomGroup c " + "LEFT JOIN FETCH c.room " - + "WHERE c.organisation.organisation_id = :groupId " + + "WHERE c.group.id = :groupId " + "AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false " + "AND c.group.deleted = false " + "ORDER BY c.room.name ASC"), @NamedQuery(name = "selectMaxFromRoomsByGroup", query = "select c from RoomGroup as c " - + "where c.organisation.organisation_id = :groupId " + + "where c.group.id = :groupId " + "AND c.deleted = false"), @NamedQuery(name = "getRoomGroupByGroupIdAndRoomId", query = "select c from RoomGroup as c " - + "where c.room.rooms_id = :roomId " - + "AND c.organisation.organisation_id = :groupId " + + "where c.room.id = :roomId " + + "AND c.group.id = :groupId " + "AND c.deleted = false"), @NamedQuery(name = "getRoomGroupByRoomsId", query = "select c from RoomGroup as c " - + "where c.room.rooms_id = :roomId " + + "where c.room.id = :roomId " + "AND c.deleted = false") }) @Table(name = "room_group") @@ -81,7 +81,7 @@ public class RoomGroup implements IDataP @JoinColumn(name="group_id", nullable=true) @ForeignKey(enabled = true) @Element(name="organisation_id", data=true, required=false) - private Organisation organisation; + private Group group; @Column(name = "inserted") private Date inserted; @@ -93,19 +93,19 @@ public class RoomGroup implements IDataP @Element(data=true) private boolean deleted; - public RoomGroup(Organisation org, Room room) { - this.organisation = org; + public RoomGroup(Group org, Room room) { + this.group = org; this.room = room; } public RoomGroup() { } - public Organisation getOrganisation() { - return organisation; + public Group getGroup() { + return group; } - public void setOrganisation(Organisation organisation) { - this.organisation = organisation; + public void setGroup(Group group) { + this.group = group; } public Room getRoom() { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java Fri Nov 13 01:24:41 2015 @@ -40,30 +40,28 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ - @NamedQuery(name = "getRoomModeratorById", query = "select c from RoomModerator as c where c.roomModeratorsId = :roomModeratorsId"), - @NamedQuery(name = "getRoomModeratorsByIds", query = "select c from RoomModerator as c where c.roomModeratorsId IN :ids"), + @NamedQuery(name = "getRoomModeratorById", query = "select c from RoomModerator as c where c.id = :id"), + @NamedQuery(name = "getRoomModeratorsByIds", query = "select c from RoomModerator as c where c.id 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 = :userId") }) -@Table(name = "rooms_moderator") +@Table(name = "room_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) @Column(name="id") - private long roomModeratorsId; + private Long id; @Column(name = "roomId") private Long roomId; @Column(name="is_supermoderator") @Element(name="is_supermoderator", data = true) - private Boolean isSuperModerator; + private boolean superModerator; @ManyToOne(fetch = FetchType.EAGER) @JoinColumn (name="user_id") @@ -71,27 +69,27 @@ public class RoomModerator implements Se @Element(name="user_id", data = true, required=false) private User user; - @Column(name = "starttime") - private Date starttime; + @Column(name = "inserted") + private Date inserted; - @Column(name = "updatetime") - private Date updatetime; + @Column(name = "updated") + private Date updated; @Column(name = "deleted") private boolean deleted; - public long getRoomModeratorsId() { - return roomModeratorsId; + public Long getId() { + return id; } - public void setRoomModeratorsId(long roomModeratorsId) { - this.roomModeratorsId = roomModeratorsId; + public void setId(Long id) { + this.id = id; } - public Boolean getIsSuperModerator() { - return isSuperModerator; + public boolean isSuperModerator() { + return superModerator; } - public void setIsSuperModerator(Boolean isSuperModerator) { - this.isSuperModerator = isSuperModerator; + public void setSuperModerator(boolean superModerator) { + this.superModerator = superModerator; } @@ -102,21 +100,21 @@ public class RoomModerator implements Se this.user = user; } - public Date getStarttime() { - return starttime; + public Date getInserted() { + return inserted; } - public void setStarttime(Date starttime) { - this.starttime = starttime; + public void setInserted(Date inserted) { + this.inserted = inserted; } - public Date getUpdatetime() { - return updatetime; + public Date getUpdated() { + return updated; } - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; + public void setUpdated(Date updated) { + this.updated = updated; } - public boolean getDeleted() { + public boolean isDeleted() { return deleted; } public void setDeleted(boolean deleted) { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Fri Nov 13 01:24:41 2015 @@ -49,17 +49,16 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ @NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET rp.archived = :archived " - + "WHERE rp.room.rooms_id = :roomId"), + + "WHERE rp.room.id = :roomId"), @NamedQuery(name = "deletePoll", query = "DELETE FROM RoomPoll rp WHERE rp.id = :id"), @NamedQuery(name = "getPollById", query = "SELECT rp FROM RoomPoll rp WHERE rp.id = :id"), @NamedQuery(name = "getPoll", query = "SELECT rp FROM RoomPoll rp " - + "WHERE rp.room.rooms_id = :roomId AND rp.archived = false"), + + "WHERE rp.room.id = :roomId AND rp.archived = false"), @NamedQuery(name = "getPollListBackup", query = "SELECT rp FROM RoomPoll rp ORDER BY rp.id"), @NamedQuery(name = "getArchivedPollList", query = "SELECT rp FROM RoomPoll rp " - + "WHERE rp.room.rooms_id = :roomId AND rp.archived = true ORDER BY rp.created DESC"), + + "WHERE rp.room.id = :roomId AND rp.archived = true ORDER BY rp.created DESC"), @NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp " - + "WHERE rp.room.rooms_id = :roomId AND rp.archived = :archived") -}) + + "WHERE rp.room.id = :roomId AND rp.archived = :archived") }) @Table(name = "room_poll") @Root(name = "roompoll") public class RoomPoll implements IDataProviderEntity { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java Fri Nov 13 01:24:41 2015 @@ -40,8 +40,8 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ - @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswer rpa WHERE rpa.roomPoll.room.rooms_id = :roomId " - + "AND rpa.votedUser.user_id = :userId AND rpa.roomPoll.archived = false") + @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswer rpa WHERE rpa.roomPoll.room.id = :roomId " + + "AND rpa.votedUser.id = :userId AND rpa.roomPoll.archived = false") }) @Table(name = "room_poll_answer") @Root(name="roompollanswer") Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java Fri Nov 13 01:24:41 2015 @@ -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/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java Fri Nov 13 01:24:41 2015 @@ -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/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java Fri Nov 13 01:24:41 2015 @@ -95,7 +95,7 @@ public class LdapConfig implements IData private boolean deleted; @Lob - @Column(name = "comment_field", length = 2048) + @Column(name = "comment", length = 2048) @Element(data = true, required = false) private String comment; Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Fri Nov 13 01:24:41 2015 @@ -35,13 +35,13 @@ public class SOAPLogin implements Serial @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name="id") - private long soapLoginId; + private Long id; @Column(name="hash") private String hash; @Column(name="room_id") - private Long room_id; + private Long roomId; @Column(name="session_hash") private String sessionHash; @@ -71,7 +71,7 @@ public class SOAPLogin implements Serial private String clientURL; @Column(name="recording_id") - private Long roomRecordingId; + private Long recordingId; @Column(name="landing_zone") private String landingZone; @@ -79,11 +79,11 @@ public class SOAPLogin implements Serial @Column(name="allow_recording") private boolean allowRecording; - public long getSoapLoginId() { - return soapLoginId; + public Long getId() { + return id; } - public void setSoapLoginId(long soapLoginId) { - this.soapLoginId = soapLoginId; + public void setId(Long id) { + this.id = id; } public String getHash() { @@ -94,10 +94,10 @@ public class SOAPLogin implements Serial } public Long getRoomId() { - return room_id; + return roomId; } public void setRoomId(Long roomId) { - this.room_id = roomId; + this.roomId = roomId; } public String getSessionHash() { @@ -114,7 +114,7 @@ public class SOAPLogin implements Serial this.created = created; } - public boolean getUsed() { + public boolean isUsed() { return used; } public void setUsed(boolean used) { @@ -128,7 +128,7 @@ public class SOAPLogin implements Serial this.useDate = useDate; } - public boolean getBecomemoderator() { + public boolean isBecomemoderator() { return becomemoderator; } public void setBecomemoderator(boolean becomemoderator) { @@ -164,10 +164,10 @@ public class SOAPLogin implements Serial } public Long getRecordingId() { - return roomRecordingId; + return recordingId; } public void setRecordingId(Long recordingId) { - this.roomRecordingId = recordingId; + this.recordingId = recordingId; } public String getLandingZone() { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Fri Nov 13 01:24:41 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.server; -import java.io.Serializable; import java.util.Calendar; import java.util.Date; @@ -34,6 +33,9 @@ import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; import org.apache.openjpa.persistence.jdbc.ForeignKey; import org.apache.openmeetings.db.entity.IDataProviderEntity; @@ -54,7 +56,9 @@ import org.simpleframework.xml.Root; }) @Table(name = "server") @Root -public class Server implements Serializable, IDataProviderEntity { +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class Server implements IDataProviderEntity { private static final long serialVersionUID = 1L; @@ -89,7 +93,7 @@ public class Server implements Serializa public User updatedby; @Lob - @Column(name = "comment_field", length = 2048) + @Column(name = "comment", length = 2048) @Element(data = true, required = false) private String comment; Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Fri Nov 13 01:24:41 2015 @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlRoot @Entity @NamedQueries({ - @NamedQuery(name = "getSessionById", query = "select c from Sessiondata as c " - + "where c.session_id LIKE :sessionId"), - @NamedQuery(name = "getSessionToDelete", query = "Select c from Sessiondata c " - + "WHERE c.refresh_time < :refreshed AND c.storePermanent = false") + @NamedQuery(name = "getSessionById", query = "select c from Sessiondata as c " + + "where c.sessionId LIKE :sessionId"), + @NamedQuery(name = "getSessionToDelete", query = "Select c from Sessiondata c " + + "WHERE c.refreshed < :refreshed AND c.permanent = false") }) @Table(name = "sessiondata") @XmlRootElement @@ -45,98 +45,107 @@ public class Sessiondata implements Seri private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name="id") + @Column(name = "id") private Long id; - - @Column(name="user_id") - private Long user_id; - - @Column(name="session_id") - private String session_id; - - @Column(name="created") - private Date starttermin_time; - - @Column(name="refreshed") - private Date refresh_time; - + + @Column(name = "user_id") + private Long userId; + + @Column(name = "session_id") + private String sessionId; + + @Column(name = "created") + private Date created; + + @Column(name = "refreshed") + private Date refreshed; + @Lob - @Column(name="xml") - private String sessionXml; - - @Column(name="permanent") - private boolean storePermanent; - - @Column(name="language_id") - private Long language_id; - - @Column(name="organization_id") - private Long organization_id; - + @Column(name = "xml") + private String xml; + + @Column(name = "permanent") + private boolean permanent; + + @Column(name = "language_id") + private Long languageId; + + @Column(name = "group_id") + private Long groupId; + public Sessiondata() { } - - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - public Date getRefreshed() { - return refresh_time; - } - public void setRefreshed(Date refreshed) { - this.refresh_time = refreshed; - } - - public String getSessionId() { - return session_id; - } - public void setSessionId(String sessionId) { - this.session_id = sessionId; - } - - public Date getCreated() { - return starttermin_time; - } - public void setCreated(Date created) { - this.starttermin_time = created; - } - - public Long getUserId() { - return user_id; - } - public void setUserId(Long user_id) { - this.user_id = user_id; - } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Date getRefreshed() { + return refreshed; + } + + public void setRefreshed(Date refreshed) { + this.refreshed = refreshed; + } + + public String getSessionId() { + return sessionId; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } public String getXml() { - return sessionXml; + return xml; } + public void setXml(String xml) { - this.sessionXml = xml; + this.xml = xml; } public boolean isPermanent() { - return storePermanent; + return permanent; } + public void setPermanent(boolean permanent) { - this.storePermanent = permanent; + this.permanent = permanent; } public Long getLanguageId() { - return language_id; + return languageId; } + public void setLanguageId(Long languageId) { - this.language_id = languageId; + this.languageId = languageId; } - public Long getOrganizationId() { - return organization_id; + public Long getGroupId() { + return groupId; } - public void setOrganizationId(Long organizationId) { - this.organization_id = organizationId; + + public void setGroupId(Long groupId) { + this.groupId = groupId; } - + } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java Fri Nov 13 01:24:41 2015 @@ -51,7 +51,7 @@ public class Address implements IDataPro private String additionalname; @Lob - @Column(name = "comment_field", length=2048) + @Column(name = "comment", length=2048) @Element(data=true, required=false) private String comment; Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java Fri Nov 13 01:24:41 2015 @@ -34,7 +34,7 @@ import org.simpleframework.xml.Element; import org.simpleframework.xml.Root; @Entity -@Table(name = "sipusers") +@Table(name = "sipuser") @Root(name="asterisksipuser") public class AsteriskSipUser implements Serializable { private static final long serialVersionUID = 1L; Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java (from r1714051, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java&r1=1714051&r2=1714149&rev=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java Fri Nov 13 01:24:41 2015 @@ -35,29 +35,24 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ - @NamedQuery(name="getOrganisationById", - query="SELECT c FROM Organisation AS c WHERE c.organisation_id = :id AND c.deleted = false") - , @NamedQuery(name="getOrganisationByName", - query="SELECT o FROM Organisation AS o WHERE o.name = :name AND o.deleted = false") - , @NamedQuery(name="getAnyOrganisationById", - query="SELECT c FROM Organisation AS c WHERE c.organisation_id = :organisation_id") - , @NamedQuery(name="getOrganisationsByIds", - query="SELECT c FROM Organisation AS c WHERE c.organisation_id IN :ids") - , @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") - , @NamedQuery(name="countOrganisations", query="SELECT COUNT(c) FROM Organisation AS c WHERE c.deleted = false") + @NamedQuery(name="getGroupById", query="SELECT c FROM Group AS c WHERE c.id = :id AND c.deleted = false") + , @NamedQuery(name="getGroupByName", query="SELECT o FROM Group AS o WHERE o.name = :name AND o.deleted = false") + , @NamedQuery(name="getAnyGroupById", query="SELECT c FROM Group AS c WHERE c.id = :groupId") + , @NamedQuery(name="getGroupByIds", query="SELECT c FROM Group AS c WHERE c.id IN :ids") + , @NamedQuery(name="getGroupsByUserId", query="SELECT ou.group FROM User u, IN(u.groupUsers) ou WHERE u.deleted = false AND u.id = :userId") + , @NamedQuery(name="getNondeletedGroups", query="SELECT o FROM Group o WHERE o.deleted = false ORDER BY o.id") + , @NamedQuery(name="countGroups", query="SELECT COUNT(c) FROM Group AS c WHERE c.deleted = false") }) -@Table(name = "organisation") +@Table(name = "om_group") @Root(name="organisation") -public class Organisation implements IDataProviderEntity { +public class Group 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, required = false) @@ -69,11 +64,11 @@ public class Organisation implements IDa @Column(name="updatedby") private Long updatedby; - @Column(name="starttime") - private Date starttime; + @Column(name="inserted") + private Date inserted; - @Column(name="updatetime") - private Date updatetime; + @Column(name="updated") + private Date updated; @Column(name="deleted") @Element(data = true, required = false) @@ -95,10 +90,10 @@ public class Organisation implements IDa } public Long getId() { - return organisation_id; + return id; } public void setId(Long id) { - this.organisation_id = id; + this.id = id; } public Long getUpdatedby() { @@ -108,21 +103,22 @@ public class Organisation implements IDa this.updatedby = updatedby; } - public Date getStarttime() { - return starttime; + + public Date getInserted() { + return inserted; } - public void setStarttime(Date starttime) { - this.starttime = starttime; + public void setInserted(Date inserted) { + this.inserted = inserted; } - - public Date getUpdatetime() { - return updatetime; + + public Date getUpdated() { + return updated; } - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; + public void setUpdated(Date updated) { + this.updated = updated; } - public boolean getDeleted() { + public boolean isDeleted() { return deleted; } public void setDeleted(boolean deleted) { @@ -130,7 +126,6 @@ public class Organisation implements IDa } @Override public String toString() { - return "Organisation [id=" + organisation_id + ", name=" - + name + ", deleted=" + deleted + "]"; + return "Group [id=" + id + ", name=" + name + ", deleted=" + deleted + "]"; } } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java (from r1714051, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java&r1=1714051&r2=1714149&rev=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java Fri Nov 13 01:24:41 2015 @@ -39,37 +39,37 @@ 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="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="deleteUsersFromGroup", query="DELETE FROM GroupUser c WHERE c.group.id = :id") + , @NamedQuery(name="countGroupUsers", query="SELECT COUNT(c) FROM GroupUser c WHERE c.group.id = :id") + , @NamedQuery(name="getGroupUsersById", query="SELECT c FROM GroupUser c WHERE c.id = :id") + , @NamedQuery(name="getGroupUsersByGroupId", query="SELECT c FROM GroupUser c WHERE c.group.id = :id") + , @NamedQuery(name="isUserInGroup", query="SELECT c FROM GroupUser c WHERE c.group.id = :groupId AND c.user.id = :userId") }) -@Table(name = "organisation_users") +@Table(name = "group_user") @Root(name="user_organisation") -public class Organisation_Users implements IDataProviderEntity { +public class GroupUser 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) + @JoinColumn(name = "group_id", insertable = true, updatable = true) @ForeignKey(enabled = true) @Element(name="organisation_id", required=false) - private Organisation organisation; + private Group group; @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "user_id", insertable = true, updatable = true) @ForeignKey(enabled = true) private User user; - @Column(name = "starttime") - private Date starttime; + @Column(name = "inserted") + private Date inserted; - @Column(name = "updatetime") - private Date updatetime; + @Column(name = "updated") + private Date updated; @Column(name = "deleted") @Element(data=true) @@ -77,45 +77,45 @@ public class Organisation_Users implemen @Column(name = "is_moderator") @Element(data = true, required = false) - private Boolean isModerator; + private boolean moderator; - public Organisation_Users(Organisation organisation) { - this.organisation = organisation; + public GroupUser(Group group) { + this.group = group; } - public Organisation getOrganisation() { - return organisation; + public Group getGroup() { + return group; } - public void setOrganisation(Organisation organisation) { - this.organisation = organisation; + public void setGroup(Group group) { + this.group = group; } public Long getId() { - return organisation_users_id; + return id; } public void setId(Long id) { - this.organisation_users_id = id; + this.id = id; } - public Date getStarttime() { - return starttime; + public Date getInserted() { + return inserted; } - public void setStarttime(Date starttime) { - this.starttime = starttime; + public void setInserted(Date inserted) { + this.inserted = inserted; } - public Date getUpdatetime() { - return updatetime; + public Date getUpdated() { + return updated; } - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; + public void setUpdated(Date updated) { + this.updated = updated; } - public boolean getDeleted() { + public boolean isDeleted() { return deleted; } @@ -123,12 +123,12 @@ public class Organisation_Users implemen this.deleted = deleted; } - public Boolean getIsModerator() { - return isModerator; + public boolean isModerator() { + return moderator; } - public void setIsModerator(Boolean isModerator) { - this.isModerator = isModerator; + public void setModerator(boolean moderator) { + this.moderator = moderator; } public User getUser() { @@ -143,7 +143,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; } @@ -155,20 +155,18 @@ public class Organisation_Users implemen return false; if (getClass() != obj.getClass()) return false; - Organisation_Users other = (Organisation_Users) obj; - if (organisation_users_id == null) { - if (other.organisation_users_id != null) + GroupUser other = (GroupUser) obj; + 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; } @Override public String toString() { - return "Organisation_Users [id=" - + organisation_users_id + ", organisation=" + organisation - + ", user=" + user + ", deleted=" + deleted + "]"; + return "GroupUser [id=" + id + ", group=" + group + ", user=" + user + ", deleted=" + deleted + "]"; } } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java Fri Nov 13 01:24:41 2015 @@ -49,7 +49,7 @@ 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") @@ -101,7 +101,7 @@ public class PrivateMessage implements I private boolean bookedRoom; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "rooms_id") + @JoinColumn(name = "room_id") @ForeignKey(enabled = true) @Element(data = true, required = false) private Room room; Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java Fri Nov 13 01:24:41 2015 @@ -32,15 +32,15 @@ import org.simpleframework.xml.Element; import org.simpleframework.xml.Root; @Entity -@Table(name = "private_messages_folder") +@Table(name = "private_message_folder") @Root(name="privatemessagefolder") public class PrivateMessageFolder implements IDataProviderEntity { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name="id") - @Element(data=true, name = "privateMessageFolderId") - private Long privateMessageFolderId; + @Column(name = "id") + @Element(data = true, name = "privateMessageFolderId") + private Long id; @Column(name="folder_name") @Element(data=true) @@ -57,10 +57,10 @@ public class PrivateMessageFolder implem private Date updated; public Long getId() { - return privateMessageFolderId; + return id; } public void setId(Long id) { - this.privateMessageFolderId = id; + this.id = id; } public String getFolderName() { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Fri Nov 13 01:24:41 2015 @@ -74,27 +74,28 @@ import org.simpleframework.xml.Root; @Entity @FetchGroups({ @FetchGroup(name = "backupexport", attributes = { @FetchAttribute(name = "password") }) - , @FetchGroup(name = "orgUsers", attributes = { @FetchAttribute(name = "organisation_users")}) + , @FetchGroup(name = "groupUsers", attributes = { @FetchAttribute(name = "groupUsers")}) }) @NamedQueries({ - @NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE u.user_id = :id"), - @NamedQuery(name = "getUsersByIds", query = "select c from User c where c.user_id IN :ids"), + @NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE u.id = :id"), + @NamedQuery(name = "getUsersByIds", query = "select c from User c where c.id IN :ids"), @NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"), @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.address.email = :email AND ((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"), @NamedQuery(name = "getUserByHash", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.resethash = :resethash"), @NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.address.email = :email AND u.type = :type AND u.ownerId = :ownerId"), - @NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select count(c.user_id) from User c " + @NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select count(c.id) from User c " + "where c.deleted = false " + "AND (" + "lower(c.login) LIKE :search " + "OR lower(c.firstname) LIKE :search " + "OR lower(c.lastname) LIKE :search )"), - @NamedQuery(name = "getAllUsers", query = "SELECT u FROM User u ORDER BY u.user_id"), - @NamedQuery(name = "checkPassword", query = "SELECT COUNT(u) from User u WHERE u.deleted = false AND u.user_id = :userId AND u.password LIKE :password"), // - @NamedQuery(name = "updatePassword", query = "UPDATE User u SET u.password = :password WHERE u.user_id = :userId"), // + @NamedQuery(name = "getAllUsers", query = "SELECT u FROM User u ORDER BY u.id"), + @NamedQuery(name = "checkPassword", query = "select count(c) from User c where c.deleted = false AND c.id = :userId " // + + "AND c.password LIKE :password"), // + @NamedQuery(name = "updatePassword", query = "UPDATE User u SET u.password = :password WHERE u.id = :userId"), // @NamedQuery(name = "getNondeletedUsers", query = "SELECT u FROM User u WHERE u.deleted = false"), @NamedQuery(name = "countNondeletedUsers", query = "SELECT COUNT(u) FROM User u WHERE u.deleted = false"), - @NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM User u WHERE u.deleted = false AND u.organisation_users.organisation.organisation_id = :organisation_id"), - @NamedQuery(name = "getExternalUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.externalUserId LIKE :externalId AND u.externalUserType LIKE :externalType"), + @NamedQuery(name = "getUsersByGroupId", query = "SELECT u FROM User u WHERE u.deleted = false AND u.groupUsers.group.id = :groupId"), + @NamedQuery(name = "getExternalUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.externalId LIKE :externalId AND u.externalType LIKE :externalType"), @NamedQuery(name = "getUserByLoginOrEmail", query = "SELECT u from User u WHERE u.deleted = false AND u.type = :type AND (u.login = :userOrEmail OR u.address.email = :userOrEmail)") }) @Table(name = "om_user") @@ -175,7 +176,7 @@ public class User implements IDataProvid @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") @Element(data = true, name = "user_id") - private Long user_id; + private Long id; @Column(name = "age") @Element(data = true, required = false) @@ -213,13 +214,13 @@ public class User implements IDataProvid @Column(name = "salutation") @Enumerated(EnumType.STRING) @Element(name = "title_id", data = true, required = false) - private Salutation salutations_id; + private Salutation salutation; @Column(name = "inserted") - private Date starttime; + private Date inserted; @Column(name = "updated") - private Date updatetime; + private Date updated; @Column(name = "pictureuri") @Element(data = true, required = false) @@ -231,7 +232,7 @@ public class User implements IDataProvid @Column(name = "language_id") @Element(name = "language_id", data = true, required = false) - private Long language_id; + private Long languageId; @Column(name = "resethash") @Element(data = true, required = false) @@ -251,7 +252,7 @@ public class User implements IDataProvid @JoinColumn(name = "user_id", insertable = true, updatable = true) @ElementList(name = "organisations", required = false) @ElementDependent - private List<Organisation_Users> organisation_users = new ArrayList<Organisation_Users>(); + private List<GroupUser> groupUsers = new ArrayList<>(); @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) @PrimaryKeyJoinColumn(name="sip_user_id", referencedColumnName="id") @@ -261,11 +262,11 @@ public class User implements IDataProvid // Vars to simulate external Users @Column(name = "external_id") @Element(name = "externalUserId", data = true, required = false) - private String externalUserId; + private String externalId; @Column(name = "external_type") @Element(name = "externalUserType", data = true, required = false) - private String externalUserType; + private String externalType; /** * java.util.TimeZone Id @@ -322,11 +323,11 @@ public class User implements IDataProvid private Long domainId; // LDAP config id for LDAP, OAuth server id for OAuth public Long getId() { - return user_id; + return id; } public void setId(Long id) { - this.user_id = id; + this.id = id; } public Address getAddress() { @@ -431,27 +432,27 @@ public class User implements IDataProvid } public Salutation getSalutation() { - return salutations_id; + return salutation; } public void setSalutation(Salutation salutation) { - this.salutations_id = salutation; + this.salutation = salutation; } public Date getInserted() { - return starttime; + return inserted; } public void setInserted(Date inserted) { - this.starttime = inserted; + this.inserted = inserted; } public Date getUpdated() { - return updatetime; + return updated; } public void setUpdated(Date updated) { - this.updatetime = updated; + this.updated = updated; } public boolean isDeleted() { @@ -471,23 +472,23 @@ public class User implements IDataProvid } public Long getLanguageId() { - return language_id; + return languageId; } public void setLanguageId(Long languageId) { - this.language_id = languageId; + this.languageId = languageId; } - public List<Organisation_Users> getOrganisation_users() { - if (organisation_users == null) { - organisation_users = new ArrayList<Organisation_Users>(); + public List<GroupUser> getGroupUsers() { + if (groupUsers == null) { + groupUsers = new ArrayList<>(); } - return organisation_users; + return groupUsers; } - public void setOrganisation_users(List<Organisation_Users> organisation_users) { - if (organisation_users != null) { - this.organisation_users = organisation_users; + public void setGroupUsers(List<GroupUser> groupUsers) { + if (groupUsers != null) { + this.groupUsers = groupUsers; } } @@ -508,19 +509,19 @@ public class User implements IDataProvid } public String getExternalId() { - return externalUserId; + return externalId; } public void setExternalId(String externalId) { - this.externalUserId = externalId; + this.externalId = externalId; } public String getExternalType() { - return externalUserType; + return externalType; } public void setExternalType(String externalType) { - this.externalUserType = externalType; + this.externalType = externalType; } public Sessiondata getSessionData() { @@ -632,11 +633,11 @@ public class User implements IDataProvid @Override public String toString() { - return "User [id=" + user_id + ", firstname=" + firstname + return "User [id=" + id + ", firstname=" + firstname + ", lastname=" + lastname + ", login=" + login + ", pictureuri=" + pictureuri + ", deleted=" + deleted - + ", languageId=" + language_id + ", address=" + address - + ", externalId=" + externalUserId + ", externalType=" + externalUserType + + ", languageId=" + languageId + ", address=" + address + + ", externalId=" + externalId + ", externalType=" + externalType + ", type=" + type + "]"; } } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java Fri Nov 13 01:24:41 2015 @@ -40,33 +40,33 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ @NamedQuery(name = "deleteUserContact", query = "delete from UserContact u where u.userContactId = :userContactDeleteId"), - @NamedQuery(name = "deleteAllUserContacts", query = "delete from UserContact u where u.owner.user_id = :ownerId"), - @NamedQuery(name = "getContactByUserOwner", query = "SELECT c FROM UserContact c WHERE c.contact.user_id = :userId AND c.owner.user_id = :ownerId AND c.contact.deleted = false"), + @NamedQuery(name = "deleteAllUserContacts", query = "delete from UserContact u where u.owner.id = :ownerId"), + @NamedQuery(name = "getContactByUserOwner", query = "SELECT c FROM UserContact c WHERE c.contact.id = :userId AND c.owner.id = :ownerId AND c.contact.deleted = false"), @NamedQuery(name = "getContactsByHash", query = "select c from UserContact c " + "where c.hash like :hash "), @NamedQuery(name = "getContactsByUserAndStatus", query = "select c from UserContact c " + - "where c.owner.user_id = :ownerId " + + "where c.owner.id = :ownerId " + "AND c.pending = :pending " + - "AND c.contact.deleted <> true"), + "AND c.contact.deleted = false"), @NamedQuery(name = "getUserContactByShareCalendar", query = "select c from UserContact c " - + "where c.contact.user_id = :userId " - + "AND c.owner.user_id = :contactId " + + "where c.contact.id = :userId " + + "AND c.owner.id = :contactId " + "AND c.shareCalendar = :shareCalendar " - + "AND c.contact.deleted <> true"), + + "AND c.contact.deleted = false"), @NamedQuery(name = "getContactsByShareCalendar", query = "select c from UserContact c " + - "where c.contact.user_id = :contactId " + + "where c.contact.id = :contactId " + "AND c.shareCalendar = :shareCalendar " + - "AND c.contact.deleted <> true"), + "AND c.contact.deleted = false"), @NamedQuery(name = "getContactRequestsByUserAndStatus", query = "select c from UserContact c " + - "where c.contact.user_id = :user_id " + + "where c.contact.id = :userId " + "AND c.pending = :pending " + - "AND c.contact.deleted <> true"), + "AND c.contact.deleted = false"), @NamedQuery(name = "getContactsByUser", query = "SELECT c FROM UserContact c " + - "WHERE c.contact.user_id = :user_id " + - "AND c.contact.deleted <> true ORDER BY c.pending DESC"), + "WHERE c.contact.id = :userId " + + "AND c.contact.deleted = false ORDER BY c.pending DESC"), @NamedQuery(name = "countContactsByUser", query = "select COUNT(c) from UserContact c " + - "where c.contact.user_id = :user_id " + - "AND c.contact.deleted <> true"), + "where c.contact.id = :userId " + + "AND c.contact.deleted = false"), @NamedQuery(name = "getUserContactsById", query = "SELECT c FROM UserContact c WHERE c.userContactId = :userContactId"), @NamedQuery(name = "getUserContacts", query = "SELECT c FROM UserContact c ORDER BY c.userContactId") }) Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java Fri Nov 13 01:24:41 2015 @@ -36,22 +36,22 @@ public class Userdata implements Seriali @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") - private Long data_id; + private Long id; @Column(name = "user_id") - private Long user_id; + private Long userId; @Column(name = "data_key") - private String data_key; + private String key; @Column(name = "data") private String data; @Column(name = "inserted") - private Date starttime; + private Date inserted; @Column(name = "updated") - private Date updatetime; + private Date updated; @Lob @Column(name = "comment") @@ -77,35 +77,35 @@ public class Userdata implements Seriali } public String getKey() { - return data_key; + return key; } public void setKey(String key) { - this.data_key = key; + this.key = key; } public Long getId() { - return data_id; + return id; } public void setId(Long id) { - this.data_id = id; + this.id = id; } public Date getInserted() { - return starttime; + return inserted; } public void setInserted(Date inserted) { - this.starttime = inserted; + this.inserted = inserted; } public Date getUpdated() { - return updatetime; + return updated; } public void setUpdated(Date updated) { - this.updatetime = updated; + this.updated = updated; } public boolean isDeleted() { @@ -117,10 +117,10 @@ public class Userdata implements Seriali } public Long getUserId() { - return user_id; + return userId; } public void setUserId(Long userId) { - this.user_id = userId; + this.userId = userId; } } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java Fri Nov 13 01:24:41 2015 @@ -22,7 +22,7 @@ import static org.apache.openmeetings.ut import java.util.Set; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.red5.logging.Red5LoggerFactory; @@ -41,12 +41,12 @@ public class AuthLevelUtil { return check(rights, Right.Room); } - public static boolean hasModLevel(User u, Long orgId) { + public static boolean hasModLevel(User u, Long groupId) { boolean result = hasAdminLevel(u.getRights()); - if (!result && orgId != null) { - for (Organisation_Users ou : u.getOrganisation_users()) { - if (orgId.equals(ou.getOrganisation().getId())) { - if (Boolean.TRUE.equals(ou.getIsModerator())) { + if (!result && groupId != null) { + for (GroupUser ou : u.getGroupUsers()) { + if (groupId.equals(ou.getGroup().getId())) { + if (ou.isModerator()) { result = true; } break;
