You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/06/27 10:50:51 UTC
svn commit: r1605992 [1/2] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/
openmeetings-core/src/main/java/org/apa...
Author: solomax
Date: Fri Jun 27 08:50:50 2014
New Revision: 1605992
URL: http://svn.apache.org/r1605992
Log:
[OPENMEETINGS-1030] File tree was refactored/generalized
Added:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html
- copied, changed from r1605990, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
- copied, changed from r1605283, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
- copied unchanged from r1605283, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java
- copied, changed from r1605283, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.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/common/tree/FileTreePanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html
- copied, changed from r1605283, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
- copied, changed from r1605283, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/MyRecordingTreeProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/RecordingTreeProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/chart_pie.png (with props)
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/map.png (with props)
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/photo.png (with props)
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/report.png (with props)
Removed:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingPanel.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.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/servlet/outputhandler/DownloadHandler.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.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/dto/file/RecordingObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.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/backup/BackupExport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java Fri Jun 27 08:50:50 2014
@@ -82,7 +82,7 @@ public abstract class BaseConverter {
}
protected File getStreamFolder(FlvRecording flvRecording) {
- return getStreamsSubDir(flvRecording.getRoom_id());
+ return getStreamsSubDir(flvRecording.getRoomId());
}
protected String getDifference(Date from, Date to) {
@@ -144,12 +144,12 @@ public abstract class BaseConverter {
}
private static File getMetaFlv(FlvRecordingMetaData metaData) {
- File metaDir = getStreamsSubDir(metaData.getFlvRecording().getRoom_id());
+ File metaDir = getStreamsSubDir(metaData.getFlvRecording().getRoomId());
return new File(metaDir, metaData.getStreamName() + ".flv");
}
private static File getMetaFlvSer(FlvRecordingMetaData metaData) {
- File metaDir = getStreamsSubDir(metaData.getFlvRecording().getRoom_id());
+ File metaDir = getStreamsSubDir(metaData.getFlvRecording().getRoomId());
return new File(metaDir, metaData.getStreamName() + ".flv.ser");
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java Fri Jun 27 08:50:50 2014
@@ -29,6 +29,7 @@ import java.util.regex.Pattern;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
@@ -59,7 +60,7 @@ public class FlvExplorerConverter extend
public List<ConverterProcessResult> startConversion(Long fileExplorerItemId, String moviePath) {
List<ConverterProcessResult> returnLog = new ArrayList<ConverterProcessResult>();
try {
- FileExplorerItem fileExplorerItem = fileExplorerItemDaoImpl.getFileExplorerItemsById(fileExplorerItemId);
+ FileExplorerItem fileExplorerItem = fileExplorerItemDaoImpl.get(fileExplorerItemId);
log.debug("fileExplorerItem " + fileExplorerItem.getId());
@@ -83,7 +84,7 @@ public class FlvExplorerConverter extend
String name = "UPLOADFLV_" + fileExplorerItem.getId();
File outputFullFlv = new File(getStreamsHibernateDir(), name + ".flv");
- fileExplorerItem.setIsVideo(true);
+ fileExplorerItem.setType(Type.Video);
String[] argv_fullFLV = new String[] { getPathToFFMPEG(), "-y", "-i", moviePath,
"-ar", "22050", "-acodec", "libmp3lame", "-ab", "32k",
@@ -117,7 +118,7 @@ public class FlvExplorerConverter extend
returnLog.add(ProcessHelper.executeScript("previewUpload ID :: " + fileExplorerItem.getId(), argv_previewFLV));
- fileExplorerItemDaoImpl.updateFileOrFolder(fileExplorerItem);
+ fileExplorerItemDaoImpl.update(fileExplorerItem);
for (ConverterProcessResult returnMap : returnLog) {
flvRecordingLogDaoImpl.addFLVRecordingLog("generateFFMPEG", null, returnMap);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java Fri Jun 27 08:50:50 2014
@@ -32,6 +32,7 @@ import org.apache.openmeetings.core.conv
import org.apache.openmeetings.core.documents.GeneratePDF;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.StoredFile;
@@ -125,11 +126,10 @@ public class FileProcessor {
fileHashName = newFileSystemName + ".flv";
}
- FileExplorerItem fileExplorerItem = fileExplorerItemDao.getFileExplorerItemsById(parentFolderId);
+ FileExplorerItem fileExplorerItem = fileExplorerItemDao.get(parentFolderId);
if (fileExplorerItem != null) {
- if (fileExplorerItem.getIsFolder() == null
- || !fileExplorerItem.getIsFolder()) {
+ if (Type.Folder != fileExplorerItem.getType()) {
parentFolderId = 0L;
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java Fri Jun 27 08:50:50 2014
@@ -27,6 +27,7 @@ import java.util.Locale;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
@@ -46,7 +47,7 @@ public class FileUtils {
long fileSize = 0;
File base = OmFileHelper.getUploadFilesDir();
- if (fileExplorerItem.getIsImage()) {
+ if (Type.Image == fileExplorerItem.getType()) {
File tFile = new File(base, fileExplorerItem.getFileHash());
if (tFile.exists()) {
@@ -60,7 +61,7 @@ public class FileUtils {
}
- if (fileExplorerItem.getIsPresentation()) {
+ if (Type.Presentation == fileExplorerItem.getType()) {
File tFolder = new File(base, fileExplorerItem.getFileHash());
@@ -71,7 +72,7 @@ public class FileUtils {
}
log.debug("calling [1] FileExplorerItemDaoImpl.updateFileOrFolder()");
- fileExplorerItemDao.updateFileOrFolder(fileExplorerItem);
+ fileExplorerItemDao.update(fileExplorerItem);
FileExplorerItem[] childElements = fileExplorerItemDao
.getFileExplorerItemsByParent(fileExplorerItem.getId());
@@ -95,10 +96,10 @@ public class FileUtils {
try {
fileExplorerItem.setOwnerId(users_id);
- fileExplorerItem.setRoom_id(room_id);
+ fileExplorerItem.setRoomId(room_id);
log.debug("calling [2] FileExplorerItemDaoImpl.updateFileOrFolder()");
- fileExplorerItemDao.updateFileOrFolder(fileExplorerItem);
+ fileExplorerItemDao.update(fileExplorerItem);
FileExplorerItem[] childElements = fileExplorerItemDao
.getFileExplorerItemsByParent(fileExplorerItem.getId());
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java Fri Jun 27 08:50:50 2014
@@ -181,8 +181,7 @@ public class ConferenceLibrary implement
return;
}
- FileExplorerItem fileExplorerItem = fileExplorerItemDao
- .getFileExplorerItemsById(fileExplorerItemId);
+ FileExplorerItem fileExplorerItem = fileExplorerItemDao.get(fileExplorerItemId);
ArrayList roomItems = libraryWmlLoader.loadWmlFile(fileExplorerItem.getWmlFilePath());
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=1605992&r1=1605991&r2=1605992&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 Fri Jun 27 08:50:50 2014
@@ -39,6 +39,7 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status;
@@ -119,14 +120,11 @@ public class FLVRecorderService implemen
flvRecording.setFileHash("");
flvRecording.setFileName(roomRecordingName);
flvRecording.setInsertedBy(currentClient.getUser_id());
- flvRecording.setFolder(false);
- flvRecording.setIsImage(false);
- flvRecording.setIsPresentation(false);
- flvRecording.setIsRecording(true);
+ flvRecording.setType(Type.Recording);
flvRecording.setComment(comment);
flvRecording.setIsInterview(isInterview);
- flvRecording.setRoom_id(room_id);
+ flvRecording.setRoomId(room_id);
flvRecording.setRecordStart(now);
flvRecording.setWidth(currentClient.getVWidth());
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java Fri Jun 27 08:50:50 2014
@@ -271,7 +271,7 @@ public class DownloadHandler extends Bas
String fileNameResult = requestedFile;
if (fileExplorerItemId != null && fileExplorerItemId > 0) {
- FileExplorerItem fileExplorerItem = getBean(FileExplorerItemDao.class).getFileExplorerItemsById(fileExplorerItemId);
+ FileExplorerItem fileExplorerItem = getBean(FileExplorerItemDao.class).get(fileExplorerItemId);
if (fileExplorerItem != null) {
fileNameResult = fileExplorerItem.getFileName().substring(0, fileExplorerItem.getFileName().length()-4)
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java Fri Jun 27 08:50:50 2014
@@ -41,6 +41,7 @@ import org.apache.openmeetings.core.remo
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
@@ -122,8 +123,7 @@ public class UploadController extends Ab
uploadCompleteMessage.setAction("newFile");
setFileExplorerItem(uploadCompleteMessage,
- fileExplorerItemDao.getFileExplorerItemsById(
- returnError.getFileExplorerItemId()));
+ fileExplorerItemDao.get(returnError.getFileExplorerItemId()));
uploadCompleteMessage.setHasError(returnError.hasError());
//we only send the complete log to the client if there is really something
@@ -143,15 +143,9 @@ public class UploadController extends Ab
}
public void setFileExplorerItem(UploadCompleteMessage msg, FileExplorerItem fileExplorerItem) {
- if (fileExplorerItem.getIsImage() != null) {
- msg.setIsImage(fileExplorerItem.getIsImage());
- }
- if (fileExplorerItem.getIsVideo() != null) {
- msg.setIsVideo(fileExplorerItem.getIsVideo());
- }
- if (fileExplorerItem.getIsPresentation() != null) {
- msg.setIsPresentation(fileExplorerItem.getIsPresentation());
- }
+ msg.setIsImage(Type.Image == fileExplorerItem.getType());
+ msg.setIsVideo(Type.Video == fileExplorerItem.getType());
+ msg.setIsPresentation(Type.Presentation == fileExplorerItem.getType());
msg.setFileSystemName(fileExplorerItem.getFileName());
msg.setFileHash(fileExplorerItem.getFileHash());
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java Fri Jun 27 08:50:50 2014
@@ -27,7 +27,10 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
+
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -55,18 +58,30 @@ public class FileExplorerItemDao {
fileItem.setFileName(fileName);
fileItem.setFileHash(fileHash);
fileItem.setDeleted(false);
- fileItem.setParentFileExplorerItemId(parentFileExplorerItemId);
+ fileItem.setParentItemId(parentFileExplorerItemId);
fileItem.setOwnerId(ownerId);
- fileItem.setRoom_id(room_id);
+ fileItem.setRoomId(room_id);
fileItem.setInserted(new Date());
fileItem.setInsertedBy(insertedBy);
- fileItem.setIsFolder(isFolder);
- fileItem.setIsImage(isImage);
- fileItem.setIsPresentation(isPresentation);
+ Type t = null;
+ if (isStoredWmlFile) {
+ t = Type.WmlFile;
+ }
+ if (isChart) {
+ t = Type.PollChart;
+ }
+ if (isImage) {
+ t = Type.Image;
+ }
+ if (isPresentation) {
+ t = Type.Presentation;
+ }
+ if (isFolder) {
+ t = Type.Folder;
+ }
+ fileItem.setType(t);
fileItem.setUpdated(new Date());
fileItem.setWmlFilePath(wmlFilePath);
- fileItem.setIsStoredWmlFile(isStoredWmlFile);
- fileItem.setIsChart(isChart);
fileItem.setExternalFileId(externalFileId);
fileItem.setExternalType(externalType);
@@ -98,11 +113,7 @@ public class FileExplorerItemDao {
Long room_id, Long ownerId) {
log.debug(".getFileExplorerItemsByRoomAndOwner() started");
try {
- String hql = "SELECT c FROM FileExplorerItem c WHERE c.deleted = false "
- + "AND c.room_id = :room_id " + "AND c.ownerId = :ownerId "
- + "ORDER BY c.isFolder DESC, c.fileName ";
-
- TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
+ TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFilesByRoomAndOwner", FileExplorerItem.class);
query.setParameter("room_id",room_id);
query.setParameter("ownerId",ownerId);
@@ -119,17 +130,9 @@ public class FileExplorerItemDao {
Long parentFileExplorerItemId) {
log.debug("getFileExplorerItemsByRoom room_id :: "+room_id);
try {
-
- String hql = "SELECT c FROM FileExplorerItem c " +
- "WHERE c.deleted = false " +
- "AND c.room_id = :room_id " +
- "AND c.ownerId IS NULL " +
- "AND c.parentFileExplorerItemId = :parentFileExplorerItemId " +
- "ORDER BY c.isFolder DESC, c.fileName ";
-
- TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("room_id",room_id);
- query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
+ TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFilesByRoom", FileExplorerItem.class);
+ query.setParameter("roomId",room_id);
+ query.setParameter("parentItemId", parentFileExplorerItemId);
FileExplorerItem[] fileExplorerList = query.getResultList().toArray(new FileExplorerItem[0]);
@@ -144,16 +147,9 @@ public class FileExplorerItemDao {
Long parentFileExplorerItemId) {
log.debug(".getFileExplorerItemsByOwner() started");
try {
-
- String hql = "SELECT c FROM FileExplorerItem c "
- + "WHERE c.deleted = false "
- + "AND c.ownerId = :ownerId "
- + "AND c.parentFileExplorerItemId = :parentFileExplorerItemId "
- + "ORDER BY c.isFolder DESC, c.fileName ";
-
- TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
+ TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFilesByOwner", FileExplorerItem.class);
query.setParameter("ownerId",ownerId);
- query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
+ query.setParameter("parentItemId", parentFileExplorerItemId);
FileExplorerItem[] fileExplorerList = query.getResultList().toArray(new FileExplorerItem[0]);
@@ -168,14 +164,8 @@ public class FileExplorerItemDao {
Long parentFileExplorerItemId) {
log.debug(".getFileExplorerItemsByParent() started");
try {
-
- String hql = "SELECT c FROM FileExplorerItem c "
- + "WHERE c.deleted = false "
- + "AND c.parentFileExplorerItemId = :parentFileExplorerItemId "
- + "ORDER BY c.isFolder DESC, c.fileName ";
-
- TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
+ TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFilesByParent", FileExplorerItem.class);
+ query.setParameter("parentItemId", parentFileExplorerItemId);
FileExplorerItem[] fileExplorerList = query.getResultList().toArray(new FileExplorerItem[0]);
@@ -205,7 +195,7 @@ public class FileExplorerItemDao {
return null;
}
- public FileExplorerItem getFileExplorerItemsById(Long fileExplorerItemId) {
+ public FileExplorerItem get(Long fileExplorerItemId) {
try {
TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFileById", FileExplorerItem.class);
@@ -228,12 +218,7 @@ public class FileExplorerItemDao {
log.debug(".getFileExplorerItemsByExternalIdAndType() started");
try {
-
- String hql = "SELECT c FROM FileExplorerItem c "
- + "WHERE c.externalFileId = :externalFileId " +
- "AND c.externalType LIKE :externalType";
-
- TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
+ TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFileExternal", FileExplorerItem.class);
query.setParameter("externalFileId", externalFileId);
query.setParameter("externalType", externalType);
@@ -268,26 +253,16 @@ public class FileExplorerItemDao {
/**
* @param fileExplorerItemId
*/
- public void deleteFileExplorerItem(Long fileExplorerItemId) {
- log.debug(".deleteFileExplorerItem() started");
-
- try {
-
- FileExplorerItem fId = getFileExplorerItemsById(fileExplorerItemId);
-
- fId.setDeleted(true);
- fId.setUpdated(new Date());
+ public void delete(Long fileExplorerItemId) {
+ log.debug(".delete() started");
+ delete(get(fileExplorerItemId));
+ }
+
+ public void delete(FileExplorerItem f) {
+ f.setDeleted(true);
+ f.setUpdated(new Date());
- if (fId.getId() == null) {
- em.persist(fId);
- } else {
- if (!em.contains(fId)) {
- em.merge(fId);
- }
- }
- } catch (Exception ex2) {
- log.error("[deleteFileExplorerItem]: ", ex2);
- }
+ update(f);
}
public void deleteFileExplorerItemByExternalIdAndType(Long externalFilesid, String externalType) {
@@ -304,13 +279,7 @@ public class FileExplorerItemDao {
fId.setDeleted(true);
fId.setUpdated(new Date());
- if (fId.getId() == null) {
- em.persist(fId);
- } else {
- if (!em.contains(fId)) {
- em.merge(fId);
- }
- }
+ update(fId);
} catch (Exception ex2) {
log.error("[deleteFileExplorerItemByExternalIdAndType]: ", ex2);
}
@@ -325,39 +294,28 @@ public class FileExplorerItemDao {
try {
- FileExplorerItem fId = this
- .getFileExplorerItemsById(fileExplorerItemId);
+ FileExplorerItem fId = get(fileExplorerItemId);
fId.setFileName(fileName);
fId.setUpdated(new Date());
- if (fId.getId() == null) {
- em.persist(fId);
- } else {
- if (!em.contains(fId)) {
- em.merge(fId);
- }
- }
+ update(fId);
} catch (Exception ex2) {
log.error("[updateFileOrFolderName]: ", ex2);
}
}
- public void updateFileOrFolder(FileExplorerItem fId) {
- log.debug(".updateFileOrFolder() started");
- try {
- // fId.setUpdated(new Date());
+ public FileExplorerItem update(FileExplorerItem f) {
+ // fId.setUpdated(new Date());
- if (fId.getId() == null) {
- em.persist(fId);
- } else {
- if (!em.contains(fId)) {
- em.merge(fId);
- }
- }
- } catch (Exception ex2) {
- log.error("[updateFileOrFolder]: ", ex2);
- }
+ if (f.getId() == null) {
+ em.persist(f);
+ } else {
+ if (!em.contains(f)) {
+ f = em.merge(f);
+ }
+ }
+ return f;
}
/**
@@ -371,9 +329,9 @@ public class FileExplorerItemDao {
log.debug(".moveFile() started");
try {
- FileExplorerItem fId = getFileExplorerItemsById(fileExplorerItemId);
+ FileExplorerItem fId = get(fileExplorerItemId);
- fId.setParentFileExplorerItemId(parentFileExplorerItemId);
+ fId.setParentItemId(parentFileExplorerItemId);
if (parentFileExplorerItemId == 0) {
if (isOwner) {
@@ -382,7 +340,7 @@ public class FileExplorerItemDao {
} else {
// move to public room folder
fId.setOwnerId(null);
- fId.setRoom_id(room_id);
+ fId.setRoomId(room_id);
}
} else {
fId.setOwnerId(null);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java Fri Jun 27 08:50:50 2014
@@ -49,7 +49,7 @@ public class FieldLanguageDao implements
private EntityManager em;
public long getNextAvailableId() {
- TypedQuery<Long> q = em.createQuery("SELECT MAX(fl.id) from FieldLanguage fl", Long.class);
+ TypedQuery<Long> q = em.createNamedQuery("getNextLanguageId", Long.class);
return q.getSingleResult() + 1L;
}
@@ -66,8 +66,8 @@ public class FieldLanguageDao implements
fl = em.merge(fl);
//Eagerly FETCH values list
- TypedQuery<FieldLanguage> q = em.createQuery("select fl from FieldLanguage fl LEFT JOIN FETCH fl.languageValues WHERE fl.id = :langId", FieldLanguage.class);
- q.setParameter("langId", langId);
+ TypedQuery<FieldLanguage> q = em.createNamedQuery("getFullLanguageById", FieldLanguage.class);
+ q.setParameter("id", langId);
List<FieldLanguage> results = q.getResultList();
return results != null && !results.isEmpty() ? results.get(0) : null;
@@ -79,7 +79,7 @@ public class FieldLanguageDao implements
public void emptyFieldLanguage() {
try {
- TypedQuery<FieldLanguage> q = em.createQuery("delete from FieldLanguage", FieldLanguage.class);
+ TypedQuery<FieldLanguage> q = em.createNamedQuery("deleteAllLanguages", FieldLanguage.class);
q.executeUpdate();
} catch (Exception ex2) {
log.error("[emptyFieldLanguage]: ", ex2);
@@ -102,10 +102,7 @@ public class FieldLanguageDao implements
public FieldLanguage getFieldLanguageById(Long id) {
try {
- String hql = "select c from FieldLanguage as c "
- + "WHERE c.deleted = false "
- + "AND c.id = :id";
- TypedQuery<FieldLanguage> query = em.createQuery(hql, FieldLanguage.class);
+ TypedQuery<FieldLanguage> query = em.createNamedQuery("getLanguageById", FieldLanguage.class);
query.setParameter("id", id);
FieldLanguage fl = null;
try {
@@ -121,8 +118,7 @@ public class FieldLanguageDao implements
public List<FieldLanguage> getLanguages() {
try {
- String hql = "select c from FieldLanguage as c WHERE c.deleted = false ";
- TypedQuery<FieldLanguage> query = em.createQuery(hql, FieldLanguage.class);
+ TypedQuery<FieldLanguage> query = em.createNamedQuery("getLanguages", FieldLanguage.class);
List<FieldLanguage> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
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=1605992&r1=1605991&r2=1605992&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 Fri Jun 27 08:50:50 2014
@@ -76,7 +76,7 @@ public class FlvRecordingDao {
return null;
}
- public FlvRecording getRecordingByHash(String hash) {
+ public FlvRecording getByHash(String hash) {
try {
TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingByHash", FlvRecording.class);
query.setParameter("fileHash", hash);
@@ -92,16 +92,6 @@ public class FlvRecordingDao {
return null;
}
- public List<FlvRecording> getFlvRecordings() {
- try {
- return em.createQuery("SELECT c FROM FlvRecording c WHERE c.deleted = false", FlvRecording.class)
- .getResultList();
- } catch (Exception ex2) {
- log.error("[getFlvRecordings]: ", ex2);
- }
- return null;
- }
-
public List<RecordingObject> getFlvRecordingByExternalUserId(String externalUserId, String externalUserType) {
try {
log.debug("getFlvRecordingByExternalUserId :externalUserId: {}; externalType: {}", externalUserId, externalUserType);
@@ -126,11 +116,7 @@ public class FlvRecordingDao {
log.debug("getFlvRecordingByExternalRoomType :externalRoomType: " + externalRoomType);
- String hql = "SELECT c FROM FlvRecording c, Room r WHERE c.room_id = r.id "
- + "AND r.externalRoomType LIKE :externalRoomType AND c.insertedBy LIKE :insertedBy "
- + "AND c.deleted = false";
-
- TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
+ TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsByExternalRoomTypeAndOwner", FlvRecording.class);
query.setParameter("externalRoomType", externalRoomType);
query.setParameter("insertedBy", insertedBy);
query.setParameter("deleted", true);
@@ -146,11 +132,9 @@ public class FlvRecordingDao {
return null;
}
- public List<FlvRecording> getAllFlvRecordings() {
+ public List<FlvRecording> get() {
try {
- String hql = "SELECT c FROM FlvRecording c LEFT JOIN FETCH c.flvRecordingMetaData ORDER BY c.flvRecordingId";
-
- TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
+ TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsAll", FlvRecording.class);
return query.getResultList();
} catch (Exception ex2) {
@@ -161,15 +145,10 @@ public class FlvRecordingDao {
public List<FlvRecording> getFlvRecordingByExternalRoomType(String externalRoomType) {
try {
-
log.debug("getFlvRecordingByExternalRoomType :externalRoomType: " + externalRoomType);
- String hql = "SELECT c FROM FlvRecording c, Room r " + "WHERE c.room_id = r.id "
- + "AND r.externalRoomType LIKE :externalRoomType " + "AND c.deleted <> :deleted ";
-
- TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
+ TypedQuery<FlvRecording> query = em.createQuery("getRecordingsByExternalRoomType", FlvRecording.class);
query.setParameter("externalRoomType", externalRoomType);
- query.setParameter("deleted", true);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -196,11 +175,7 @@ public class FlvRecordingDao {
public List<FlvRecording> getFlvRecordingByRoomId(Long room_id) {
try {
-
- String hql = "SELECT c FROM FlvRecording c " + "WHERE c.deleted <> :deleted " + "AND c.room_id = :room_id "
- + "ORDER BY c.folder DESC, c.fileName ";
-
- TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
+ TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsByRoom", FlvRecording.class);
query.setParameter("deleted", true);
query.setParameter("room_id", room_id);
@@ -215,14 +190,8 @@ public class FlvRecordingDao {
public List<FlvRecording> getFlvRecordingByParent(Long parentFileExplorerItemId) {
try {
-
- String hql = "SELECT c FROM FlvRecording c " + "WHERE c.deleted <> :deleted "
- + "AND c.parentFileExplorerItemId = :parentFileExplorerItemId "
- + "ORDER BY c.folder DESC, c.fileName ";
-
- TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
- query.setParameter("deleted", true);
- query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
+ TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsByParent", FlvRecording.class);
+ query.setParameter("parentItemId", parentFileExplorerItemId);
List<FlvRecording> flvRecordingList = query.getResultList();
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java Fri Jun 27 08:50:50 2014
@@ -20,11 +20,10 @@ package org.apache.openmeetings.db.dto.f
import java.util.Date;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.record.FlvRecording;
-
public class RecordingObject {
-
private Long id;
private String fileName;
@@ -32,15 +31,12 @@ public class RecordingObject {
private String fileHash;
private String comment;
- private Long parentFileExplorerItemId;
+ private Long parentItemId;
private Long room_id;
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
- private Boolean isFolder;
- private Boolean isImage;
- private Boolean isPresentation;
- private Boolean isRecording;
+ private Type type;
private Date recordStart;
private Date recordEnd;
@@ -75,15 +71,12 @@ public class RecordingObject {
this.fileHash = customObject.getFileHash();
this.comment = customObject.getComment();
- this.parentFileExplorerItemId = customObject.getParentFileExplorerItemId();
- this.room_id = customObject.getRoom_id();
+ this.parentItemId = customObject.getParentItemId();
+ this.room_id = customObject.getRoomId();
this.ownerId = customObject.getOwnerId();//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
- this.isFolder = customObject.isFolder();
- this.isImage = customObject.getIsImage();
- this.isPresentation = customObject.getIsPresentation();
- this.isRecording = customObject.getIsRecording();
+ this.type = customObject.getType();
this.recordStart = customObject.getRecordStart();
this.recordEnd = customObject.getRecordEnd();
@@ -91,7 +84,7 @@ public class RecordingObject {
this.insertedBy = customObject.getInsertedBy();
this.inserted = customObject.getInserted();
this.updated = customObject.getUpdated();
- this.deleted = customObject.getDeleted();
+ this.deleted = customObject.isDeleted();
this.width = customObject.getWidth();
this.height = customObject.getHeight();
@@ -149,12 +142,12 @@ public class RecordingObject {
this.comment = comment;
}
- public Long getParentFileExplorerItemId() {
- return parentFileExplorerItemId;
+ public Long getParentItemId() {
+ return parentItemId;
}
- public void setParentFileExplorerItemId(Long parentFileExplorerItemId) {
- this.parentFileExplorerItemId = parentFileExplorerItemId;
+ public void setParentItemId(Long parentItemId) {
+ this.parentItemId = parentItemId;
}
public Long getRoom_id() {
@@ -173,36 +166,12 @@ public class RecordingObject {
this.ownerId = ownerId;
}
- 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;
- }
-
- public Boolean getIsRecording() {
- return isRecording;
+ public Type getType() {
+ return type;
}
- public void setIsRecording(Boolean isRecording) {
- this.isRecording = isRecording;
+ public void setType(Type type) {
+ this.type = type;
}
public Date getRecordStart() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java Fri Jun 27 08:50:50 2014
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.db.entity.file;
-import java.util.Date;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -29,273 +27,87 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name="getAllFiles", query="SELECT c FROM FileExplorerItem c ORDER BY c.id")
- , @NamedQuery(name="getFileById", query="SELECT c FROM FileExplorerItem c WHERE c.id = :id")
- , @NamedQuery(name="getFileByHash", query="SELECT c FROM FileExplorerItem c WHERE c.fileHash = :fileHash")
+ @NamedQuery(name = "getAllFiles", query = "SELECT c FROM FileExplorerItem c ORDER BY c.id")
+ , @NamedQuery(name = "getFileById", query = "SELECT c FROM FileExplorerItem c WHERE c.id = :id")
+ , @NamedQuery(name = "getFileByHash", query = "SELECT c FROM FileExplorerItem c WHERE c.fileHash = :fileHash")
+ , @NamedQuery(name = "getFilesByRoomAndOwner", query = "SELECT c FROM FileExplorerItem c WHERE c.deleted = false "
+ + " AND c.roomId = :roomId AND c.ownerId = :ownerId ORDER BY c.type ASC, c.fileName ")
+ , @NamedQuery(name = "getFilesByRoom", query = "SELECT c FROM FileExplorerItem c WHERE c.deleted = false AND c.roomId = :roomId " +
+ "AND c.ownerId IS NULL AND c.parentItemId = :parentItemId ORDER BY c.type ASC, c.fileName ")
+ , @NamedQuery(name = "getFilesByOwner", query = "SELECT c FROM FileExplorerItem c WHERE c.deleted = false AND c.ownerId = :ownerId "
+ + "AND c.parentItemId = :parentItemId ORDER BY c.type ASC, c.fileName ")
+ , @NamedQuery(name = "getFilesByParent", query = "SELECT c FROM FileExplorerItem c WHERE c.deleted = false "
+ + "AND c.parentItemId = :parentItemId ORDER BY c.type ASC, c.fileName ")
+ , @NamedQuery(name = "getFileExternal", query = "SELECT c FROM FileExplorerItem c WHERE c.externalFileId = :externalFileId "
+ + "AND c.externalType LIKE :externalType")
})
@Table(name = "fileexploreritem")
@Root
-public class FileExplorerItem implements IDataProviderEntity {
+public class FileExplorerItem extends FileItem {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@Element(data = true, name = "fileExplorerItemId")
private Long id;
-
- @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)
- 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)
- private Boolean isFolder;
-
- @Column(name="is_image")
- @Element(data=true)
- private Boolean isImage;
-
- @Column(name="is_presentation")
- @Element(data=true)
- private Boolean isPresentation;
-
- @Column(name="is_video")
- @Element(data=true, required=false)
- private Boolean isVideo;
-
- @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)
- private Date updated;
-
- @Column(name="deleted")
- @Element(data=true)
- private boolean deleted;
-
- @Column(name="filesize")
- @Element(data=true, required=false)
+
+ @Column(name = "filesize")
+ @Element(data = true, required = false)
private Long fileSize;
-
- @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="wml_file_path")
- @Element(data=true, required = false)
+
+ @Column(name = "wml_file_path")
+ @Element(data = true, required = false)
private String wmlFilePath;
-
- @Column(name="is_stored_wml_file")
- @Element(data=true, required = false)
- private Boolean isStoredWmlFile;
-
- @Column(name="is_chart")
- @Element(data=true, required = false)
- private Boolean isChart;
-
- @Column(name="external_file_id")
- private Long externalFileId;
-
- @Column(name="external_type")
- private String externalType;
-
+ @Column(name = "external_file_id")
+ private Long externalFileId;
+
+ @Column(name = "external_type")
+ private String externalType;
+
public Long getId() {
return id;
}
+
public void setId(Long id) {
this.id = id;
}
-
- 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 getParentFileExplorerItemId() {
- return parentFileExplorerItemId;
- }
- public void setParentFileExplorerItemId(Long parentFileExplorerItemId) {
- this.parentFileExplorerItemId = parentFileExplorerItemId;
- }
-
- public Long getOwnerId() {
- return ownerId;
- }
- public void setOwnerId(Long ownerId) {
- this.ownerId = ownerId;
- }
-
- public Long getRoom_id() {
- return room_id;
- }
- public void setRoom_id(Long room_id) {
- this.room_id = room_id;
- }
-
- 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 getIsVideo() {
- return isVideo;
- }
- public void setIsVideo(Boolean isVideo) {
- this.isVideo = isVideo;
- }
-
- public Boolean getIsPresentation() {
- return isPresentation;
- }
- public void setIsPresentation(Boolean isPresentation) {
- this.isPresentation = isPresentation;
- }
-
- 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 Long getFileSize() {
return fileSize;
}
+
public void setFileSize(Long fileSize) {
this.fileSize = fileSize;
}
-
- 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 getWmlFilePath() {
return wmlFilePath;
}
+
public void setWmlFilePath(String wmlFilePath) {
this.wmlFilePath = wmlFilePath;
}
-
- public Boolean getIsStoredWmlFile() {
- return isStoredWmlFile;
- }
- public void setIsStoredWmlFile(Boolean isStoredWmlFile) {
- this.isStoredWmlFile = isStoredWmlFile;
- }
- public Boolean getIsChart() {
- return isChart;
- }
- public void setIsChart(Boolean isChart) {
- this.isChart = isChart;
- }
-
public Long getExternalFileId() {
return externalFileId;
}
+
public void setExternalFileId(Long externalFileId) {
this.externalFileId = externalFileId;
}
-
+
public String getExternalType() {
return externalType;
}
+
public void setExternalType(String externalType) {
this.externalType = externalType;
}
-
+
}
Added: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java?rev=1605992&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java Fri Jun 27 08:50:50 2014
@@ -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")
+ private Long parentItemId;
+
+ @Column(name = "room_id")
+ @Element(data = true, required = false)
+ 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/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java Fri Jun 27 08:50:50 2014
@@ -30,12 +30,21 @@ import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
+@NamedQueries({
+ @NamedQuery(name = "getNextLanguageId", query = "SELECT MAX(fl.id) FROM FieldLanguage fl")
+ , @NamedQuery(name = "getFullLanguageById", query = "SELECT fl FROM FieldLanguage fl LEFT JOIN FETCH fl.languageValues WHERE fl.id = :id")
+ , @NamedQuery(name = "deleteAllLanguages", query = "DELETE FROM FieldLanguage")
+ , @NamedQuery(name = "getLanguageById", query = "SELECT c FROM FieldLanguage c WHERE c.deleted = false AND c.id = :id")
+ , @NamedQuery(name = "getLanguages", query = "SELECT c FROM FieldLanguage c WHERE c.deleted = false")
+})
@Table(name = "fieldlanguage")
public class FieldLanguage implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
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=1605992&r1=1605991&r2=1605992&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 Fri Jun 27 08:50:50 2014
@@ -41,7 +41,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.openmeetings.db.entity.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
@@ -72,21 +72,30 @@ import org.simpleframework.xml.Root;
+ "WHERE c.insertedBy = u.id AND u.externalUserId = :externalUserId AND u.externalUserType = :externalUserType "
+ "AND c.deleted = false")
, @NamedQuery(name = "getRecordingsPublic", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.ownerId IS NULL "
- + "AND f.organization_id IS NULL AND (f.parentFileExplorerItemId IS NULL OR f.parentFileExplorerItemId = 0) "
- + "ORDER BY f.folder DESC, f.fileName")
+ + "AND f.organization_id IS NULL AND (f.parentItemId IS NULL OR f.parentItemId = 0) "
+ + "ORDER BY f.type DESC, f.fileName")
, @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.fileName")
+ + "AND f.organization_id = :organization_id AND (f.parentItemId IS NULL OR f.parentItemId = 0) "
+ + "ORDER BY f.type DESC, f.fileName")
, @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.fileName ")
+ + "AND (f.parentItemId IS NULL OR f.parentItemId = 0) "
+ + "ORDER BY f.type DESC, f.fileName ")
, @NamedQuery(name = "resetRecordingProcessingStatus", query = "UPDATE FlvRecording f SET f.status = :error WHERE f.status = :processing")
+ , @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")
+ , @NamedQuery(name = "getRecordingsByExternalRoomType", query = "SELECT c FROM FlvRecording c, Room r WHERE c.roomId = r.id "
+ + "AND r.externalRoomType LIKE :externalRoomType AND c.deleted = false")
+ , @NamedQuery(name = "getRecordingsByRoom", query = "SELECT c FROM FlvRecording c WHERE c.deleted = false AND c.roomId = :room_id "
+ + "ORDER BY c.type ASC, c.fileName")
+ , @NamedQuery(name = "getRecordingsByParent", query = "SELECT c FROM FlvRecording c WHERE c.deleted = false AND c.parentItemId = :parentItemId "
+ + "ORDER BY c.type ASC, c.fileName")
})
@Table(name = "flvrecording")
@Root(name = "flvrecording")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
-public class FlvRecording implements IDataProviderEntity {
+public class FlvRecording extends FileItem {
private static final long serialVersionUID = 1L;
@XmlType(namespace="org.apache.openmeetings.record")
@@ -102,53 +111,14 @@ public class FlvRecording implements IDa
@Element(data = true, name = "flvRecordingId")
private Long id;
- @Column(name = "filename")
- @Element(data = true, required = false)
- private String fileName;
-
@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;
@@ -157,21 +127,6 @@ public class FlvRecording implements IDa
@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;
@@ -180,18 +135,6 @@ public class FlvRecording implements IDa
@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;
@@ -240,14 +183,6 @@ public class FlvRecording implements IDa
this.id = id;
}
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
public String getComment() {
return comment;
}
@@ -256,102 +191,6 @@ public class FlvRecording implements IDa
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;
}
@@ -433,30 +272,6 @@ public class FlvRecording implements IDa
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;
}
@@ -496,5 +311,4 @@ public class FlvRecording implements IDa
public void setStatus(Status status) {
this.status = status;
}
-
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Fri Jun 27 08:50:50 2014
@@ -295,7 +295,7 @@ public class BackupExport {
* ##################### Recordings
*/
{
- List<FlvRecording> list = flvRecordingDao.getAllFlvRecordings();
+ List<FlvRecording> list = flvRecordingDao.get();
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Fri Jun 27 08:50:50 2014
@@ -82,7 +82,9 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
import org.apache.openmeetings.db.entity.room.PollType;
@@ -102,7 +104,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
-import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.CalendarPatterns;
@@ -292,7 +293,7 @@ public class BackupImport {
if (u.getLogin() == null) {
continue;
}
- if (u.getType() == Type.contact && u.getLogin().length() < minLoginLength) {
+ if (u.getType() == User.Type.contact && u.getLogin().length() < minLoginLength) {
u.setLogin(UUID.randomUUID().toString());
}
//FIXME: OPENMEETINGS-750
@@ -475,20 +476,11 @@ public class BackupImport {
* ##################### Import Recordings
*/
{
- Registry registry = new Registry();
- Strategy strategy = new RegistryStrategy(registry);
- RegistryMatcher matcher = new RegistryMatcher(); //TODO need to be removed in the later versions
- Serializer serializer = new Persister(strategy, matcher);
-
- matcher.bind(Long.class, LongTransform.class);
- matcher.bind(Integer.class, IntegerTransform.class);
- registry.bind(Date.class, DateConverter.class);
-
- List<FlvRecording> list = readList(serializer, f, "flvRecordings.xml", "flvrecordings", FlvRecording.class, true);
+ List<FlvRecording> list = readRecordingList(f, "flvRecordings.xml", "flvrecordings");
for (FlvRecording fr : list) {
fr.setId(null);
- if (fr.getRoom_id() != null) {
- fr.setRoom_id(roomsMap.get(fr.getRoom_id()));
+ if (fr.getRoomId() != null) {
+ fr.setRoomId(roomsMap.get(fr.getRoomId()));
}
if (fr.getOwnerId() != null) {
fr.setOwnerId(usersMap.get(fr.getOwnerId()));
@@ -601,21 +593,12 @@ public class BackupImport {
* ##################### Import File-Explorer Items
*/
{
- Registry registry = new Registry();
- Strategy strategy = new RegistryStrategy(registry);
- RegistryMatcher matcher = new RegistryMatcher(); //TODO need to be removed in the later versions
- Serializer serializer = new Persister(strategy, matcher);
-
- matcher.bind(Long.class, LongTransform.class);
- matcher.bind(Integer.class, IntegerTransform.class);
- registry.bind(Date.class, DateConverter.class);
-
- List<FileExplorerItem> list = readList(serializer, f, "fileExplorerItems.xml", "fileExplorerItems", FileExplorerItem.class, true);
+ List<FileExplorerItem> list = readFileExplorerItemList(f, "fileExplorerItems.xml", "fileExplorerItems");
for (FileExplorerItem file : list) {
// We need to reset this as openJPA reject to store them otherwise
file.setId(null);
- Long roomId = file.getRoom_id();
- file.setRoom_id(roomsMap.containsKey(roomId) ? roomsMap.get(roomId) : null);
+ Long roomId = file.getRoomId();
+ file.setRoomId(roomsMap.containsKey(roomId) ? roomsMap.get(roomId) : null);
if (file.getOwnerId() != null) {
file.setOwnerId(usersMap.get(file.getOwnerId()));
}
@@ -708,6 +691,128 @@ public class BackupImport {
return null;
}
+ public List<FileExplorerItem> readFileExplorerItemList(File baseDir, String fileName, String listNodeName) throws Exception {
+ List<FileExplorerItem> list = new ArrayList<FileExplorerItem>();
+ File xml = new File(baseDir, fileName);
+ if (xml.exists()) {
+ Registry registry = new Registry();
+ Strategy strategy = new RegistryStrategy(registry);
+ RegistryMatcher matcher = new RegistryMatcher(); //TODO need to be removed in the later versions
+ Serializer ser = new Persister(strategy, matcher);
+
+ matcher.bind(Long.class, LongTransform.class);
+ matcher.bind(Integer.class, IntegerTransform.class);
+ registry.bind(Date.class, DateConverter.class);
+
+ InputNode root = NodeBuilder.read(new FileInputStream(xml));
+ InputNode root1 = NodeBuilder.read(new FileInputStream(xml)); //HACK to handle old isFolder, isImage, isVideo, isRecording, isPresentation, isStoredWmlFile, isChart
+ InputNode listNode = root.getNext();
+ InputNode listNode1 = root1.getNext(); //HACK to handle old isFolder, isImage, isVideo, isRecording, isPresentation, isStoredWmlFile, isChart
+ if (listNodeName.equals(listNode.getName())) {
+ InputNode item = listNode.getNext();
+ InputNode item1 = listNode1.getNext(); //HACK to handle old isFolder, isImage, isVideo, isRecording, isPresentation, isStoredWmlFile, isChart
+ while (item != null) {
+ FileExplorerItem f = ser.read(FileExplorerItem.class, item, false);
+
+ boolean isFolder = false, isImage = false, isVideo = false, isPresentation = false, isStoredWmlFile = false, isChart = false;
+ //HACK to handle old isFolder, isImage, isVideo, isRecording, isPresentation, isStoredWmlFile, isChart
+ do {
+ if ("isChart".equals(item1.getName()) && "true".equals(item1.getValue())) {
+ isChart = true;
+ }
+ if ("isImage".equals(item1.getName()) && "true".equals(item1.getValue())) {
+ isImage = true;
+ }
+ if ("isVideo".equals(item1.getName()) && "true".equals(item1.getValue())) {
+ isVideo = true;
+ }
+ if ("isRecording".equals(item1.getName()) && "true".equals(item1.getValue())) {
+ log.warn("Recording is stored in FileExplorer Items");
+ isVideo = true;
+ }
+ if ("isPresentation".equals(item1.getName()) && "true".equals(item1.getValue())) {
+ isPresentation = true;
+ }
+ if ("isStoredWmlFile".equals(item1.getName()) && "true".equals(item1.getValue())) {
+ isStoredWmlFile = true;
+ }
+ if ("isFolder".equals(item1.getName()) && "true".equals(item1.getValue())) {
+ isFolder = true;
+ }
+ item1 = listNode1.getNext(); //HACK to handle Address inside user
+ } while (item1 != null && !"fileExplorerItem".equals(item1.getName()));
+
+ if (f.getType() == null) {
+ if (isChart) {
+ f.setType(Type.PollChart);
+ }
+ if (isImage) {
+ f.setType(Type.Image);
+ }
+ if (isVideo) {
+ f.setType(Type.Video);
+ }
+ if (isPresentation) {
+ f.setType(Type.Presentation);
+ }
+ if (isStoredWmlFile) {
+ f.setType(Type.WmlFile);
+ }
+ if (isFolder) {
+ f.setType(Type.Folder);
+ }
+ }
+ list.add(f);
+ item = listNode.getNext();
+ }
+ }
+ }
+ return list;
+ }
+
+ public List<FlvRecording> readRecordingList(File baseDir, String fileName, String listNodeName) throws Exception {
+ List<FlvRecording> list = new ArrayList<FlvRecording>();
+ File xml = new File(baseDir, fileName);
+ if (xml.exists()) {
+ Registry registry = new Registry();
+ Strategy strategy = new RegistryStrategy(registry);
+ RegistryMatcher matcher = new RegistryMatcher(); //TODO need to be removed in the later versions
+ Serializer ser = new Persister(strategy, matcher);
+
+ matcher.bind(Long.class, LongTransform.class);
+ matcher.bind(Integer.class, IntegerTransform.class);
+ registry.bind(Date.class, DateConverter.class);
+
+ InputNode root = NodeBuilder.read(new FileInputStream(xml));
+ InputNode root1 = NodeBuilder.read(new FileInputStream(xml)); //HACK to handle old isFolder
+ InputNode listNode = root.getNext();
+ InputNode listNode1 = root1.getNext(); //HACK to handle old isFolder
+ if (listNodeName.equals(listNode.getName())) {
+ InputNode item = listNode.getNext();
+ InputNode item1 = listNode1.getNext(); //HACK to handle old isFolder
+ while (item != null) {
+ FlvRecording r = ser.read(FlvRecording.class, item, false);
+
+ boolean isFolder = false;
+ //HACK to handle old isFolder
+ do {
+ if ("isFolder".equals(item1.getName()) && "true".equals(item1.getValue())) {
+ isFolder = true;
+ }
+ item1 = listNode1.getNext(); //HACK to handle Address inside user
+ } while (item1 != null && !"flvrecording".equals(item1.getName()));
+
+ if (r.getType() == null) {
+ r.setType(isFolder ? FileItem.Type.Folder : FileItem.Type.Recording);
+ }
+ list.add(r);
+ item = listNode.getNext();
+ }
+ }
+ }
+ return list;
+ }
+
public List<User> readUserList(InputStream xml, String listNodeName) throws Exception {
return readUserList(new InputSource(xml), listNodeName);
}
@@ -761,10 +866,10 @@ public class BackupImport {
//HACK to handle external attendee's firstname, lastname, email
boolean contactValid = false;
do {
- if (Type.contact == mm.getUser().getType() && "firstname".equals(item1.getName())) {
+ if (User.Type.contact == mm.getUser().getType() && "firstname".equals(item1.getName())) {
mm.getUser().setFirstname(item1.getValue());
}
- if (Type.contact == mm.getUser().getType() && "lastname".equals(item1.getName())) {
+ if (User.Type.contact == mm.getUser().getType() && "lastname".equals(item1.getName())) {
mm.getUser().setLastname(item1.getValue());
}
if ("email".equals(item1.getName())) {
@@ -813,7 +918,7 @@ public class BackupImport {
//add existence email from database
List<User> users = usersDao.getAllUsers();
for (User u : users){
- if (u.getAdresses() == null || u.getAdresses().getEmail() == null || Type.user != u.getType()) {
+ if (u.getAdresses() == null || u.getAdresses().getEmail() == null || User.Type.user != u.getType()) {
continue;
}
userEmailMap.put(u.getAdresses().getEmail(), -1);
@@ -894,7 +999,7 @@ public class BackupImport {
}
}
// check that email is unique
- if (u.getAdresses() != null && u.getAdresses().getEmail() != null && Type.user == u.getType()) {
+ if (u.getAdresses() != null && u.getAdresses().getEmail() != null && User.Type.user == u.getType()) {
if (userEmailMap.containsKey(u.getAdresses().getEmail())) {
log.warn("Email is duplicated for user " + u.toString());
String updateEmail = "modified_by_import_<" + list.size() + ">" + u.getAdresses().getEmail();
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1605992&r1=1605991&r2=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java Fri Jun 27 08:50:50 2014
@@ -402,7 +402,7 @@ public class Admin {
} else {
invalid += fSize;
}
- } else if (item.getDeleted()) {
+ } else if (item.isDeleted()) {
if (cleanup) {
FileHelper.removeRec(f);
} else {
@@ -412,7 +412,7 @@ public class Admin {
}
missing = 0;
for (FileExplorerItem item : fileDao.getFileExplorerItems()) {
- if (!item.getDeleted() && item.getFileHash() != null && !new File(files, item.getFileHash()).exists()) {
+ if (!item.isDeleted() && item.getFileHash() != null && !new File(files, item.getFileHash()).exists()) {
missing++;
}
}
@@ -439,15 +439,15 @@ public class Admin {
long restSize = sectionSize - size;
FlvRecordingDao recordDao = getApplicationContext(ctxName).getBean(FlvRecordingDao.class);
long[] params = {0, 0}; // [0] == deleted [1] == missing
- for (FlvRecording rec : recordDao.getAllFlvRecordings()) {
- checkRecordingFile(hibernateDir, rec.getFileHash(), rec.getDeleted(), params, cleanup);
- checkRecordingFile(hibernateDir, rec.getAlternateDownload(), rec.getDeleted(), params, cleanup);
- checkRecordingFile(hibernateDir, rec.getPreviewImage(), rec.getDeleted(), params, cleanup);
+ for (FlvRecording rec : recordDao.get()) {
+ checkRecordingFile(hibernateDir, rec.getFileHash(), rec.isDeleted(), params, cleanup);
+ checkRecordingFile(hibernateDir, rec.getAlternateDownload(), rec.isDeleted(), params, cleanup);
+ checkRecordingFile(hibernateDir, rec.getPreviewImage(), rec.isDeleted(), params, cleanup);
}
long invalid = 0;
for (File f : hibernateDir.listFiles()) {
if (f.isFile() && f.getName().endsWith(".flv")) {
- FlvRecording rec = recordDao.getRecordingByHash(f.getName());
+ FlvRecording rec = recordDao.getByHash(f.getName());
if (rec == null) {
cleanUpFile(invalid, cleanup, f);
String name = f.getName().substring(0, f.getName().length() - 5);
Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html (from r1605990, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.html)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html&p1=openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.html&r1=1605990&r2=1605992&rev=1605992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html Fri Jun 27 08:50:50 2014
@@ -20,7 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div wicket:id="container" class="recording dialog errors">
+ <div wicket:id="container" class="dialog errors">
<h3 wicket:id="message"></h3>
<table style="width: 100%">
<tr>