Author: solomax
Date: Mon Apr 23 04:55:29 2012
New Revision: 1329064
URL: http://svn.apache.org/viewvc?rev=1329064&view=rev
Log:
OPENMEETINGS-111 basic file statistics is added
OPENMEETINGS-211 NPE is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileProcessor.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileUtils.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/BaseConverter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/record/WhiteboardMapToSVG.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateImage.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GeneratePDF.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceLibrary.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/DownloadHandler.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ExportToImage.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java
Mon Apr 23 04:55:29 2012
@@ -1,7 +1,10 @@
package org.openmeetings.app;
public class OpenmeetingsVariables {
+ public static final String UPLOAD_DIR = "upload";
+ public static final String UPLOAD_TEMP_DIR = "uploadtemp";
+ public static final String STREAMS_DIR = "streams";
+
public static String webAppRootKey = null;
public static String webAppRootPath = null;
-
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Mon Apr 23 04:55:29 2012
@@ -383,14 +383,14 @@ public class AppointmentLogic {
* Sending Reminder in Simple mail format 5 minutes before Meeting
begins
*/
//
----------------------------------------------------------------------------------------------
- public void doScheduledMeetingReminder() {
+ public void doScheduledMeetingReminder() throws Exception {
// log.debug("doScheduledMeetingReminder");
Integer minutesReminderSend = cfgManagement.getConfValue(
"number.minutes.reminder.send", Integer.class,
""
+
DEFAULT_MINUTES_REMINDER_SEND);
if (minutesReminderSend == null) {
- new Exception("minutesReminderSend is null!");
+ throw new Exception("minutesReminderSend is null!");
}
if (minutesReminderSend == 0) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileProcessor.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileProcessor.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileProcessor.java
Mon Apr 23 04:55:29 2012
@@ -60,7 +60,7 @@ public class FileProcessor {
private void prepareFolderStructure(String current_dir) throws
Exception {
- this.workingDir = current_dir + "upload" + File.separatorChar
+ this.workingDir = current_dir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ "files" +
File.separatorChar;
// System.out.println("IS SYSTEM PROFILE");
@@ -70,7 +70,7 @@ public class FileProcessor {
localFolder.mkdir();
}
- this.working_dirppt = current_dir + "uploadtemp" +
File.separatorChar
+ this.working_dirppt = current_dir +
OpenmeetingsVariables.UPLOAD_TEMP_DIR + File.separatorChar
+ "files" + File.separatorChar;
// add Temp Folder Structure
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileUtils.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileUtils.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileUtils.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/FileUtils.java
Mon Apr 23 04:55:29 2012
@@ -23,6 +23,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
@@ -48,19 +49,15 @@ public class FileUtils {
long fileSize = 0;
+ File base = new File(new
File(ScopeApplicationAdapter.webAppPath, OpenmeetingsVariables.UPLOAD_DIR),
"files");
if (fileExplorerItem.getIsImage()) {
- File tFile = new
File(ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload"
+ File.separatorChar
- + "files" + File.separatorChar
- +
fileExplorerItem.getFileHash());
+ File tFile = new File(base,
fileExplorerItem.getFileHash());
if (tFile.exists()) {
fileSize += tFile.length();
}
- File thumbFile = new
File(ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload"
+ File.separatorChar
- + "files" + File.separatorChar
+ "_thumb_"
+ File thumbFile = new File(base, "_thumb_"
+
fileExplorerItem.getFileHash());
if (thumbFile.exists()) {
fileSize += thumbFile.length();
@@ -70,13 +67,10 @@ public class FileUtils {
if (fileExplorerItem.getIsPresentation()) {
- File tFolder = new
File(ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload"
+ File.separatorChar
- + "files" + File.separatorChar
- +
fileExplorerItem.getFileHash());
+ File tFolder = new File(base,
fileExplorerItem.getFileHash());
if (tFolder.exists()) {
- fileSize += this.getDirSize(tFolder);
+ fileSize += getSize(tFolder);
}
}
@@ -102,7 +96,16 @@ public class FileUtils {
return 0;
}
- public long getDirSize(File dir) {
+ public static String getHumanSize(File dir) {
+ long size = getSize(dir);
+
+ if(size <= 0) return "0";
+ final String[] units = new String[] { "B", "KB", "MB", "GB",
"TB" };
+ int digitGroups = (int) (Math.log10(size)/Math.log10(1024));
+ return new DecimalFormat("#,##0.#").format(size/Math.pow(1024,
digitGroups)) + " " + units[digitGroups];
+ }
+
+ public static long getSize(File dir) {
long size = 0;
if (dir.isFile()) {
size = dir.length();
@@ -113,12 +116,11 @@ public class FileUtils {
if (file.isFile()) {
size += file.length();
} else {
- size += this.getDirSize(file);
+ size += getSize(file);
}
}
}
-
return size;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/BaseConverter.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/BaseConverter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/BaseConverter.java
Mon Apr 23 04:55:29 2012
@@ -92,7 +92,7 @@ public abstract class BaseConverter {
protected String getStreamFolderName(String name) {
String streamFolderName = ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "streams" +
File.separatorChar
+ + File.separatorChar +
OpenmeetingsVariables.STREAMS_DIR + File.separatorChar
+ name + File.separatorChar;
log.debug("###################################################");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
Mon Apr 23 04:55:29 2012
@@ -72,7 +72,7 @@ public abstract class BaseStreamWriter i
private void init() throws IOException {
File folder = new File(ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "streams" +
File.separatorChar
+ + File.separatorChar +
OpenmeetingsVariables.STREAMS_DIR + File.separatorChar
+ this.scope.getName());
if (!folder.exists()) {
@@ -80,7 +80,7 @@ public abstract class BaseStreamWriter i
}
String flvName = ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "streams" +
File.separatorChar
+ + File.separatorChar +
OpenmeetingsVariables.STREAMS_DIR + File.separatorChar
+ this.scope.getName() + File.separatorChar +
this.streamName
+ ".flv";
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/record/WhiteboardMapToSVG.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/record/WhiteboardMapToSVG.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/record/WhiteboardMapToSVG.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/record/WhiteboardMapToSVG.java
Mon Apr 23 04:55:29 2012
@@ -231,7 +231,7 @@ public class WhiteboardMapToSVG extends
String fileItemName = graphObject.get(3).toString();
String imageFilePath =
ScopeApplicationAdapter.webAppPath + File.separatorChar +
-
"upload" + File.separatorChar + room + File.separatorChar;
+ OpenmeetingsVariables.UPLOAD_DIR +
File.separatorChar + room + File.separatorChar;
if (parentPath.length() > 1) {
imageFilePath += parentPath +
File.separatorChar;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateImage.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateImage.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateImage.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateImage.java
Mon Apr 23 04:55:29 2012
@@ -60,9 +60,9 @@ public class GenerateImage {
HashMap<String, HashMap<String, String>> returnMap = new
HashMap<String, HashMap<String, String>>();
- String working_imgdir = current_dir + "upload" +
File.separatorChar
+ String working_imgdir = current_dir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ roomName + File.separatorChar;
- String working_pptdir = current_dir + "uploadtemp" +
File.separatorChar
+ String working_pptdir = current_dir +
OpenmeetingsVariables.UPLOAD_TEMP_DIR + File.separatorChar
+ roomName + File.separatorChar;
String fileFullPath = working_pptdir + fileName + fileExt;
@@ -104,11 +104,11 @@ public class GenerateImage {
HashMap<String, HashMap<String, String>> returnMap = new
HashMap<String, HashMap<String, String>>();
- String working_imgdir = current_dir + "upload" +
File.separatorChar
+ String working_imgdir = current_dir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ "profiles" + File.separatorChar
+ ScopeApplicationAdapter.profilesPrefix +
users_id
+ File.separatorChar;
- String working_pptdir = current_dir + "uploadtemp" +
File.separatorChar
+ String working_pptdir = current_dir +
OpenmeetingsVariables.UPLOAD_TEMP_DIR + File.separatorChar
+ "profiles" + File.separatorChar
+ ScopeApplicationAdapter.profilesPrefix +
users_id
+ File.separatorChar;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GeneratePDF.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GeneratePDF.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GeneratePDF.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GeneratePDF.java
Mon Apr 23 04:55:29 2012
@@ -52,9 +52,9 @@ public class GeneratePDF {
HashMap<String, String> processPDF = new HashMap<String,
String>();
processPDF.put("process", "processPDF");
- String working_imgdir = current_dir + "upload" +
File.separatorChar
+ String working_imgdir = current_dir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ roomName + File.separatorChar;
- String working_pptdir = current_dir + "uploadtemp" +
File.separatorChar
+ String working_pptdir = current_dir +
OpenmeetingsVariables.UPLOAD_TEMP_DIR + File.separatorChar
+ roomName + File.separatorChar;
String fileFullPath = working_pptdir + fileName + fileExt;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceLibrary.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceLibrary.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceLibrary.java
Mon Apr 23 04:55:29 2012
@@ -91,7 +91,7 @@ public class ConferenceLibrary implement
if (authLevelManagement.checkUserLevel(user_level)) {
String current_dir =
ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload";
+ + File.separatorChar +
OpenmeetingsVariables.UPLOAD_DIR;
String working_dir = current_dir +
File.separatorChar + "files"
+ File.separatorChar +
parentFolder;
log.debug("############# working_dir : " +
working_dir);
@@ -146,7 +146,7 @@ public class ConferenceLibrary implement
log.debug("saveAsObject" + tObject.size());
String current_dir =
ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload"
+ File.separatorChar;
+ + File.separatorChar +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar;
log.debug("### this is my working directory: "
+ current_dir);
@@ -203,7 +203,7 @@ public class ConferenceLibrary implement
}
String current_dir =
ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload"
+ File.separatorChar;
+ + File.separatorChar +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar;
log.debug("### this is my working directory: "
+ current_dir);
FileExplorerItem fileExplorerItem =
fileExplorerItemDao
@@ -291,7 +291,7 @@ public class ConferenceLibrary implement
if (authLevelManagement.checkUserLevel(user_level)) {
String roomName = room_id.toString();
String current_dir =
ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload"
+ File.separatorChar
+ + File.separatorChar +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ roomName + File.separatorChar;
log.debug("### this is my working directory: "
+ current_dir);
@@ -481,7 +481,7 @@ public class ConferenceLibrary implement
String streamFolderName =
ScopeApplicationAdapter.webAppPath
+ File.separatorChar
- + "streams"
+ +
OpenmeetingsVariables.STREAMS_DIR
+ File.separatorChar
+ "hibernate"
+ File.separatorChar;
@@ -491,7 +491,7 @@ public class ConferenceLibrary implement
String targetFolderName =
ScopeApplicationAdapter.webAppPath
+ File.separatorChar
- + "streams"
+ +
OpenmeetingsVariables.STREAMS_DIR
+ File.separatorChar +
room_id + File.separatorChar;
File targetFolder = new
File(targetFolderName);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
Mon Apr 23 04:55:29 2012
@@ -381,7 +381,7 @@ public class FLVRecorderService implemen
BaseStreamListener listenerAdapter =
streamListeners.get(flvRecordingMetaDataId);
if (listenerAdapter == null) {
- new IllegalStateException("Could not find
Listener to stop!");
+ throw new IllegalStateException("Could not find
Listener to stop!");
}
log.debug("Stream Closing :: " +
flvRecordingMetaDataId);
@@ -591,8 +591,8 @@ public class FLVRecorderService implemen
// FIXME: Is there really a need to stop it
manually if the user
// just stops the stream?
- stopRecordingShow(conn,
String.valueOf(rcl.getBroadCastID())
- .toString(),
rcl.getFlvRecordingMetaDataId());
+ stopRecordingShow(conn,
String.valueOf(rcl.getBroadCastID()),
+
rcl.getFlvRecordingMetaDataId());
// Update Meta Data
this.flvRecordingMetaDataDao
@@ -969,7 +969,7 @@ public class FLVRecorderService implemen
long fileSize = 0;
File tFile = new File(ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "streams" +
File.separatorChar
+ + File.separatorChar +
OpenmeetingsVariables.STREAMS_DIR + File.separatorChar
+ "hibernate" + File.separatorChar
+ baseFlvRecording.getFileHash());
if (tFile.exists()) {
@@ -977,7 +977,7 @@ public class FLVRecorderService implemen
}
File dFile = new File(ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "streams" +
File.separatorChar
+ + File.separatorChar +
OpenmeetingsVariables.STREAMS_DIR + File.separatorChar
+ "hibernate" + File.separatorChar
+
baseFlvRecording.getAlternateDownload());
if (dFile.exists()) {
@@ -985,7 +985,7 @@ public class FLVRecorderService implemen
}
File iFile = new File(ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "streams" +
File.separatorChar
+ + File.separatorChar +
OpenmeetingsVariables.STREAMS_DIR + File.separatorChar
+ "hibernate" + File.separatorChar
+ baseFlvRecording.getPreviewImage());
if (iFile.exists()) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Mon Apr 23 04:55:29 2012
@@ -125,7 +125,7 @@ public class ScopeApplicationAdapter ext
// System.out.println("Custom Webapp start UP "+new
Date());
webAppPath =
scope.getResource("/").getFile().getAbsolutePath();
- batchFileFir = webAppPath + File.separatorChar +
"streams"
+ batchFileFir = webAppPath + File.separatorChar +
OpenmeetingsVariables.STREAMS_DIR
+ File.separatorChar;
log.debug("webAppPath : " + webAppPath);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
Mon Apr 23 04:55:29 2012
@@ -26,19 +26,15 @@ import java.net.URLConnection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
import javax.servlet.ServletContext;
-import javax.xml.stream.XMLStreamException;
-import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.basic.files.TestObject;
import org.openmeetings.app.data.file.FileProcessor;
import org.openmeetings.app.data.file.FileUtils;
import org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl;
@@ -647,7 +643,7 @@ public class FileWebService {
if
(authLevelManagement.checkWebServiceLevel(user_level)) {
String current_dir =
ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload";
+ + File.separatorChar +
OpenmeetingsVariables.UPLOAD_DIR;
String working_dir = current_dir +
File.separatorChar + "files"
+ File.separatorChar +
parentFolder;
log.debug("############# working_dir : " +
working_dir);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
Mon Apr 23 04:55:29 2012
@@ -25,11 +25,11 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.Parser;
import org.apache.commons.cli.PosixParser;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
+import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.app.data.file.FileUtils;
import org.openmeetings.app.documents.InstallationDocumentHandler;
import org.openmeetings.app.installation.ImportInitvalues;
import org.openmeetings.app.installation.InstallationConfig;
-import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.servlet.outputhandler.BackupExport;
import org.openmeetings.servlet.outputhandler.BackupImportController;
@@ -238,6 +238,7 @@ public class Admin {
String ctxName = System.getProperty("context", "openmeetings");
File home = new File(System.getenv("RED5_HOME"));
File omHome = new File(new File(home, "webapps"), ctxName);
+ File omUploadTemp = new File(omHome,
OpenmeetingsVariables.UPLOAD_TEMP_DIR);
Parser parser = new PosixParser();
CommandLine cmdl = null;
@@ -352,7 +353,7 @@ public class Admin {
System.out.println("File name
was not specified, '" + file + "' will be used");
}
boolean includeFiles =
Boolean.getBoolean(cmdl.getOptionValue("exclude-files", "true"));
- File backup_dir = new File(omHome,
"uploadtemp/" + System.currentTimeMillis());
+ File backup_dir = new
File(omUploadTemp, "" + System.currentTimeMillis());
backup_dir.mkdirs();
BackupExport export =
getApplicationContext(ctxName).getBean(BackupExport.class);
@@ -380,17 +381,35 @@ public class Admin {
break;
case files:
try {
+ File omUpload = new File(omHome,
OpenmeetingsVariables.UPLOAD_DIR);
+ File omStreams = new File(omHome,
OpenmeetingsVariables.STREAMS_DIR);
+ System.out.println("Temporary upload
files allocates: " + FileUtils.getHumanSize(omUploadTemp));
+ System.out.println("Upload allocates: "
+ FileUtils.getHumanSize(omUpload));
+ System.out.println("Recordings
allocates: " + FileUtils.getHumanSize(omStreams));
+ /*
+ omHome
+
ClassPathXmlApplicationContext ctx =
getApplicationContext(ctxName);
//user pictures
-
//dist/red5/webapps/openmeetings/upload/profiles
+
//dist/red5/webapps/openmeetings/upload/profiles/profile_<id> (check if ends
with filename)
UsersDaoImpl udao =
ctx.getBean(UsersDaoImpl.class);
for (Users u :
udao.getAllUsersDeleted()) {
System.out.println("id == " +
u.getUser_id() + "; deleted ? " + u.getDeleted() + "; uri -> " +
u.getPictureuri());
}
- //public files
- //private files
- //public recordings
- //private recordings
+
+ */
+ //Upload backup ???
+
+ //Upload import ???
+
+ //public/private files
+ //Object: fileexploreritem (filehash ==
document file/folder)
+ //webapps/openmeetings/upload/files
(check if ends with filename)
+
+ //public/private recordings
+ //Object: flvrecording
+
//webapps/openmeetings/streams/<room_id>/rec_<id>*
-->temporary files
+
//webapps/openmeetings/streams/hibernate/flvRecording_<id>* -->files
} catch (Exception e) {
handleError("Files failed", e);
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
Mon Apr 23 04:55:29 2012
@@ -359,8 +359,7 @@ public class BackupExport {
targetDir.mkdir();
}
- File sourceDir = new File(omFilesDir + "upload"
- + File.separatorChar);
+ File sourceDir = new File(omFilesDir,
OpenmeetingsVariables.UPLOAD_DIR);
File[] files = sourceDir.listFiles();
for (File file : files) {
@@ -387,7 +386,7 @@ public class BackupExport {
targetDirRec.mkdir();
}
- File sourceDirRec = new File(omFilesDir + "streams"
+ File sourceDirRec = new File(omFilesDir,
OpenmeetingsVariables.STREAMS_DIR
+ File.separatorChar + "hibernate" +
File.separatorChar);
copyDirectory(sourceDirRec, targetDirRec);
@@ -447,8 +446,7 @@ public class BackupExport {
*/
String current_dir =
servletCtx.getRealPath("/");
- File working_dir = new
File(current_dir, "upload"
- + File.separatorChar +
"backup");
+ File working_dir = new File(new
File(current_dir, OpenmeetingsVariables.UPLOAD_DIR), "backup");
if (!working_dir.exists()) {
working_dir.mkdir();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Mon Apr 23 04:55:29 2012
@@ -150,7 +150,7 @@ public class BackupImportController exte
};
public void performImport(InputStream is, String current_dir) throws
Exception {
- File working_dir = new File(current_dir, "upload"
+ File working_dir = new File(current_dir,
OpenmeetingsVariables.UPLOAD_DIR
+ File.separatorChar + "import");
if (!working_dir.exists()) {
working_dir.mkdir();
@@ -2178,7 +2178,7 @@ public class BackupImportController exte
// Now check the room files and import them
File roomFilesFolder = new File(importBaseDir, "roomFiles");
- String library_dir = current_dir + "upload" +
File.separatorChar;
+ String library_dir = current_dir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar;
log.debug("roomFilesFolder PATH " +
roomFilesFolder.getAbsolutePath());
@@ -2301,7 +2301,7 @@ public class BackupImportController exte
if (sourceDirRec.exists()) {
- File targetDirRec = new File(current_dir + "streams"
+ File targetDirRec = new File(current_dir,
OpenmeetingsVariables.STREAMS_DIR
+ File.separatorChar + "hibernate" +
File.separatorChar);
copyDirectory(sourceDirRec, targetDirRec);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/DownloadHandler.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/DownloadHandler.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/DownloadHandler.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/DownloadHandler.java
Mon Apr 23 04:55:29 2012
@@ -163,11 +163,11 @@ public class DownloadHandler extends Htt
String working_dir = "";
- working_dir = current_dir + "upload" +
File.separatorChar;
+ working_dir = current_dir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar;
// Add the Folder for the Room
if (moduleName.equals("lzRecorderApp")) {
- working_dir = current_dir + "streams" +
File.separatorChar
+ working_dir = current_dir +
OpenmeetingsVariables.STREAMS_DIR + File.separatorChar
+ "hibernate" +
File.separatorChar;
} else if (moduleName.equals("videoconf1")) {
if (parentPath.length() != 0) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ExportToImage.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ExportToImage.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ExportToImage.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ExportToImage.java
Mon Apr 23 04:55:29 2012
@@ -196,7 +196,7 @@ public class ExportToImage extends HttpS
|| exportType.equals("pdf")) {
String current_dir =
getServletContext().getRealPath("/");
- String working_dir = current_dir +
"uploadtemp"
+ String working_dir = current_dir +
OpenmeetingsVariables.UPLOAD_TEMP_DIR
+ File.separatorChar;
String requestedFileSVG = fileName + "_"
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java?rev=1329064&r1=1329063&r2=1329064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java
Mon Apr 23 04:55:29 2012
@@ -171,7 +171,7 @@ public class UploadController extends Ab
// Get the current user directory
String currentDir = context.getRealPath("/");
- String workingDir = currentDir + "upload" + File.separatorChar
+ String workingDir = currentDir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ roomName + File.separatorChar;
log.debug("workingDir: " + workingDir);
@@ -209,7 +209,7 @@ public class UploadController extends Ab
// User Profile Update
this.deleteUserProfileFilesStoreTemp(currentDir,
userId);
- completeName = currentDir + "upload" +
File.separatorChar
+ completeName = currentDir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ "profiles" + File.separatorChar;
File f = new File(completeName);
if (!f.exists()) {
@@ -243,7 +243,7 @@ public class UploadController extends Ab
// check if this is a room file or UserProfile
// add Temp folder structure
String workingDirPpt = currentDir
- + "uploadtemp"
+ + OpenmeetingsVariables.UPLOAD_TEMP_DIR
+ File.separatorChar
+ ((userProfile) ? "profiles" +
File.separatorChar
+
ScopeApplicationAdapter.profilesPrefix + userId
@@ -379,7 +379,7 @@ public class UploadController extends Ab
private void deleteUserProfileFilesStoreTemp(String current_dir,
Long users_id) throws Exception {
- String working_imgdir = current_dir + "upload" +
File.separatorChar
+ String working_imgdir = current_dir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ "profiles" + File.separatorChar
+ ScopeApplicationAdapter.profilesPrefix +
users_id
+ File.separatorChar;
@@ -392,7 +392,7 @@ public class UploadController extends Ab
private void deleteUserProfileFiles(String current_dir, Long users_id)
throws Exception {
- String working_imgdir = current_dir + "upload" +
File.separatorChar
+ String working_imgdir = current_dir +
OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar
+ "profiles" + File.separatorChar
+ ScopeApplicationAdapter.profilesPrefix +
users_id
+ File.separatorChar;
