Added: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java?rev=1712911&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java (added) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java Fri Nov 6 06:18:44 2015 @@ -0,0 +1,200 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.db.entity.file; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.MappedSuperclass; +import javax.xml.bind.annotation.XmlType; + +import org.apache.openmeetings.db.entity.IDataProviderEntity; +import org.simpleframework.xml.Element; + +@MappedSuperclass +public abstract class FileItem implements IDataProviderEntity { + private static final long serialVersionUID = 1L; + + @XmlType(namespace = "org.apache.openmeetings.file") + public enum Type { + // Folder need to be alphabetically first, for correct sorting + Folder, Image, PollChart, Presentation, Recording, Video, WmlFile + } + + @Column(name = "filename") + @Element(data = true, required = false) + private String fileName; + + @Column(name = "filehash") + @Element(data = true, required = false) + private String fileHash; + + @Column(name = "parent_fileexploreritem_id") + @Element(data = true, name = "parentFileExplorerItemId", required = false) + private Long parentItemId; + + @Column(name = "room_id") + @Element(data = true, required = false, name = "room_id") + private Long roomId; + + // OwnerID => only set if its directly root in Owner Directory, other Folders and Files + // maybe are also in a Home directory but just because their parent is + @Column(name = "owner_id") + @Element(data = true, required = false) + private Long ownerId; + + @Column(name = "inserted_by") + @Element(data = true) + private Long insertedBy; + + @Column(name = "inserted") + @Element(data = true) + private Date inserted; + + @Column(name = "updated") + @Element(data = true, required = false) + private Date updated; + + @Column(name = "deleted") + @Element(data = true) + private boolean deleted; + + @Column(name = "flv_width") + @Element(data = true, required = false) + private Integer flvWidth; + + @Column(name = "flv_height") + @Element(data = true, required = false) + private Integer flvHeight; + + @Column(name = "preview_image") + @Element(data = true, required = false) + private String previewImage; + + @Column(name = "type") + @Element(data = true, required = false) + @Enumerated(EnumType.STRING) + private Type type; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileHash() { + return fileHash; + } + + public void setFileHash(String fileHash) { + this.fileHash = fileHash; + } + + public Long getParentItemId() { + return parentItemId; + } + + public void setParentItemId(Long parentItemId) { + this.parentItemId = parentItemId; + } + + public Long getRoomId() { + return roomId; + } + + public void setRoomId(Long roomId) { + this.roomId = roomId; + } + + public Long getOwnerId() { + return ownerId; + } + + public void setOwnerId(Long ownerId) { + this.ownerId = ownerId; + } + + public Long getInsertedBy() { + return insertedBy; + } + + public void setInsertedBy(Long insertedBy) { + this.insertedBy = insertedBy; + } + + public Date getInserted() { + return inserted; + } + + public void setInserted(Date inserted) { + this.inserted = inserted; + } + + public Date getUpdated() { + return updated; + } + + public void setUpdated(Date updated) { + this.updated = updated; + } + + public boolean isDeleted() { + return deleted; + } + + public void setDeleted(boolean deleted) { + this.deleted = deleted; + } + + public Integer getFlvWidth() { + return flvWidth; + } + + public void setFlvWidth(Integer flvWidth) { + this.flvWidth = flvWidth; + } + + public Integer getFlvHeight() { + return flvHeight; + } + + public void setFlvHeight(Integer flvHeight) { + this.flvHeight = flvHeight; + } + + public String getPreviewImage() { + return previewImage; + } + + public void setPreviewImage(String previewImage) { + this.previewImage = previewImage; + } + + public Type getType() { + return type; + } + + public void setType(Type type) { + this.type = type; + } +}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java Fri Nov 6 06:18:44 2015 @@ -46,4 +46,13 @@ public class StringLabel extends SimpleE Map.Entry<?,?> e = (Map.Entry<?,?>)o; return getKey() == null ? e.getKey() == null : getKey().equals(e.getKey()); } + + @Override + public Long getId() { + return null; + } + + @Override + public void setId(Long id) { + } } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java Fri Nov 6 06:18:44 2015 @@ -18,36 +18,38 @@ */ package org.apache.openmeetings.db.entity.log; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.FetchType; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.JoinColumn; -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; + public enum Type { + clientConnect + , roomEnter + , roomLeave + , nicknameEnter + } + @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) - @ForeignKey(enabled = true) - private ConferenceLogType conferenceLogType; + @Enumerated(EnumType.STRING) + @Column(name = "type") + private Type type; @Column(name="inserted") private Date inserted; @@ -59,17 +61,11 @@ public class ConferenceLog implements Se @Column(name="user_id") private Long userId; - @Column(name="external_user_id") - private String externalUserId; - - @Column(name="external_user_type") - private String externalUserType; - @Column(name="streamid") private String streamid; @Column(name="room_id") - private Long room_id; + private Long roomId; @Column(name="userip") private String userip; @@ -77,27 +73,18 @@ public class ConferenceLog implements Se @Column(name="scopename") private String scopeName; - @Column(name="email") - private String email; - - @Column(name="firstname") - private String firstname; - - @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() { - return conferenceLogType; + public Type getType() { + return type; } - public void setConferenceLogType(ConferenceLogType conferenceLogType) { - this.conferenceLogType = conferenceLogType; + public void setType(Type type) { + this.type = type; } public Date getInserted() { @@ -128,11 +115,11 @@ public class ConferenceLog implements Se this.streamid = streamid; } - public Long getRoom_id() { - return room_id; + public Long getRoomId() { + return roomId; } - public void setRoom_id(Long room_id) { - this.room_id = room_id; + public void setRoomId(Long roomId) { + this.roomId = roomId; } public String getUserip() { @@ -148,40 +135,4 @@ public class ConferenceLog implements Se public void setScopeName(String scopeName) { this.scopeName = scopeName; } - - public String getExternalUserId() { - return externalUserId; - } - public void setExternalUserId(String externalUserId) { - this.externalUserId = externalUserId; - } - - public String getExternalUserType() { - return externalUserType; - } - public void setExternalUserType(String externalUserType) { - this.externalUserType = externalUserType; - } - - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - - public String getFirstname() { - return firstname; - } - public void setFirstname(String firstname) { - this.firstname = firstname; - } - - public String getLastname() { - return lastname; - } - public void setLastname(String lastname) { - this.lastname = lastname; - } - } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.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?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.record; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -37,7 +36,12 @@ import javax.persistence.NamedQuery; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.User; import org.simpleframework.xml.Element; @@ -61,32 +65,42 @@ import org.simpleframework.xml.Root; */ @Entity @NamedQueries({ - @NamedQuery(name = "getRecordingById", query = "SELECT f FROM FlvRecording f WHERE f.flvRecordingId = :id") - , @NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM FlvRecording f WHERE f.fileHash = :fileHash") - , @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT c FROM FlvRecording c, User u " + @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 " + "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) " - + "ORDER BY f.folder DESC, f.inserted") - , @NamedQuery(name = "getRecordingsByOrganization", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.ownerId IS NULL " - + "AND f.organization_id = :organization_id AND (f.parentFileExplorerItemId IS NULL OR f.parentFileExplorerItemId = 0) " - + "ORDER BY f.folder DESC, f.inserted") - , @NamedQuery(name = "getRecordingsByOwner", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.ownerId = :ownerId " - + "AND (f.parentFileExplorerItemId IS NULL OR f.parentFileExplorerItemId = 0) " - + "ORDER BY f.folder DESC, f.inserted") - , @NamedQuery(name = "getRecordingsByParent", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.parentFileExplorerItemId = :parentId " - + "ORDER BY f.folder DESC, f.inserted") - , @NamedQuery(name = "resetRecordingProcessingStatus", query = "UPDATE FlvRecording f SET f.status = :error WHERE f.status IN (:recording, :converting)") - , @NamedQuery(name = "getRecordingsByExternalType", query = "SELECT rec FROM FlvRecording rec, Room r, User u " + , @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) " + + "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) " + + "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) " + + "ORDER BY f.type DESC, f.inserted") + , @NamedQuery(name = "resetRecordingProcessingStatus", query = "UPDATE Recording f SET f.status = :error WHERE f.status IN (:recording, :converting)") + , @NamedQuery(name = "getRecordingsAll", query = "SELECT c FROM Recording c LEFT JOIN FETCH c.metaData ORDER BY c.id") + , @NamedQuery(name = "getRecordingsByExternalTypeAndOwner", query = "SELECT c FROM Recording c, Room r WHERE c.roomId = r.id " + + "AND r.externalType LIKE :externalType AND c.insertedBy LIKE :insertedBy AND c.deleted = false") + , @NamedQuery(name = "getRecordingsByExternalType", query = "SELECT c FROM Recording c, Room r WHERE c.roomId = r.id " + + "AND r.externalType LIKE :externalType AND c.deleted = false") + , @NamedQuery(name = "getRecordingsByRoom", query = "SELECT c FROM Recording c WHERE c.deleted = false AND c.roomId = :roomId " + + "ORDER BY c.type ASC, c.inserted") + , @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)") }) -@Table(name = "flvrecording") +@Table(name = "recording") @Root(name = "flvrecording") -public class FlvRecording implements Serializable { +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class Recording extends FileItem { private static final long serialVersionUID = 1L; + @XmlType(namespace="org.apache.openmeetings.record") public enum Status { NONE , RECORDING @@ -97,56 +111,17 @@ public class FlvRecording implements Ser @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") - @Element(data = true) - private long flvRecordingId; - - @Column(name = "filename") - @Element(data = true, required = false) - private String fileName; + @Element(data = true, name = "flvRecordingId") + private Long id; @Column(name = "alternate_download") @Element(data = true, required = false) private String alternateDownload; - @Column(name = "filehash") - @Element(data = true, required = false) - private String fileHash; - @Column(name = "comment_field") @Element(data = true, required = false) private String comment; - @Column(name = "parent_fileexploreritem_id") - @Element(data = true, required = false) - private Long parentFileExplorerItemId; - - @Column(name = "room_id") - @Element(data = true, required = false) - private Long room_id; - - @Column(name = "owner_id") - @Element(data = true, required = false) - private Long ownerId;// OwnerID => only set if its directly root in Owner - // Directory, other Folders and Files - // maybe are also in a Home directory but just - // because their parent is - - @Column(name = "is_folder") - @Element(data = true, required = false) - private boolean folder; - - @Column(name = "is_image") - @Element(data = true, required = false) - private Boolean isImage; - - @Column(name = "is_presentation") - @Element(data = true, required = false) - private Boolean isPresentation; - - @Column(name = "is_recording") - @Element(data = true, required = false) - private Boolean isRecording; - @Column(name = "record_start") @Element(data = true, required = false) private Date recordStart; @@ -155,21 +130,6 @@ public class FlvRecording implements Ser @Element(data = true, required = false) private Date recordEnd; - @Column(name = "inserted_by") - @Element(data = true, required = false) - private Long insertedBy; - - @Column(name = "inserted") - @Element(data = true, required = false) - private Date inserted; - - @Column(name = "updated") - private Date updated; - - @Column(name = "deleted") - @Element(data = true, required = false) - private boolean deleted; - @Column(name = "width") @Element(data = true, required = false) private Integer width; @@ -178,18 +138,6 @@ public class FlvRecording implements Ser @Element(data = true, required = false) private Integer height; - @Column(name = "flv_width") - @Element(data = true, required = false) - private Integer flvWidth; - - @Column(name = "flv_height") - @Element(data = true, required = false) - private Integer flvHeight; - - @Column(name = "preview_image") - @Element(data = true, required = false) - private String previewImage; - @Column(name = "duration") @Element(data = true, required = false) private String duration; @@ -198,7 +146,7 @@ public class FlvRecording implements Ser @Element(data = true, required = false) private String recorderStreamId; - @Column(name = "organization_id") + @Column(name = "group_id") @Element(data = true, required = false) private Long organization_id; @@ -211,9 +159,9 @@ public class FlvRecording implements Ser private Integer progressPostProcessing; @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @JoinColumn(name = "flvrecording_id") + @JoinColumn(name = "recording_id") @ElementList(name = "flvrecordingmetadatas", required = false) - private List<FlvRecordingMetaData> flvRecordingMetaData; + private List<RecordingMetaData> metaData; @Column(name = "status") @Enumerated(value = EnumType.STRING) @@ -228,22 +176,14 @@ public class FlvRecording implements Ser private Room room; @Transient - private List<FlvRecordingLog> flvRecordingLog; - - public long getFlvRecordingId() { - return flvRecordingId; - } + private List<RecordingLog> log; - public void setFlvRecordingId(long flvRecordingId) { - this.flvRecordingId = flvRecordingId; + public Long getId() { + return id; } - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; + public void setId(Long id) { + this.id = id; } public String getComment() { @@ -254,102 +194,6 @@ public class FlvRecording implements Ser this.comment = comment; } - public String getFileHash() { - return fileHash; - } - - public void setFileHash(String fileHash) { - this.fileHash = fileHash; - } - - public Long getParentFileExplorerItemId() { - return parentFileExplorerItemId; - } - - public void setParentFileExplorerItemId(Long parentFileExplorerItemId) { - this.parentFileExplorerItemId = parentFileExplorerItemId; - } - - public Long getRoom_id() { - return room_id; - } - - public void setRoom_id(Long room_id) { - this.room_id = room_id; - } - - public Long getOwnerId() { - return ownerId; - } - - public void setOwnerId(Long ownerId) { - this.ownerId = ownerId; - } - - public boolean isFolder() { - return folder; - } - - public void setFolder(boolean folder) { - this.folder = folder; - } - - public Boolean getIsImage() { - return isImage; - } - - public void setIsImage(Boolean isImage) { - this.isImage = isImage; - } - - public Boolean getIsPresentation() { - return isPresentation; - } - - public void setIsPresentation(Boolean isPresentation) { - this.isPresentation = isPresentation; - } - - public Boolean getIsRecording() { - return isRecording; - } - - public void setIsRecording(Boolean isRecording) { - this.isRecording = isRecording; - } - - public Long getInsertedBy() { - return insertedBy; - } - - public void setInsertedBy(Long insertedBy) { - this.insertedBy = insertedBy; - } - - public Date getInserted() { - return inserted; - } - - public void setInserted(Date inserted) { - this.inserted = inserted; - } - - public boolean getDeleted() { - return deleted; - } - - public void setDeleted(boolean deleted) { - this.deleted = deleted; - } - - public Date getUpdated() { - return updated; - } - - public void setUpdated(Date updated) { - this.updated = updated; - } - public String getDuration() { return duration; } @@ -390,13 +234,12 @@ public class FlvRecording implements Ser this.organization_id = organization_id; } - public List<FlvRecordingMetaData> getFlvRecordingMetaData() { - return flvRecordingMetaData; + public List<RecordingMetaData> getMetaData() { + return metaData; } - public void setFlvRecordingMetaData( - List<FlvRecordingMetaData> flvRecordingMetaData) { - this.flvRecordingMetaData = flvRecordingMetaData; + public void setMetaData(List<RecordingMetaData> metaData) { + this.metaData = metaData; } public User getCreator() { @@ -431,30 +274,6 @@ public class FlvRecording implements Ser this.height = height; } - public Integer getFlvWidth() { - return flvWidth; - } - - public void setFlvWidth(Integer flvWidth) { - this.flvWidth = flvWidth; - } - - public Integer getFlvHeight() { - return flvHeight; - } - - public void setFlvHeight(Integer flvHeight) { - this.flvHeight = flvHeight; - } - - public String getPreviewImage() { - return previewImage; - } - - public void setPreviewImage(String previewImage) { - this.previewImage = previewImage; - } - public String getAlternateDownload() { return alternateDownload; } @@ -463,12 +282,12 @@ public class FlvRecording implements Ser this.alternateDownload = alternateDownload; } - public List<FlvRecordingLog> getFlvRecordingLog() { - return flvRecordingLog; + public List<RecordingLog> getLog() { + return log; } - public void setFlvRecordingLog(List<FlvRecordingLog> flvRecordingLog) { - this.flvRecordingLog = flvRecordingLog; + public void setLog(List<RecordingLog> log) { + this.log = log; } public Boolean getIsInterview() { @@ -494,5 +313,4 @@ public class FlvRecording implements Ser public void setStatus(Status status) { this.status = status; } - } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingLog.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingLog.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingLog.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingLog.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.record; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -33,24 +32,26 @@ 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 ORDER BY fl.inserted") - , @NamedQuery(name = "countErrorRecordingLogsByRecording", query = "SELECT COUNT(fl) FROM FlvRecordingLog fl WHERE fl.flvRecording.flvRecordingId = :recId AND fl.exitValue <> '0'") - , @NamedQuery(name = "deleteErrorRecordingLogsByRecording", query = "DELETE FROM FlvRecordingLog fl WHERE fl.flvRecording.flvRecordingId = :recId") + @NamedQuery(name = "getRecordingLogsByRecording", query = "SELECT fl FROM RecordingLog fl WHERE fl.recording.id = :recId") + , @NamedQuery(name = "countErrorRecordingLogsByRecording", query = "SELECT COUNT(fl) FROM RecordingLog fl WHERE fl.recording.id = :recId AND fl.exitValue <> '0'") + , @NamedQuery(name = "deleteErrorRecordingLogsByRecording", query = "DELETE FROM RecordingLog fl WHERE fl.recording.id = :recId") }) -@Table(name = "flvrecording_log") -public class FlvRecordingLog implements Serializable { +@Table(name = "recording_log") +public class RecordingLog implements IDataProviderEntity { private static final long serialVersionUID = 1L; - public static final int MAX_LOG_SIZE = 64 * 1024; //64K until column definition will be fixed + public static final int MAX_LOG_SIZE = 1 * 1024 * 1024; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name="id") - private long flvRecordingLogId; + private Long id; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name="flvrecording_id", nullable=true) - private FlvRecording flvRecording; + @JoinColumn(name="recording_id", nullable=true) + private Recording recording; @Column(name="inserted") private Date inserted; @@ -65,18 +66,18 @@ 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() { - return flvRecording; + public Recording getRecording() { + return recording; } - public void setFlvRecording(FlvRecording flvRecording) { - this.flvRecording = flvRecording; + public void setRecording(Recording recording) { + this.recording = recording; } public Date getInserted() { Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.record; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -34,8 +33,10 @@ import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; 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,17 +51,18 @@ import org.simpleframework.xml.Root; */ @Entity @NamedQueries({ - @NamedQuery(name = "getMetaById", query = "SELECT c FROM FlvRecordingMetaData c WHERE c.flvRecordingMetaDataId = :id") - , @NamedQuery(name = "getMetaByRecording", query = "SELECT c FROM FlvRecordingMetaData c WHERE c.flvRecording.flvRecordingId = :recordingId AND c.deleted = false") - , @NamedQuery(name = "getAudioMetaByRecording", query = "SELECT c FROM FlvRecordingMetaData c WHERE c.flvRecording.flvRecordingId = :recordingId " + @NamedQuery(name = "getMetaById", query = "SELECT c FROM RecordingMetaData c WHERE c.id = :id") + , @NamedQuery(name = "getMetaByRecording", query = "SELECT c FROM RecordingMetaData c WHERE c.recording.id = :recordingId AND c.deleted = false") + , @NamedQuery(name = "getAudioMetaByRecording", query = "SELECT c FROM RecordingMetaData c WHERE c.recording.id = :recordingId " + "AND c.screenData = false AND c.streamStatus <> :none AND (c.audioOnly = true OR (c.audioOnly = false AND c.videoOnly = false))") - , @NamedQuery(name = "getScreenMetaByRecording", query = "SELECT c FROM FlvRecordingMetaData c WHERE c.flvRecording.flvRecordingId = :recordingId" + , @NamedQuery(name = "getScreenMetaByRecording", query = "SELECT c FROM RecordingMetaData c WHERE c.recording.id = :recordingId" + " AND c.screenData = true") }) -@Table(name = "flvrecording_metadata") +@Table(name = "recording_metadata") @Root(name = "flvrecordingmetadata") -public class FlvRecordingMetaData implements Serializable { +public class RecordingMetaData implements IDataProviderEntity { private static final long serialVersionUID = 1L; + @XmlType(namespace="org.apache.openmeetings.record.meta") public enum Status { NONE , STARTED @@ -72,12 +74,12 @@ public class FlvRecordingMetaData implem @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") @Element(name = "flvRecordingMetaDataId", data = true, required = false) - private long flvRecordingMetaDataId; + private Long id; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "flvrecording_id", nullable = true) + @JoinColumn(name = "recording_id", nullable = true) @ForeignKey(enabled = true) - private FlvRecording flvRecording; + private Recording recording; @Column(name = "record_start") @Element(data = true) @@ -146,20 +148,20 @@ 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() { - return flvRecording; + public Recording getRecording() { + return recording; } - public void setFlvRecording(FlvRecording flvRecording) { - this.flvRecording = flvRecording; + public void setRecording(Recording recording) { + this.recording = recording; } public Date getRecordStart() { @@ -218,7 +220,7 @@ public class FlvRecordingMetaData implem this.inserted = inserted; } - public boolean getDeleted() { + public boolean isDeleted() { return deleted; } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.record; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -26,22 +25,26 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; import javax.persistence.Table; -/** - * - * - */ + +import org.apache.openmeetings.db.entity.IDataProviderEntity; + +@NamedQueries({ + @NamedQuery(name = "getRecordingMetaDeltaByMetaDataId", query = "SELECT c FROM RecordingMetaDelta c WHERE c.metaDataId = :metaDataId") +}) @Entity -@Table(name = "flvrecording_meta_delta") -public class FlvRecordingMetaDelta implements Serializable { +@Table(name = "recording_meta_delta") +public class RecordingMetaDelta 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; + @Column(name="metadata_id") + private Long metaDataId; @Column(name="time_stamp") private Integer timeStamp; @@ -91,18 +94,18 @@ 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() { - return flvRecordingMetaDataId; + public Long getMetaDataId() { + return metaDataId; } - public void setFlvRecordingMetaDataId(Long flvRecordingMetaDataId) { - this.flvRecordingMetaDataId = flvRecordingMetaDataId; + public void setMetaDataId(Long metaDataId) { + this.metaDataId = metaDataId; } public Integer getTimeStamp() { 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=1712911&r1=1712910&r2=1712911&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 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.room; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -32,6 +31,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.openmeetings.db.entity.IDataProviderEntity; import org.apache.openmeetings.db.entity.server.Server; @@ -62,13 +64,15 @@ import org.apache.openmeetings.util.Cale @NamedQuery(name = "getRoomsIdsByServer", query = "SELECT c.room_id FROM Client c WHERE c.server = :server GROUP BY c.room_id") }) @Table(name = "client") -public class Client implements IDataProviderEntity, Serializable { +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +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() @@ -176,13 +180,13 @@ public class Client implements IDataProv private String formatedDate; /** - * @see Client#getIsScreenClient() + * @see Client#isScreenClient() */ @Column(name = "is_screenclient") private boolean isScreenClient = false; /** - * @see Client#getIsAVClient() + * @see Client#isAvClient() */ @Column(name = "is_avclient") private boolean isAVClient = false; @@ -402,7 +406,7 @@ public class Client implements IDataProv public Client() {} public Client(String streamid, String publicSID, Long room_id, - Long user_id, String firstname, String lastname, boolean isAVClient, + Long user_id, String firstname, String lastname, boolean avClient, String username, String connectedSince, String scope) { super(); this.streamid = streamid; @@ -411,7 +415,7 @@ public class Client implements IDataProv this.user_id = user_id; this.firstname = firstname; this.lastname = lastname; - this.isAVClient = isAVClient; + this.isAVClient = avClient; this.username = username; this.connectedSince = CalendarPatterns.parseDateWithHour(connectedSince); this.scope = scope; @@ -430,11 +434,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; } @@ -710,12 +714,12 @@ public class Client implements IDataProv this.isSuperModerator = isSuperModerator; } - public boolean getIsScreenClient() { + public boolean isScreenClient() { return isScreenClient; } - public void setIsScreenClient(boolean isScreenClient) { - this.isScreenClient = isScreenClient; + public void setScreenClient(boolean screenClient) { + this.isScreenClient = screenClient; } public int getVWidth() { @@ -846,12 +850,12 @@ public class Client implements IDataProv this.allowRecording = allowRecording; } - public boolean getIsAVClient() { + public boolean isAvClient() { return isAVClient; } - public void setIsAVClient(boolean isAVClient) { - this.isAVClient = isAVClient; + public void setAvClient(boolean avClient) { + this.isAVClient = avClient; } public boolean isStreamPublishStarted() { 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=1712911&r1=1712910&r2=1712911&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 6 06:18:44 2015 @@ -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; @@ -26,18 +25,22 @@ import java.util.List; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.Lob; -import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; import org.apache.openjpa.persistence.ElementDependent; import org.apache.openjpa.persistence.FetchAttribute; @@ -78,12 +81,58 @@ import org.simpleframework.xml.Root; }) @Table(name = "room") @Root(name = "room") -public class Room implements Serializable, IDataProviderEntity { +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class Room implements IDataProviderEntity { private static final long serialVersionUID = 1L; + public static final int CONFERENCE_TYPE_ID = 1; + public static final int RESTRICTED_TYPE_ID = 3; + public static final int INTERVIEW_TYPE_ID = 4; + + public enum Type { + conference(CONFERENCE_TYPE_ID) + //, audience(2) + , restricted(RESTRICTED_TYPE_ID) + , interview(INTERVIEW_TYPE_ID); + //, custom(5) + private int id; + + Type() {} //default; + Type(int id) { + this.id = id; + } + + public int getId() { + return id; + } + + public static Type get(Long type) { + return get(type == null ? 1 : type.intValue()); + } + + public static Type get(Integer type) { + return get(type == null ? 1 : type.intValue()); + } + + public static Type get(int type) { + Type rt = Type.conference; + switch (type) { + case RESTRICTED_TYPE_ID: + rt = Type.restricted; + break; + case INTERVIEW_TYPE_ID: + rt = Type.interview; + break; + default: + //no-op + } + return rt; + } + } @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") - @Element(data = true, required=false) + @Element(data = true, required = false, name = "rooms_id") private Long rooms_id; @Column(name = "name") @@ -95,16 +144,15 @@ public class Room implements Serializabl @Element(data = true, required = false) private String comment; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "roomtypes_id") - @ForeignKey(enabled = true) + @Column(name = "type") + @Enumerated(EnumType.STRING) @Element(name = "roomtypeId", data = true, required = false) - private RoomType roomtype; + private Type type = Type.conference; - @Column(name = "starttime") + @Column(name = "inserted") private Date starttime; - @Column(name = "updatetime") + @Column(name = "updated") private Date updatetime; @Column(name = "deleted") @@ -124,17 +172,17 @@ public class Room implements Serializabl private boolean appointment; // Vars to simulate external Room - @Column(name = "externalRoomId") + @Column(name = "externalId") @Element(data = true, required = false) private Long externalRoomId; - @Column(name = "externalRoomType") + @Column(name = "externalType") @Element(data = true, required = false) private String externalRoomType; @Column(name = "isdemoroom") @Element(data = true, required = false) - private Boolean isDemoRoom; + private boolean isDemoRoom; @Column(name = "demo_time") @Element(data = true, required = false) @@ -148,11 +196,11 @@ public class Room implements Serializabl @Column(name = "allow_user_questions") @Element(data = true, required = false) - private Boolean allowUserQuestions; + private boolean allowUserQuestions; @Column(name = "is_audio_only") @Element(name = "isAudioOnly", data = true, required = false) - private Boolean isAudioOnly; + private boolean isAudioOnly; @Column(name = "allow_font_styles", nullable = false) @Element(data = true, required = false) @@ -172,7 +220,7 @@ public class Room implements Serializabl @Column(name = "wait_for_recording") @Element(data = true, required = false) - private Boolean waitForRecording; // Show warning that user has to start + private boolean waitForRecording; // Show warning that user has to start // recording @Column(name = "allow_recording") @@ -183,51 +231,51 @@ public class Room implements Serializabl */ @Column(name = "hide_top_bar") @Element(data = true, required = false) - private Boolean hideTopBar = false; + private boolean hideTopBar; @Column(name = "hide_chat") @Element(name = "hideChat", data = true, required = false) - private Boolean hideChat = false; + private boolean hideChat; @Column(name = "hide_activities_and_actions") @Element(name = "hideActivitiesAndActions", data = true, required = false) - private Boolean hideActivitiesAndActions = false; + private boolean hideActivitiesAndActions; @Column(name = "hide_files_explorer") @Element(data = true, required = false) - private Boolean hideFilesExplorer = false; + private boolean hideFilesExplorer; @Column(name = "hide_actions_menu") @Element(data = true, required = false) - private Boolean hideActionsMenu = false; + private boolean hideActionsMenu; @Column(name = "hide_screen_sharing") @Element(data = true, required = false) - private Boolean hideScreenSharing = false; + private boolean hideScreenSharing; @Column(name = "hide_whiteboard") @Element(data = true, required = false) - private Boolean hideWhiteboard = false; + private boolean hideWhiteboard; @Column(name = "show_microphone_status") @Element(data = true, required = false) - private Boolean showMicrophoneStatus = false; + private boolean showMicrophoneStatus; @Column(name = "chat_moderated") @Element(data = true, required = false) - private Boolean chatModerated = false; + private boolean chatModerated; @Column(name = "chat_opened") @Element(data = true, required = false) - private boolean chatOpened = false; + private boolean chatOpened; @Column(name = "files_opened") @Element(data = true, required = false) - private boolean filesOpened = false; + private boolean filesOpened; @Column(name = "auto_video_select") @Element(data = true, required = false) - private boolean autoVideoSelect = false; + private boolean autoVideoSelect; @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "roomId") @@ -248,7 +296,7 @@ public class Room implements Serializabl private String pin; @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @JoinColumn(name = "rooms_id", insertable = true, updatable = true) + @JoinColumn(name = "room_id", insertable = true, updatable = true) @ElementDependent @org.simpleframework.xml.Transient private List<RoomOrganisation> roomOrganisations = new ArrayList<RoomOrganisation>(); @@ -272,39 +320,39 @@ public class Room implements Serializabl this.name = name; } - public Long getRooms_id() { + public Long getId() { return rooms_id; } - public void setRooms_id(Long rooms_id) { - this.rooms_id = rooms_id; + public void setId(Long id) { + this.rooms_id = id; } - public RoomType getRoomtype() { - return roomtype; + public Type getType() { + return type; } - public void setRoomtype(RoomType roomtype) { - this.roomtype = roomtype; + public void setType(Type type) { + this.type = type; } - public Date getStarttime() { + public Date getInserted() { return starttime; } - public void setStarttime(Date starttime) { - this.starttime = starttime; + public void setInserted(Date inserted) { + this.starttime = inserted; } - public Date getUpdatetime() { + public Date getUpdated() { return updatetime; } - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; + public void setUpdated(Date updated) { + this.updatetime = updated; } - public boolean getDeleted() { + public boolean isDeleted() { return deleted; } @@ -312,11 +360,11 @@ public class Room implements Serializabl this.deleted = deleted; } - public Boolean getIspublic() { + public boolean getIspublic() { return ispublic; } - public void setIspublic(Boolean ispublic) { + public void setIspublic(boolean ispublic) { this.ispublic = ispublic; } @@ -336,19 +384,19 @@ public class Room implements Serializabl this.numberOfPartizipants = numberOfPartizipants; } - public Boolean getAppointment() { + public boolean isAppointment() { return appointment; } - public void setAppointment(Boolean appointment) { + public void setAppointment(boolean appointment) { this.appointment = appointment; } - public Boolean getIsDemoRoom() { + public boolean getIsDemoRoom() { return isDemoRoom; } - public void setIsDemoRoom(Boolean isDemoRoom) { + public void setIsDemoRoom(boolean isDemoRoom) { this.isDemoRoom = isDemoRoom; } @@ -360,44 +408,44 @@ public class Room implements Serializabl this.demoTime = demoTime; } - public Boolean getIsModeratedRoom() { + public boolean isModerated() { return isModeratedRoom; } - public void setIsModeratedRoom(Boolean isModeratedRoom) { - this.isModeratedRoom = isModeratedRoom; + public void setModerated(boolean moderated) { + this.isModeratedRoom = moderated; } - public Long getExternalRoomId() { + public Long getExternalId() { return externalRoomId; } - public void setExternalRoomId(Long externalRoomId) { - this.externalRoomId = externalRoomId; + public void setExternalId(Long externalId) { + this.externalRoomId = externalId; } - public String getExternalRoomType() { + public String getExternalType() { return externalRoomType; } - public void setExternalRoomType(String externalRoomType) { - this.externalRoomType = externalRoomType; + public void setExternalType(String externalType) { + this.externalRoomType = externalType; } - public Boolean getAllowUserQuestions() { + public boolean getAllowUserQuestions() { return allowUserQuestions; } - public void setAllowUserQuestions(Boolean allowUserQuestions) { + public void setAllowUserQuestions(boolean allowUserQuestions) { this.allowUserQuestions = allowUserQuestions; } - public Boolean getIsAudioOnly() { + public boolean isAudioOnly() { return isAudioOnly; } - public void setIsAudioOnly(Boolean isAudioOnly) { - this.isAudioOnly = isAudioOnly; + public void setAudioOnly(boolean audioOnly) { + this.isAudioOnly = audioOnly; } public boolean getAllowFontStyles() { @@ -408,12 +456,12 @@ public class Room implements Serializabl this.allowFontStyles = allowFontStyles; } - public boolean getIsClosed() { + public boolean isClosed() { return isClosed; } - public void setIsClosed(boolean isClosed) { - this.isClosed = isClosed; + public void setClosed(boolean closed) { + this.isClosed = closed; } public String getRedirectURL() { @@ -432,11 +480,11 @@ public class Room implements Serializabl this.ownerId = ownerId; } - public Boolean getWaitForRecording() { + public boolean getWaitForRecording() { return waitForRecording; } - public void setWaitForRecording(Boolean waitForRecording) { + public void setWaitForRecording(boolean waitForRecording) { this.waitForRecording = waitForRecording; } @@ -448,67 +496,67 @@ public class Room implements Serializabl this.allowRecording = allowRecording; } - public Boolean getHideTopBar() { + public boolean getHideTopBar() { return hideTopBar; } - public void setHideTopBar(Boolean hideTopBar) { + public void setHideTopBar(boolean hideTopBar) { this.hideTopBar = hideTopBar; } - public Boolean getHideChat() { + public boolean isChatHidden() { return hideChat; } - public void setHideChat(Boolean hideChat) { + public void setChatHidden(boolean hideChat) { this.hideChat = hideChat; } - public Boolean getHideActivitiesAndActions() { + public boolean isActivitiesHidden() { return hideActivitiesAndActions; } - public void setHideActivitiesAndActions(Boolean hideActivitiesAndActions) { - this.hideActivitiesAndActions = hideActivitiesAndActions; + public void setActivitiesHidden(boolean activitiesHidden) { + this.hideActivitiesAndActions = activitiesHidden; } - public Boolean getHideFilesExplorer() { + public boolean getHideFilesExplorer() { return hideFilesExplorer; } - public void setHideFilesExplorer(Boolean hideFilesExplorer) { + public void setHideFilesExplorer(boolean hideFilesExplorer) { this.hideFilesExplorer = hideFilesExplorer; } - public Boolean getHideActionsMenu() { + public boolean getHideActionsMenu() { return hideActionsMenu; } - public void setHideActionsMenu(Boolean hideActionsMenu) { + public void setHideActionsMenu(boolean hideActionsMenu) { this.hideActionsMenu = hideActionsMenu; } - public Boolean getHideScreenSharing() { + public boolean getHideScreenSharing() { return hideScreenSharing; } - public void setHideScreenSharing(Boolean hideScreenSharing) { + public void setHideScreenSharing(boolean hideScreenSharing) { this.hideScreenSharing = hideScreenSharing; } - public Boolean getHideWhiteboard() { + public boolean getHideWhiteboard() { return hideWhiteboard; } - public void setHideWhiteboard(Boolean hideWhiteboard) { + public void setHideWhiteboard(boolean hideWhiteboard) { this.hideWhiteboard = hideWhiteboard; } - public Boolean getShowMicrophoneStatus() { + public boolean getShowMicrophoneStatus() { return showMicrophoneStatus; } - public void setShowMicrophoneStatus(Boolean showMicrophoneStatus) { + public void setShowMicrophoneStatus(boolean showMicrophoneStatus) { this.showMicrophoneStatus = showMicrophoneStatus; } @@ -522,11 +570,11 @@ public class Room implements Serializabl } } - public Boolean getChatModerated() { + public boolean isChatModerated() { return chatModerated; } - public void setChatModerated(Boolean chatModerated) { + public void setChatModerated(boolean chatModerated) { this.chatModerated = chatModerated; } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.room; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -34,6 +33,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.user.Organisation; import org.simpleframework.xml.Element; import org.simpleframework.xml.Root; @@ -41,30 +41,14 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ @NamedQuery(name = "getAllRoomsOrganisations", query = "select ro from RoomOrganisation ro ORDER BY ro.rooms_organisation_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 " - + "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 " - + "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 " - + "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 " - + "AND c.deleted <> :deleted"), - @NamedQuery(name = "getRoomsOrganisationByRoomsId", query = "select c from RoomOrganisation as c " - + "where c.room.rooms_id = :rooms_id " - + "AND c.deleted <> :deleted") + @NamedQuery(name = "getRoomGroupByGroupIdAndRoomId", query = "select c from RoomOrganisation as c " + + "where c.room.rooms_id = :roomId " + + "AND c.organisation.organisation_id = :groupId " + + "AND c.deleted = false"), }) @Table(name = "rooms_organisation") @Root(name="room_organisation") -public class RoomOrganisation implements Serializable { +public class RoomOrganisation implements IDataProviderEntity { private static final long serialVersionUID = 4153935045968138984L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -116,28 +100,28 @@ public class RoomOrganisation implements this.room = room; } - public Long getRooms_organisation_id() { + public Long getId() { return rooms_organisation_id; } - public void setRooms_organisation_id(Long rooms_organisation_id) { - this.rooms_organisation_id = rooms_organisation_id; + public void setId(Long id) { + this.rooms_organisation_id = id; } - public Date getStarttime() { + public Date getInserted() { return starttime; } - public void setStarttime(Date starttime) { - this.starttime = starttime; + public void setInserted(Date inserted) { + this.starttime = inserted; } - public Date getUpdatetime() { + public Date getUpdated() { return updatetime; } - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; + public void setUpdated(Date updated) { + this.updatetime = 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=1712911&r1=1712910&r2=1712911&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 6 06:18:44 2015 @@ -103,7 +103,7 @@ public class RoomPoll implements Seriali @OneToMany(fetch = FetchType.EAGER, cascade=CascadeType.ALL) @JoinColumn(name = "room_poll_id") @ElementList(name="roompollanswers", required=false) - private List<RoomPollAnswers> roomPollAnswerList; + private List<RoomPollAnswer> roomPollAnswerList; /** * @return the createdBy @@ -153,9 +153,9 @@ public class RoomPoll implements Seriali /** * @return the roomPollAnswerList */ - public List<RoomPollAnswers> getRoomPollAnswerList() { + public List<RoomPollAnswer> getRoomPollAnswerList() { if (roomPollAnswerList == null) { - roomPollAnswerList = new LinkedList<RoomPollAnswers>(); + roomPollAnswerList = new LinkedList<RoomPollAnswer>(); } return roomPollAnswerList; } @@ -164,7 +164,7 @@ public class RoomPoll implements Seriali * @param roomPollAnswerList * the roomPollAnswerList to set */ - public void setRoomPollAnswerList(List<RoomPollAnswers> roomPollAnswerList) { + public void setRoomPollAnswerList(List<RoomPollAnswer> roomPollAnswerList) { this.roomPollAnswerList = roomPollAnswerList; } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.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?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java Fri Nov 6 06:18:44 2015 @@ -44,9 +44,9 @@ import org.simpleframework.xml.Root; + "WHERE rpa.roomPoll.room.rooms_id = :room_id " + "AND rpa.votedUser.user_id = :userid AND rpa.roomPoll.archived = :archived") }) -@Table(name = "room_poll_answers") +@Table(name = "room_poll_answer") @Root(name="roompollanswer") -public class RoomPollAnswers implements Serializable { +public class RoomPollAnswer implements Serializable { private static final long serialVersionUID = 1L; @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=1712911&r1=1712910&r2=1712911&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 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.server; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -47,12 +46,12 @@ import org.simpleframework.xml.Root; }) @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 ldapConfigId; @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() { + public Long getId() { return ldapConfigId; } - public void setLdapConfigId(long ldapConfigId) { - this.ldapConfigId = ldapConfigId; + public void setId(Long id) { + this.ldapConfigId = id; } public String getName() { 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=1712911&r1=1712910&r2=1712911&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 6 06:18:44 2015 @@ -30,19 +30,19 @@ import javax.persistence.Lob; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; +import javax.xml.bind.annotation.XmlRootElement; @Entity @NamedQueries({ @NamedQuery(name = "getSessionById", query = "select c from Sessiondata as c " - + "where c.session_id LIKE :session_id"), + + "where c.session_id LIKE :sessionId"), @NamedQuery(name = "getSessionToDelete", query = "Select c from Sessiondata c " - + "WHERE c.refresh_time < :refresh_time " + "AND ( " - + "c.storePermanent IS NULL " + "OR " - + "c.storePermanent = false " + ")") + + "WHERE c.refresh_time < :refreshed AND c.storePermanent = false") }) @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") @@ -54,18 +54,18 @@ public class Sessiondata implements Seri @Column(name="session_id") private String session_id; - @Column(name="starttermin_time") + @Column(name="created") private Date starttermin_time; - @Column(name="refresh_time") + @Column(name="refreshed") private Date refresh_time; @Lob - @Column(name="sessionXml") + @Column(name="xml") private String sessionXml; - @Column(name="storePermanent") - private Boolean storePermanent; + @Column(name="permanent") + private boolean storePermanent; @Column(name="language_id") private Long language_id; @@ -74,8 +74,6 @@ public class Sessiondata implements Seri private Long organization_id; public Sessiondata() { - super(); - // TODO Auto-generated constructor stub } public Long getId() { @@ -85,60 +83,60 @@ public class Sessiondata implements Seri this.id = id; } - public Date getRefresh_time() { + public Date getRefreshed() { return refresh_time; } - public void setRefresh_time(Date refresh_time) { - this.refresh_time = refresh_time; + public void setRefreshed(Date refreshed) { + this.refresh_time = refreshed; } - public String getSession_id() { + public String getSessionId() { return session_id; } - public void setSession_id(String session_id) { - this.session_id = session_id; + public void setSessionId(String sessionId) { + this.session_id = sessionId; } - public Date getStarttermin_time() { + public Date getCreated() { return starttermin_time; } - public void setStarttermin_time(Date starttermin_time) { - this.starttermin_time = starttermin_time; + public void setCreated(Date created) { + this.starttermin_time = created; } - public Long getUser_id() { + public Long getUserId() { return user_id; } - public void setUser_id(Long user_id) { + public void setUserId(Long user_id) { this.user_id = user_id; } - public String getSessionXml() { + public String getXml() { return sessionXml; } - public void setSessionXml(String sessionXml) { - this.sessionXml = sessionXml; + public void setXml(String xml) { + this.sessionXml = xml; } - public Boolean getStorePermanent() { + public boolean isPermanent() { return storePermanent; } - public void setStorePermanent(Boolean storePermanent) { - this.storePermanent = storePermanent; + public void setPermanent(boolean permanent) { + this.storePermanent = permanent; } - public Long getLanguage_id() { + public Long getLanguageId() { return language_id; } - public void setLanguage_id(Long language_id) { - this.language_id = language_id; + public void setLanguageId(Long languageId) { + this.language_id = languageId; } - public Long getOrganization_id() { + public Long getOrganizationId() { return organization_id; } - public void setOrganization_id(Long organization_id) { - this.organization_id = organization_id; + public void setOrganizationId(Long organizationId) { + this.organization_id = organizationId; } } 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=1712911&r1=1712910&r2=1712911&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 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.user; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -32,18 +31,20 @@ import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.Table; +import org.apache.openmeetings.db.entity.IDataProviderEntity; import org.simpleframework.xml.Element; import org.simpleframework.xml.Root; @Entity @Table(name = "address") @Root(name="address") -public class Address implements Serializable { +public class Address implements IDataProviderEntity { + private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") - private Long adresses_id; + private Long id; @Column(name = "additionalname") @Element(data=true, required=false) @@ -58,14 +59,14 @@ public class Address implements Serializ @Element(data=true, required=false) private String fax; - @Column(name = "starttime") - @Element(data=true, required=false) - private Date starttime; + @Column(name = "inserted") + @Element(name = "starttime",data=true, required=false) + private Date inserted; @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "state_id") @Element(name="state_id", data=true, required=false) - private State states; + private State state; @Column(name = "street") @Element(data=true, required=false) @@ -75,8 +76,8 @@ public class Address implements Serializ @Element(data=true, required=false) private String town; - @Column(name = "updatetime") - private Date updatetime; + @Column(name = "updated") + private Date updated; @Column(name = "zip") @Element(data=true, required=false) @@ -101,12 +102,12 @@ public class Address implements Serializ this.additionalname = additionalname; } - public Long getAdresses_id() { - return adresses_id; + public Long getId() { + return id; } - public void setAdresses_id(Long adresses_id) { - this.adresses_id = adresses_id; + public void setId(Long id) { + this.id = id; } public String getComment() { @@ -125,20 +126,20 @@ public class Address implements Serializ this.fax = fax; } - 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 State getStates() { - return states; + public State getState() { + return state; } - public void setStates(State states) { - this.states = states; + public void setState(State state) { + this.state = state; } public String getStreet() { @@ -157,12 +158,12 @@ public class Address implements Serializ this.town = town; } - 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 String getZip() { @@ -173,7 +174,7 @@ public class Address implements Serializ this.zip = zip; } - public boolean getDeleted() { + public boolean isDeleted() { return deleted; } @@ -199,7 +200,7 @@ public class Address implements Serializ @Override public String toString() { - return "Address [id=" + adresses_id + ", states=" + states + return "Address [id=" + id + ", state=" + state + ", street=" + street + ", town=" + town + ", zip=" + zip + ", deleted=" + deleted + ", email=" + email + ", phone=" + phone + "]"; Modified: 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/Organisation.java?rev=1712911&r1=1712910&r2=1712911&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/Organisation.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.user; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -51,7 +50,7 @@ import org.simpleframework.xml.Root; }) @Table(name = "organisation") @Root(name="organisation") -public class Organisation implements Serializable, IDataProviderEntity { +public class Organisation implements IDataProviderEntity { private static final long serialVersionUID = 1L; @Id @@ -95,11 +94,11 @@ public class Organisation implements Ser this.name = name; } - public Long getOrganisation_id() { + public Long getId() { return organisation_id; } - public void setOrganisation_id(Long organisation_id) { - this.organisation_id = organisation_id; + public void setId(Long id) { + this.organisation_id = id; } public Long getUpdatedby() { Modified: 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/Organisation_Users.java?rev=1712911&r1=1712910&r2=1712911&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/Organisation_Users.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.user; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -48,7 +47,7 @@ import org.simpleframework.xml.Root; }) @Table(name = "organisation_users") @Root(name="user_organisation") -public class Organisation_Users implements Serializable, IDataProviderEntity { +public class Organisation_Users implements IDataProviderEntity { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -92,12 +91,12 @@ public class Organisation_Users implemen this.organisation = organisation; } - public Long getOrganisation_users_id() { + public Long getId() { return organisation_users_id; } - public void setOrganisation_users_id(Long organisation_users_id) { - this.organisation_users_id = organisation_users_id; + public void setId(Long id) { + this.organisation_users_id = id; } public Date getStarttime() { 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=1712911&r1=1712910&r2=1712911&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 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.user; -import java.io.Serializable; import java.util.Date; import javax.persistence.CascadeType; @@ -54,7 +53,7 @@ import org.simpleframework.xml.Root; }) @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; @@ -64,7 +63,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) @@ -148,11 +147,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/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=1712911&r1=1712910&r2=1712911&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 6 06:18:44 2015 @@ -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; + @Element(data=true, name = "privateMessageFolderId") + private Long privateMessageFolderId; @Column(name="folder_name") @Element(data=true) @@ -57,11 +56,11 @@ public class PrivateMessageFolder implem @Column(name="updated") private Date updated; - public long getPrivateMessageFolderId() { + public Long getId() { return privateMessageFolderId; } - public void setPrivateMessageFolderId(long privateMessageFolderId) { - this.privateMessageFolderId = privateMessageFolderId; + public void setId(Long id) { + this.privateMessageFolderId = id; } public String getFolderName() { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.entity.user; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; @@ -30,30 +29,30 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; +import org.apache.openmeetings.db.entity.IDataProviderEntity; + @Entity @NamedQueries({ - @NamedQuery(name = "getStateById", query = "select c from State as c " + - "where c.state_id = :state_id AND c.deleted <> :deleted"), - @NamedQuery(name = "getStates", query = "select c from State as c where c.deleted <> :deleted"), - @NamedQuery(name = "getStateByName", query = "select c from State as c " + - "where lower(c.name) LIKE :name AND c.deleted <> :deleted") + @NamedQuery(name = "getStateById", query = "select c from State as c where c.id = :id AND c.deleted = false"), + @NamedQuery(name = "getStates", query = "select c from State as c where c.deleted = false"), + @NamedQuery(name = "getStateByName", query = "select c from State as c where lower(c.name) LIKE :name AND c.deleted = false") }) @Table(name = "state") -public class State implements Serializable { +public class State implements IDataProviderEntity { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") - private Long state_id; + private Long id; @Column(name = "name") private String name; - @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; @@ -72,31 +71,31 @@ public class State implements Serializab this.name = name; } - public Long getState_id() { - return state_id; + public Long getId() { + return id; } - public void setState_id(Long state_id) { - this.state_id = state_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 getDeleted() { + public boolean isDeleted() { return deleted; } @@ -122,7 +121,7 @@ public class State implements Serializab @Override public String toString() { - return "State [id=" + state_id + ", name=" + name + ", deleted=" + return "State [id=" + id + ", name=" + name + ", deleted=" + deleted + ", shortName=" + shortName + ", code=" + code + "]"; } }
