You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/01/29 08:58:55 UTC
svn commit: r1655544 - in /openmeetings:
branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/
branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/
branches/3.0.x/src/install/java/org/apache/openmeetings/cli/
branches/3.0.x/...
Author: solomax
Date: Thu Jan 29 07:58:55 2015
New Revision: 1655544
URL: http://svn.apache.org/r1655544
Log:
[OPENMEETINGS-547] re-convert is disabled while conversion is in progress
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java Thu Jan 29 07:58:55 2015
@@ -288,7 +288,11 @@ public class FlvRecordingDao {
}
public void resetProcessingStatus() {
- em.createNamedQuery("resetRecordingProcessingStatus").setParameter("error", Status.ERROR).setParameter("processing", Status.PROCESSING).executeUpdate();
+ em.createNamedQuery("resetRecordingProcessingStatus")
+ .setParameter("error", Status.ERROR)
+ .setParameter("recording", Status.RECORDING)
+ .setParameter("converting", Status.CONVERTING)
+ .executeUpdate();
}
public RecordingContainerData getRecordingContainerData(long userId) {
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java Thu Jan 29 07:58:55 2015
@@ -77,7 +77,7 @@ import org.simpleframework.xml.Root;
+ "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 = :processing")
+ , @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 "
+ "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)")
@@ -89,7 +89,8 @@ public class FlvRecording implements Ser
public enum Status {
NONE
- , PROCESSING
+ , RECORDING
+ , CONVERTING
, PROCESSED
, ERROR
}
Modified: openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java (original)
+++ openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java Thu Jan 29 07:58:55 2015
@@ -118,7 +118,7 @@ public abstract class ConnectionProperti
protected static void patchProp(String[] tokens, int idx, String name, String value) {
String prop = tokens[idx].trim();
if (prop.startsWith(name)) {
- prop = name + "=" + StringEscapeUtils.escapeXml(value);
+ prop = name + "=" + StringEscapeUtils.escapeXml10(value);
tokens[idx] = prop;
}
}
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java Thu Jan 29 07:58:55 2015
@@ -102,6 +102,8 @@ public class FlvInterviewConverter exten
try {
flvRecording = recordingDao.get(flvRecordingId);
log.debug("flvRecording " + flvRecording.getFlvRecordingId());
+ flvRecording.setStatus(FlvRecording.Status.CONVERTING);
+ flvRecording = recordingDao.update(flvRecording);
List<ConverterProcessResult> returnLog = new ArrayList<ConverterProcessResult>();
List<String> listOfFullWaveFiles = new LinkedList<String>();
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java Thu Jan 29 07:58:55 2015
@@ -74,6 +74,8 @@ public class FlvRecorderConverter extend
if (screenMetaData.getStreamStatus() == Status.NONE) {
throw new Exception("Stream has not been started, error in recording");
}
+ flvRecording.setStatus(FlvRecording.Status.CONVERTING);
+ flvRecording = recordingDao.update(flvRecording);
screenMetaData = waitForTheStream(screenMetaData.getFlvRecordingMetaDataId());
@@ -193,6 +195,8 @@ public class FlvRecorderConverter extend
log.error("[startConversion]", err);
flvRecording.setStatus(FlvRecording.Status.ERROR);
}
- recordingDao.update(flvRecording);
+ if (flvRecording != null) {
+ recordingDao.update(flvRecording);
+ }
}
}
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java Thu Jan 29 07:58:55 2015
@@ -126,7 +126,7 @@ public class FLVRecorderService implemen
flvRecording.setHeight(currentClient.getVHeight());
flvRecording.setOwnerId(currentClient.getUser_id());
- flvRecording.setStatus(FlvRecording.Status.PROCESSING);
+ flvRecording.setStatus(FlvRecording.Status.RECORDING);
flvRecording = recordingDao.update(flvRecording);
// Receive flvRecordingId
Long flvRecordingId = flvRecording.getFlvRecordingId();
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Thu Jan 29 07:58:55 2015
@@ -865,9 +865,6 @@ public class ScopeApplicationAdapter ext
try {
log.debug("----------- removeModerator: " + publicSID);
- IConnection current = Red5.getConnectionLocal();
- // String streamid = current.getClient().getId();
-
Client currentClient = sessionManager.getClientByPublicSID(publicSID, false, null);
if (currentClient == null) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java Thu Jan 29 07:58:55 2015
@@ -37,7 +37,7 @@ public class RecordingItemPanel extends
super(id, model, treePanel);
FlvRecording r = model.getObject();
long errorCount = getBean(FlvRecordingLogDao.class).countErrors(r.getFlvRecordingId());
- boolean visible = errorCount != 0 || (Status.PROCESSING != r.getStatus() && !isRecordingExists(r.getFileHash() + MP4_EXTENSION));
+ boolean visible = errorCount != 0 || (Status.RECORDING != r.getStatus() && Status.CONVERTING != r.getStatus() && !isRecordingExists(r.getFileHash() + MP4_EXTENSION));
drag.add(new WebMarkupContainer("errors").add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Thu Jan 29 07:58:55 2015
@@ -243,7 +243,7 @@ public class RecordingsPanel extends Use
style = def;
} else if (isRecordingExists(r.getFileHash() + MP4_EXTENSION)) {
style = "recording om-icon";
- } else if (Status.PROCESSING == r.getStatus()) {
+ } else if (Status.RECORDING == r.getStatus() || Status.CONVERTING == r.getStatus()) {
style = "processing-recording om-icon";
} else {
style = "broken-recording om-icon";
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java Thu Jan 29 07:58:55 2015
@@ -137,7 +137,7 @@ public class VideoInfo extends Panel {
}
boolean reConvEnabled = false;
- if (r.getOwnerId() != null && getUserId() == r.getOwnerId() && r.getStatus() != Status.PROCESSING) {
+ if (r.getOwnerId() != null && getUserId() == r.getOwnerId() && r.getStatus() != Status.RECORDING && r.getStatus() != Status.CONVERTING) {
List<FlvRecordingMetaData> metas = getBean(FlvRecordingMetaDataDao.class).getByRecording(r.getFlvRecordingId());
reconvLabel:
if (!metas.isEmpty()) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java Thu Jan 29 07:58:55 2015
@@ -102,6 +102,8 @@ public class FlvInterviewConverter exten
try {
flvRecording = recordingDao.get(flvRecordingId);
log.debug("flvRecording " + flvRecording.getId());
+ flvRecording.setStatus(FlvRecording.Status.CONVERTING);
+ flvRecording = recordingDao.update(flvRecording);
List<ConverterProcessResult> returnLog = new ArrayList<ConverterProcessResult>();
List<String> listOfFullWaveFiles = new LinkedList<String>();
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java Thu Jan 29 07:58:55 2015
@@ -74,6 +74,8 @@ public class FlvRecorderConverter extend
if (screenMetaData.getStreamStatus() == Status.NONE) {
throw new Exception("Stream has not been started, error in recording");
}
+ flvRecording.setStatus(FlvRecording.Status.CONVERTING);
+ flvRecording = recordingDao.update(flvRecording);
screenMetaData = waitForTheStream(screenMetaData.getId());
@@ -193,6 +195,8 @@ public class FlvRecorderConverter extend
log.error("[startConversion]", err);
flvRecording.setStatus(FlvRecording.Status.ERROR);
}
- recordingDao.update(flvRecording);
+ if (flvRecording != null) {
+ recordingDao.update(flvRecording);
+ }
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java Thu Jan 29 07:58:55 2015
@@ -42,7 +42,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
@@ -125,7 +124,7 @@ public class FLVRecorderService implemen
flvRecording.setHeight(currentClient.getVHeight());
flvRecording.setOwnerId(currentClient.getUser_id());
- flvRecording.setStatus(FlvRecording.Status.PROCESSING);
+ flvRecording.setStatus(FlvRecording.Status.RECORDING);
flvRecording = recordingDao.update(flvRecording);
// Receive flvRecordingId
Long flvRecordingId = flvRecording.getId();
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Thu Jan 29 07:58:55 2015
@@ -856,9 +856,6 @@ public class ScopeApplicationAdapter ext
try {
log.debug("----------- removeModerator: " + publicSID);
- IConnection current = Red5.getConnectionLocal();
- // String streamid = current.getClient().getId();
-
Client currentClient = sessionManager.getClientByPublicSID(publicSID, false, null);
if (currentClient == null) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java Thu Jan 29 07:58:55 2015
@@ -255,7 +255,11 @@ public class FlvRecordingDao {
}
public void resetProcessingStatus() {
- em.createNamedQuery("resetRecordingProcessingStatus").setParameter("error", Status.ERROR).setParameter("processing", Status.PROCESSING).executeUpdate();
+ em.createNamedQuery("resetRecordingProcessingStatus")
+ .setParameter("error", Status.ERROR)
+ .setParameter("recording", Status.RECORDING)
+ .setParameter("converting", Status.CONVERTING)
+ .executeUpdate();
}
public RecordingContainerData getRecordingContainerData(long userId) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java Thu Jan 29 07:58:55 2015
@@ -79,7 +79,7 @@ import org.simpleframework.xml.Root;
, @NamedQuery(name = "getRecordingsByOwner", query = "SELECT f FROM FlvRecording 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 FlvRecording f SET f.status = :error WHERE f.status = :processing")
+ , @NamedQuery(name = "resetRecordingProcessingStatus", query = "UPDATE FlvRecording f SET f.status = :error WHERE f.status IN (:recording, :converting)")
, @NamedQuery(name = "getRecordingsAll", query = "SELECT c FROM FlvRecording c LEFT JOIN FETCH c.flvRecordingMetaData ORDER BY c.id")
, @NamedQuery(name = "getRecordingsByExternalRoomTypeAndOwner", query = "SELECT c FROM FlvRecording c, Room r WHERE c.roomId = r.id "
+ "AND r.externalRoomType LIKE :externalRoomType AND c.insertedBy LIKE :insertedBy AND c.deleted = false")
@@ -103,7 +103,8 @@ public class FlvRecording extends FileIt
@XmlType(namespace="org.apache.openmeetings.record")
public enum Status {
NONE
- , PROCESSING
+ , RECORDING
+ , CONVERTING
, PROCESSED
, ERROR
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java Thu Jan 29 07:58:55 2015
@@ -118,7 +118,7 @@ public abstract class ConnectionProperti
protected static void patchProp(String[] tokens, int idx, String name, String value) {
String prop = tokens[idx].trim();
if (prop.startsWith(name)) {
- prop = name + "=" + StringEscapeUtils.escapeXml(value);
+ prop = name + "=" + StringEscapeUtils.escapeXml10(value);
tokens[idx] = prop;
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Thu Jan 29 07:58:55 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.admin.connection;
-import static java.lang.Boolean.TRUE;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getSid;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java Thu Jan 29 07:58:55 2015
@@ -40,7 +40,7 @@ public class FileItemPanel extends Folde
if (model.getObject() instanceof FlvRecording) {
FlvRecording r = (FlvRecording)model.getObject();
long errorCount = getBean(FlvRecordingLogDao.class).countErrors(r.getId());
- boolean visible = errorCount != 0 || (Status.PROCESSING != r.getStatus() && !isRecordingExists(r.getFileHash() + MP4_EXTENSION));
+ boolean visible = errorCount != 0 || (Status.RECORDING != r.getStatus() && Status.CONVERTING != r.getStatus() && !isRecordingExists(r.getFileHash() + MP4_EXTENSION));
errors.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java Thu Jan 29 07:58:55 2015
@@ -109,7 +109,7 @@ public class FileItemTree<T extends File
FlvRecording r = (FlvRecording)f;
if (isRecordingExists(r.getFileHash() + MP4_EXTENSION)) {
style = "recording om-icon";
- } else if (Status.PROCESSING == r.getStatus()) {
+ } else if (Status.RECORDING == r.getStatus() || Status.CONVERTING == r.getStatus()) {
style = "processing-recording om-icon";
} else {
style = "broken-recording om-icon";
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java Thu Jan 29 07:58:55 2015
@@ -121,6 +121,8 @@ public class ActivitiesPanel extends Bas
text = String.format("%s %s %s [%s]", u.getFirstname(), u.getLastname(), WebSession.getString(1367), df.get().format(a.getCreated()));
}
break;
+ case askModeration:
+ break;
}
item.add(new Label("text", text));
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Thu Jan 29 07:58:55 2015
@@ -24,7 +24,6 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getClientTimeZone;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1655544&r1=1655543&r2=1655544&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Thu Jan 29 07:58:55 2015
@@ -137,7 +137,7 @@ public class VideoInfo extends Panel {
}
boolean reConvEnabled = false;
- if (r.getOwnerId() != null && getUserId() == r.getOwnerId() && r.getStatus() != Status.PROCESSING) {
+ if (r.getOwnerId() != null && getUserId() == r.getOwnerId() && r.getStatus() != Status.RECORDING && r.getStatus() != Status.CONVERTING) {
List<FlvRecordingMetaData> metas = getBean(FlvRecordingMetaDataDao.class).getByRecording(r.getId());
reconvLabel:
if (!metas.isEmpty()) {