Author: solomax
Date: Tue Aug 28 09:49:20 2012
New Revision: 1378045
URL: http://svn.apache.org/viewvc?rev=1378045&view=rev
Log:
Wml folder "stored" is moved to the OmFileHelper
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceLibrary.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/library/TestFileParser.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java?rev=1378045&r1=1378044&r2=1378045&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java
Tue Aug 28 09:49:20 2012
@@ -24,6 +24,7 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.utils.OmFileHelper;
import org.openmeetings.utils.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -35,12 +36,11 @@ public class LibraryDocumentConverter {
private static final Logger log =
Red5LoggerFactory.getLogger(LibraryDocumentConverter.class,
OpenmeetingsVariables.webAppRootKey);
private static final String fileExt = ".wml";
- private static final String wmlFolderName = "stored" +
File.separatorChar;
- public static String writeToLocalFolder(File uploadRootDir, String
fileName, @SuppressWarnings("rawtypes")ArrayList objList) {
+ public static String writeToLocalFolder(String fileName,
@SuppressWarnings("rawtypes")ArrayList objList) {
try {
- log.debug("filePath: "+uploadRootDir.getAbsolutePath());
+ log.debug("filePath: " +
OmFileHelper.getUploadWmlDir().getCanonicalPath());
String fileNameExtName =
fileName.substring(fileName.length()-4,fileName.length());
if (fileNameExtName.equals(fileExt)){
@@ -54,11 +54,7 @@ public class LibraryDocumentConverter {
return "-20";
}
//Add the Folder for the wmlFiles if it does not exist
yet
- File localFolder2 = new File(uploadRootDir,
wmlFolderName);
- if (!localFolder2.exists()){
- localFolder2.mkdir();
- }
- File filePathComplete = new File(localFolder2, fileName
+ fileExt);
+ File filePathComplete = new
File(OmFileHelper.getUploadWmlDir(), fileName + fileExt);
if (filePathComplete.exists()){
return "-20";
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java?rev=1378045&r1=1378044&r2=1378045&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java
Tue Aug 28 09:49:20 2012
@@ -27,6 +27,7 @@ import java.util.LinkedHashMap;
import org.dom4j.Element;
import org.openmeetings.app.OpenmeetingsVariables;
+import org.openmeetings.utils.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -39,16 +40,14 @@ public class LibraryWmlLoader {
private static final String fileExt = ".wml";
- private static final String wmlFolderName = "stored";
-
@SuppressWarnings({ "rawtypes" })
- public ArrayList loadWmlFile(File file, String fileName){
+ public ArrayList loadWmlFile(String fileName){
try {
- String name = wmlFolderName + File.separatorChar +
fileName;
+ String name = fileName;
if (!name.endsWith(fileExt)) {
name += fileExt;
}
- File filepathComplete = new File(file, name);
+ File filepathComplete = new
File(OmFileHelper.getUploadWmlDir(), name);
log.debug("filepathComplete: "+filepathComplete);
XStream xStream = new XStream(new XppDriver());
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=1378045&r1=1378044&r2=1378045&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
Tue Aug 28 09:49:20 2012
@@ -142,7 +142,7 @@ public class ConferenceLibrary implement
String localFileName = MD5.do_checksum(new
Date().toString()) + ".wml";
-
LibraryDocumentConverter.writeToLocalFolder(OmFileHelper.getUploadDir(),
localFileName, tObject);
+
LibraryDocumentConverter.writeToLocalFolder(localFileName, tObject);
// String wmlPath = current_dir +
File.separatorChar+fileName
// +".xml";
@@ -193,8 +193,7 @@ public class ConferenceLibrary implement
FileExplorerItem fileExplorerItem =
fileExplorerItemDao
.getFileExplorerItemsById(fileExplorerItemId);
- ArrayList roomItems =
libraryWmlLoader.loadWmlFile(OmFileHelper.getUploadDir(),
-
fileExplorerItem.getWmlFilePath());
+ ArrayList roomItems =
libraryWmlLoader.loadWmlFile(fileExplorerItem.getWmlFilePath());
Map whiteboardObjClear = new HashMap();
whiteboardObjClear.put(2, "clear");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/library/TestFileParser.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/library/TestFileParser.java?rev=1378045&r1=1378044&r2=1378045&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/library/TestFileParser.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/library/TestFileParser.java
Tue Aug 28 09:49:20 2012
@@ -18,8 +18,6 @@
*/
package org.openmeetings.test.library;
-import java.io.File;
-
import org.apache.log4j.Logger;
import org.junit.Test;
import org.openmeetings.app.documents.LibraryWmlLoader;
@@ -38,7 +36,7 @@ public class TestFileParser extends Abst
try {
- libraryWmlLoader.loadWmlFile(new
File(System.getProperty("basedir")), "filename1");
+ libraryWmlLoader.loadWmlFile("filename1");
} catch (Exception err) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java?rev=1378045&r1=1378044&r2=1378045&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java
Tue Aug 28 09:49:20 2012
@@ -49,6 +49,7 @@ public class OmFileHelper {
private static final String CONF_DIR = "conf";
private static final String BACKUP_DIR = "backup";
private static final String DEFAULT_DIR = "default";
+ private static final String WML_DIR = "stored";
private static final String INSTALL_FILE = "install.xml";
@@ -118,6 +119,10 @@ public class OmFileHelper {
return getDir(getUploadDir(), roomName);
}
+ public static File getUploadWmlDir() {
+ return getDir(getUploadDir(), WML_DIR);
+ }
+
public static File getUploadTempDir() {
return new File(OmFileHelper.OM_HOME, UPLOAD_TEMP_DIR);
}
