Author: sebawagner
Date: Tue Oct 16 17:33:05 2012
New Revision: 1398894
URL: http://svn.apache.org/viewvc?rev=1398894&view=rev
Log:
OPENMEETINGS-445 seems to fix the backup export side
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
Tue Oct 16 17:33:05 2012
@@ -504,12 +504,10 @@ public class Roommanagement {
public List<Rooms> getBackupRooms() {
try {
- TypedQuery<Rooms> q = em.createQuery("SELECT c FROM
Rooms c LEFT JOIN FETCH c.moderators "
- + "WHERE c.deleted <> true ",
Rooms.class);
-
- return q.getResultList();
- } catch (Exception ex2) {
- log.error("[getBackupRooms]", ex2);
+ return em.createNamedQuery("getBackupRooms",
Rooms.class)
+ .getResultList();
+ } catch (Exception e) {
+ log.error("[getBackupRooms]", e);
}
return null;
}
@@ -1072,6 +1070,7 @@ public class Roommanagement {
if (authLevelManagement.checkUserLevel(user_level)) {
String hql = "SELECT c FROM Rooms_Organisation
c "
+ + "LEFT JOIN FETCH c.room "
+ "WHERE
c.organisation.organisation_id = :organisation_id "
+ "AND c.deleted <> :deleted
AND c.room.deleted <> :deleted "
+ "AND c.organisation.deleted
<> :deleted "
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
Tue Oct 16 17:33:05 2012
@@ -41,11 +41,16 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "getConfigurationByKey", query = "SELECT c
FROM Configuration c WHERE c.conf_key LIKE :conf_key and c.deleted = false"),
- @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c
FROM Configuration c WHERE c.conf_key IN :conf_keys and c.deleted = false"),
+ @NamedQuery(name = "getConfigurationByKey", query = "SELECT c
FROM Configuration c "
+ + "WHERE c.conf_key LIKE :conf_key and
c.deleted = false"),
+ @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c
FROM Configuration c "
+ + "WHERE c.conf_key IN :conf_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") })
+ @NamedQuery(name = "getConfigurationById", query = "SELECT c
FROM Configuration c "
+ + "LEFT JOIN FETCH c.user "
+ + "WHERE c.configuration_id = :configuration_id
and c.deleted = false")
+})
@Table(name = "configuration")
@Root(name = "config")
public class Configuration implements Serializable, OmEntity {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
Tue Oct 16 17:33:05 2012
@@ -145,7 +145,7 @@ public class Appointment implements Seri
private Rooms room;
@Column(name = "icalId")
- @Element(data=true)
+ @Element(data=true, required=false)
private String icalId;
@OneToMany(fetch = FetchType.LAZY)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java
Tue Oct 16 17:33:05 2012
@@ -21,7 +21,6 @@ package org.apache.openmeetings.persiste
import java.io.Serializable;
import java.util.Date;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -116,7 +115,7 @@ public class FileExplorerItem implements
private Integer flvHeight;
@Column(name="preview_image")
- @Element(data=true)
+ @Element(data=true, required = false)
private String previewImage;
@Column(name="wml_file_path")
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java
Tue Oct 16 17:33:05 2012
@@ -42,146 +42,167 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
+/**
+ * An item in the file explorer in the recording section. Can be either:<br/>
+ * <ul>
+ * <li>a conference recording</li>
+ * <li>a interview recording</li>
+ * <li>a folder</li>
+ * </ul>
+ *
+ * Recorded files are situated in: webapps/openmeetings/streams/hibernate.<br/>
+ * The raw recorded files are situated in:
+ * webapps/openmeetings/streams/$ROOM_ID.<br/>
+ *
+ * @author sebawagner
+ *
+ */
@Entity
-@NamedQueries({
- @NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM
FlvRecording f WHERE f.fileHash = :fileHash")
+@NamedQueries({
+ @NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM
FlvRecording f "
+ + "WHERE f.fileHash = :fileHash")
})
@Table(name = "flvrecording")
-@Root(name="flvrecording")
+@Root(name = "flvrecording")
public class FlvRecording implements Serializable {
+
private static final long serialVersionUID = -2234874663310617072L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- @Element(data=true)
+ @Column(name = "id")
+ @Element(data = true)
private long flvRecordingId;
-
- @Column(name="filename")
- @Element(data=true)
+
+ @Column(name = "filename")
+ @Element(data = true)
private String fileName;
-
- @Column(name="alternate_download")
- @Element(data=true)
+
+ @Column(name = "alternate_download")
+ @Element(data = true)
private String alternateDownload;
-
- @Column(name="filehash")
- @Element(data=true, required=false)
+
+ @Column(name = "filehash")
+ @Element(data = true, required = false)
private String fileHash;
-
- @Column(name="comment_field")
- @Element(data=true, required=false)
+
+ @Column(name = "comment_field")
+ @Element(data = true, required = false)
private String comment;
-
- @Column(name="parent_fileexploreritem_id")
- @Element(data=true, required=false)
+
+ @Column(name = "parent_fileexploreritem_id")
+ @Element(data = true, required = false)
private Long parentFileExplorerItemId;
-
- @Column(name="room_id")
- @Element(data=true)
+
+ @Column(name = "room_id")
+ @Element(data = true)
private Long room_id;
-
- @Column(name="owner_id")
- @Element(data=true)
- 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)
+
+ @Column(name = "owner_id")
+ @Element(data = true)
+ 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)
private Boolean isFolder;
-
- @Column(name="is_image")
- @Element(data=true)
+
+ @Column(name = "is_image")
+ @Element(data = true)
private Boolean isImage;
-
- @Column(name="is_presentation")
- @Element(data=true)
+
+ @Column(name = "is_presentation")
+ @Element(data = true)
private Boolean isPresentation;
-
- @Column(name="is_recording")
- @Element(data=true)
+
+ @Column(name = "is_recording")
+ @Element(data = true)
private Boolean isRecording;
-
- @Column(name="record_start")
- @Element(data=true)
+
+ @Column(name = "record_start")
+ @Element(data = true)
private Date recordStart;
-
- @Column(name="record_end")
- @Element(data=true)
+
+ @Column(name = "record_end")
+ @Element(data = true)
private Date recordEnd;
-
- @Column(name="inserted_by")
- @Element(data=true)
+
+ @Column(name = "inserted_by")
+ @Element(data = true)
private Long insertedBy;
-
- @Column(name="inserted")
- @Element(data=true)
+
+ @Column(name = "inserted")
+ @Element(data = true)
private Date inserted;
-
- @Column(name="updated")
+
+ @Column(name = "updated")
private Date updated;
-
- @Column(name="deleted")
- @Element(data=true)
+
+ @Column(name = "deleted")
+ @Element(data = true)
private boolean deleted;
-
- @Column(name="width")
- @Element(data=true)
+
+ @Column(name = "width")
+ @Element(data = true)
private Integer width;
-
- @Column(name="height")
- @Element(data=true)
+
+ @Column(name = "height")
+ @Element(data = true)
private Integer height;
-
- @Column(name="flv_width")
- @Element(data=true, required=false)
+
+ @Column(name = "flv_width")
+ @Element(data = true, required = false)
private Integer flvWidth;
-
- @Column(name="flv_height")
- @Element(data=true, required=false)
+
+ @Column(name = "flv_height")
+ @Element(data = true, required = false)
private Integer flvHeight;
-
- @Column(name="preview_image")
- @Element(data=true)
+
+ @Column(name = "preview_image")
+ @Element(data = true)
private String previewImage;
-
- @Column(name="filesize")
- @Element(data=true, required=false)
+
+ @Column(name = "filesize")
+ @Element(data = true, required = false)
private Long fileSize;
-
- @Column(name="recorder_stream_id")
- @Element(data=true)
+
+ @Column(name = "recorder_stream_id")
+ @Element(data = true, required = false)
private String recorderStreamId;
-
- @Column(name="organization_id")
- @Element(data=true)
+
+ @Column(name = "organization_id")
+ @Element(data = true)
private Long organization_id;
-
- @Column(name="is_interview")
- @Element(data=true)
+
+ @Column(name = "is_interview")
+ @Element(data = true)
private Boolean isInterview;
-
- @Column(name="progress_post_processing")
- @Element(data=true)
+
+ @Column(name = "progress_post_processing")
+ @Element(data = true)
private Integer progressPostProcessing;
-
+
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "flvrecording_id")
- @ElementList(name="flvrecordingmetadatas")
+ @ElementList(name = "flvrecordingmetadatas")
private List<FlvRecordingMetaData> flvRecordingMetaData;
-
- //Not Mapped
+
+ // Not Mapped
@Transient
private Users creator;
-
+
@Transient
private Rooms room;
-
+
@Transient
private List<FlvRecordingLog> flvRecordingLog;
-
+
public long getFlvRecordingId() {
return flvRecordingId;
}
+
public void setFlvRecordingId(long flvRecordingId) {
this.flvRecordingId = flvRecordingId;
}
@@ -189,20 +210,23 @@ public class FlvRecording implements Ser
public String getFileName() {
return fileName;
}
+
public void setFileName(String fileName) {
this.fileName = fileName;
}
-
+
public String getComment() {
return comment;
}
+
public void setComment(String comment) {
this.comment = comment;
}
-
+
public String getFileHash() {
return fileHash;
}
+
public void setFileHash(String fileHash) {
this.fileHash = fileHash;
}
@@ -210,6 +234,7 @@ public class FlvRecording implements Ser
public Long getParentFileExplorerItemId() {
return parentFileExplorerItemId;
}
+
public void setParentFileExplorerItemId(Long parentFileExplorerItemId) {
this.parentFileExplorerItemId = parentFileExplorerItemId;
}
@@ -217,6 +242,7 @@ public class FlvRecording implements Ser
public Long getRoom_id() {
return room_id;
}
+
public void setRoom_id(Long room_id) {
this.room_id = room_id;
}
@@ -224,6 +250,7 @@ public class FlvRecording implements Ser
public Long getOwnerId() {
return ownerId;
}
+
public void setOwnerId(Long ownerId) {
this.ownerId = ownerId;
}
@@ -231,20 +258,23 @@ public class FlvRecording implements Ser
public Boolean getIsFolder() {
return isFolder;
}
+
public void setIsFolder(Boolean isFolder) {
this.isFolder = isFolder;
}
-
+
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;
}
@@ -252,20 +282,23 @@ public class FlvRecording implements Ser
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;
}
@@ -273,20 +306,23 @@ public class FlvRecording implements Ser
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 Long getFileSize() {
return fileSize;
}
+
public void setFileSize(Long fileSize) {
this.fileSize = fileSize;
}
@@ -294,6 +330,7 @@ public class FlvRecording implements Ser
public Date getRecordStart() {
return recordStart;
}
+
public void setRecordStart(Date recordStart) {
this.recordStart = recordStart;
}
@@ -301,70 +338,80 @@ public class FlvRecording implements Ser
public Date getRecordEnd() {
return recordEnd;
}
+
public void setRecordEnd(Date recordEnd) {
this.recordEnd = recordEnd;
}
-
+
public String getRecorderStreamId() {
return recorderStreamId;
}
+
public void setRecorderStreamId(String recorderStreamId) {
this.recorderStreamId = recorderStreamId;
}
-
+
public Long getOrganization_id() {
return organization_id;
}
+
public void setOrganization_id(Long organization_id) {
this.organization_id = organization_id;
}
-
+
public List<FlvRecordingMetaData> getFlvRecordingMetaData() {
return flvRecordingMetaData;
}
+
public void setFlvRecordingMetaData(
List<FlvRecordingMetaData> flvRecordingMetaData) {
this.flvRecordingMetaData = flvRecordingMetaData;
}
-
+
public Users getCreator() {
return creator;
}
+
public void setCreator(Users creator) {
this.creator = creator;
}
-
+
public Rooms getRoom() {
return room;
}
+
public void setRoom(Rooms room) {
this.room = room;
}
-
+
public Integer getWidth() {
return width;
}
+
public void setWidth(Integer width) {
this.width = width;
}
-
+
public Integer getHeight() {
return height;
}
+
public void setHeight(Integer height) {
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;
}
@@ -372,13 +419,15 @@ public class FlvRecording implements Ser
public String getPreviewImage() {
return previewImage;
}
+
public void setPreviewImage(String previewImage) {
this.previewImage = previewImage;
}
-
+
public String getAlternateDownload() {
return alternateDownload;
}
+
public void setAlternateDownload(String alternateDownload) {
this.alternateDownload = alternateDownload;
}
@@ -386,13 +435,15 @@ public class FlvRecording implements Ser
public List<FlvRecordingLog> getFlvRecordingLog() {
return flvRecordingLog;
}
+
public void setFlvRecordingLog(List<FlvRecordingLog> flvRecordingLog) {
this.flvRecordingLog = flvRecordingLog;
}
-
+
public Boolean getIsInterview() {
return isInterview;
}
+
public void setIsInterview(Boolean isInterview) {
this.isInterview = isInterview;
}
@@ -400,9 +451,9 @@ public class FlvRecording implements Ser
public Integer getProgressPostProcessing() {
return progressPostProcessing;
}
+
public void setProgressPostProcessing(Integer progressPostProcessing) {
this.progressPostProcessing = progressPostProcessing;
}
-
-
+
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java
Tue Oct 16 17:33:05 2012
@@ -31,104 +31,119 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.apache.openmeetings.data.flvrecord.listener.async.StreamAudioWriter;
+import org.apache.openmeetings.data.flvrecord.listener.async.StreamVideoWriter;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
+
/**
+ * contains meta data about each stream, for example if it is a sreen sharing
or
+ * audio/video stream. There is also a boolean value
+ * {@link #streamReaderThreadComplete}, as long as this boolean flag is not set
+ * to true, the recording process will not proceed and start to convert all
+ * input sources to a single recording file.
*
+ * @author sebawagner
*/
@Entity
@Table(name = "flvrecording_metadata")
-@Root(name="flvrecordingmetadata")
+@Root(name = "flvrecordingmetadata")
public class FlvRecordingMetaData implements Serializable {
private static final long serialVersionUID = 8444176152324513716L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- @Element(data=true, required=false)
+ @Column(name = "id")
+ @Element(data = true, required = false)
private long flvRecordingMetaDataId;
-
+
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="flvrecording_id", nullable=true)
+ @JoinColumn(name = "flvrecording_id", nullable = true)
private FlvRecording flvRecording;
-
- @Column(name="record_start")
- @Element(data=true)
+
+ @Column(name = "record_start")
+ @Element(data = true)
private Date recordStart;
-
- @Column(name="record_end")
- @Element(data=true, required=false)
+
+ @Column(name = "record_end")
+ @Element(data = true, required = false)
private Date recordEnd;
-
- @Column(name="stream_name")
- @Element(data=true)
+
+ @Column(name = "stream_name")
+ @Element(data = true)
private String streamName;
-
- @Column(name="free_text_user_name")
- @Element(data=true)
+
+ @Column(name = "free_text_user_name")
+ @Element(data = true)
private String freeTextUserName;
-
- @Column(name="is_audio_only")
- @Element(data=true)
+
+ @Column(name = "is_audio_only")
+ @Element(data = true)
private Boolean isAudioOnly;
-
- @Column(name="is_video_only")
- @Element(data=true)
+
+ @Column(name = "is_video_only")
+ @Element(data = true)
private Boolean isVideoOnly;
-
- @Column(name="is_screen_data")
- @Element(data=true)
+
+ @Column(name = "is_screen_data")
+ @Element(data = true)
private Boolean isScreenData;
- @Column(name="inserted_by")
- @Element(data=true, required=false)
+ @Column(name = "inserted_by")
+ @Element(data = true, required = false)
private Long insertedBy;
-
- @Column(name="inserted")
- @Element(data=true)
+
+ @Column(name = "inserted")
+ @Element(data = true)
private Date inserted;
-
- @Column(name="updated")
- @Element(data=true, required=false)
+
+ @Column(name = "updated")
+ @Element(data = true, required = false)
private Date updated;
-
- @Column(name="deleted")
+
+ @Column(name = "deleted")
private boolean deleted;
-
- @Column(name="wav_audio_data")
- @Element(data=true)
+
+ @Column(name = "wav_audio_data")
+ @Element(data = true, required = false)
private String wavAudioData;
-
- @Column(name="full_wav_audio_data")
- @Element(data=true, required=false)
+
+ @Column(name = "full_wav_audio_data")
+ @Element(data = true, required = false)
private String fullWavAudioData;
-
- @Column(name="audio_is_valid")
- @Element(data=true, required=false)
+
+ @Column(name = "audio_is_valid")
+ @Element(data = true, required = false)
private Boolean audioIsValid;
-
- @Column(name="interiew_pod_id")
- @Element(data=true, required=false)
+
+ @Column(name = "interiew_pod_id")
+ @Element(data = true, required = false)
private Integer interiewPodId;
-
- @Column(name="initial_gap_seconds")
- @Element(data=true, required=false)
+
+ @Column(name = "initial_gap_seconds")
+ @Element(data = true, required = false)
private Integer initialGapSeconds;
-
- //this is only true when the asynchronous stream writer has
- //completed to write packets to the file
- @Column(name="stream_reader_thread_complete")
+
+ /**
+ * this is only true when the asynchronous stream writer's have
completed to
+ * write packets to the file.
+ * @see StreamVideoWriter#closeStream()
+ * @see StreamAudioWriter#closeStream()
+ */
+ @Column(name = "stream_reader_thread_complete")
private Boolean streamReaderThreadComplete;
-
+
public long getFlvRecordingMetaDataId() {
return flvRecordingMetaDataId;
}
+
public void setFlvRecordingMetaDataId(long flvRecordingMetaDataId) {
this.flvRecordingMetaDataId = flvRecordingMetaDataId;
}
-
+
public FlvRecording getFlvRecording() {
return flvRecording;
}
+
public void setFlvRecording(FlvRecording flvRecording) {
this.flvRecording = flvRecording;
}
@@ -136,6 +151,7 @@ public class FlvRecordingMetaData implem
public Date getRecordStart() {
return recordStart;
}
+
public void setRecordStart(Date recordStart) {
this.recordStart = recordStart;
}
@@ -143,6 +159,7 @@ public class FlvRecordingMetaData implem
public Date getRecordEnd() {
return recordEnd;
}
+
public void setRecordEnd(Date recordEnd) {
this.recordEnd = recordEnd;
}
@@ -150,34 +167,39 @@ public class FlvRecordingMetaData implem
public String getFreeTextUserName() {
return freeTextUserName;
}
+
public void setFreeTextUserName(String freeTextUserName) {
this.freeTextUserName = freeTextUserName;
}
-
+
public Boolean getIsAudioOnly() {
return isAudioOnly;
}
+
public void setIsAudioOnly(Boolean isAudioOnly) {
this.isAudioOnly = isAudioOnly;
}
-
+
public Boolean getIsVideoOnly() {
return isVideoOnly;
}
+
public void setIsVideoOnly(Boolean isVideoOnly) {
this.isVideoOnly = isVideoOnly;
}
-
+
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;
}
@@ -185,20 +207,23 @@ public class FlvRecordingMetaData implem
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 Boolean getIsScreenData() {
return isScreenData;
}
+
public void setIsScreenData(Boolean isScreenData) {
this.isScreenData = isScreenData;
}
@@ -206,27 +231,31 @@ public class FlvRecordingMetaData implem
public String getStreamName() {
return streamName;
}
+
public void setStreamName(String streamName) {
this.streamName = streamName;
}
-
+
public String getWavAudioData() {
return wavAudioData;
}
+
public void setWavAudioData(String wavAudioData) {
this.wavAudioData = wavAudioData;
}
-
+
public String getFullWavAudioData() {
return fullWavAudioData;
}
+
public void setFullWavAudioData(String fullWavAudioData) {
this.fullWavAudioData = fullWavAudioData;
}
-
+
public Boolean getAudioIsValid() {
return audioIsValid;
}
+
public void setAudioIsValid(Boolean audioIsValid) {
this.audioIsValid = audioIsValid;
}
@@ -234,20 +263,23 @@ public class FlvRecordingMetaData implem
public Integer getInteriewPodId() {
return interiewPodId;
}
+
public void setInteriewPodId(Integer interiewPodId) {
this.interiewPodId = interiewPodId;
}
-
+
public Integer getInitialGapSeconds() {
return initialGapSeconds;
}
+
public void setInitialGapSeconds(Integer initialGapSeconds) {
this.initialGapSeconds = initialGapSeconds;
}
-
+
public Boolean getStreamReaderThreadComplete() {
return streamReaderThreadComplete;
}
+
public void setStreamReaderThreadComplete(Boolean
streamReaderThreadComplete) {
this.streamReaderThreadComplete = streamReaderThreadComplete;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
Tue Oct 16 17:33:05 2012
@@ -48,7 +48,13 @@ import org.simpleframework.xml.ElementLi
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({ @NamedQuery(name = "getNondeletedRooms", query = "SELECT u
FROM Rooms u WHERE u.deleted = false") })
+@NamedQueries({
+ @NamedQuery(name = "getNondeletedRooms", query = "SELECT u FROM Rooms u
"
+ + "WHERE u.deleted = false"),
+ @NamedQuery(name = "getBackupRooms", query = "SELECT c FROM Rooms c "
+ + "LEFT JOIN FETCH c.moderators "
+ + "WHERE c.deleted <> true ")
+})
@Table(name = "rooms")
@Root(name = "room")
public class Rooms implements Serializable, OmEntity {
@@ -203,13 +209,13 @@ public class Rooms implements Serializab
@OneToMany(fetch = FetchType.LAZY)
@JoinColumn(name = "roomId")
- @ElementList(name = "room_moderators")
+ @ElementList(name = "room_moderators", required=false)
private List<RoomModerators> moderators;
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "rooms_id", insertable = true, updatable = true)
- @ElementList(name = "organisations")
@ElementDependent
+ @org.simpleframework.xml.Transient
private List<Rooms_Organisation> roomOrganisations = new
ArrayList<Rooms_Organisation>();
/*
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
Tue Oct 16 17:33:05 2012
@@ -164,8 +164,8 @@ public class ConferenceService {
}
/**
- * gets all rooms of an organisation TODO:check if the requesting user
is
- * also member of that organisation
+ * gets all rooms of an organization TODO:check if the requesting user
is
+ * also member of that organization
*
* @param SID
* @param organisation_id
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java?rev=1398894&r1=1398893&r2=1398894&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
Tue Oct 16 17:33:05 2012
@@ -195,7 +195,7 @@ public class BackupExport {
}
/*
- * ##################### Backup Appointements
+ * ##################### Backup Appointments
*/
{
List<Appointment> list =
appointmentDao.getAppointments();
@@ -332,7 +332,7 @@ public class BackupExport {
*/
{
List<Configuration> list =
configurationDaoImpl.getConfigurations(
- 0, Integer.MAX_VALUE, "conf_key", true);
+ 0, Integer.MAX_VALUE,
"c.configuration_id", true);
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
