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 2012/05/18 12:16:03 UTC

svn commit: r1340061 - in /incubator/openmeetings/trunk/singlewebapp: src/org/openmeetings/cli/Admin.java src/org/openmeetings/servlet/outputhandler/BackupImportController.java xdocs/RTMPSAndHTTPS.xml

Author: solomax
Date: Fri May 18 10:16:02 2012
New Revision: 1340061

URL: http://svn.apache.org/viewvc?rev=1340061&view=rev
Log:
CLI Admin: includeFiles was determined incorrectly, profile pictures were imported by wrong path

Modified:
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
    incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml

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=1340061&r1=1340060&r2=1340061&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java Fri May 18 10:16:02 2012
@@ -372,7 +372,7 @@ public class Admin {
 						file = "backup_" + CalendarPatterns.getTimeForStreamId(new Date()) + ".zip";
 						System.out.println("File name was not specified, '" + file + "' will be used");
 					}
-					boolean includeFiles = Boolean.getBoolean(cmdl.getOptionValue("exclude-files", "true"));
+					boolean includeFiles = Boolean.parseBoolean(cmdl.getOptionValue("exclude-files", "true"));
 					File backup_dir = new File(omUploadTemp, "" + System.currentTimeMillis());
 					backup_dir.mkdirs();
 					

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=1340061&r1=1340060&r2=1340061&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 Fri May 18 10:16:02 2012
@@ -2438,7 +2438,7 @@ public class BackupImportController exte
 		// Now check the room files and import them
 		File roomFilesFolder = new File(importBaseDir, "roomFiles");
 
-		String library_dir = current_dir + OpenmeetingsVariables.UPLOAD_DIR + File.separatorChar;
+		File library_dir = new File(current_dir, OpenmeetingsVariables.UPLOAD_DIR);
 
 		log.debug("roomFilesFolder PATH " + roomFilesFolder.getAbsolutePath());
 
@@ -2448,13 +2448,7 @@ public class BackupImportController exte
 			for (File file : files) {
 				if (file.isDirectory()) {
 
-					String parentFolderName = file.getName();
-
-					// Is a room folder or the profiles folder
-					String parentPath = library_dir + parentFolderName
-							+ File.separatorChar;
-
-					File parentPathFile = new File(parentPath);
+					File parentPathFile = new File(library_dir, file.getName());
 
 					if (!parentPathFile.exists()) {
 						parentPathFile.mkdir();
@@ -2488,11 +2482,7 @@ public class BackupImportController exte
 															+ newProfileID);
 								}
 							}
-							String roomDocumentFolderName = parentPath
-									+ fileOrFolderName + File.separatorChar;
-
-							File roomDocumentFolder = new File(
-									roomDocumentFolderName);
+							File roomDocumentFolder = new File(parentPathFile, fileOrFolderName);
 
 							if (!roomDocumentFolder.exists()) {
 								roomDocumentFolder.mkdir();
@@ -2504,53 +2494,28 @@ public class BackupImportController exte
 
 									if (roomDocumentFile.isDirectory()) {
 										log.error("Folder detected in Documents space! Folder "
-												+ roomDocumentFolderName);
+												+ roomDocumentFolder);
 									} else {
-
-										String roomDocumentFileName = roomDocumentFolderName
-												+ roomDocumentFile.getName();
-
-										this.copyFile(roomDocumentFile,
-												new File(roomDocumentFileName));
-
+										copyFile(roomDocumentFile,
+											new File(roomDocumentFolder, roomDocumentFile.getName()));
 									}
-
 								}
-
 							} else {
-
 								log.debug("Document already exists :: ",
-										roomDocumentFolderName);
-
+										roomDocumentFolder);
 							}
-
 						} else {
-
-							String roomFileOrProfileName = parentPath
-									+ roomOrProfileFileOrFolder.getName();
-
-							File roomFileOrProfileFile = new File(
-									roomFileOrProfileName);
-
+							File roomFileOrProfileFile = new File(parentPathFile, roomOrProfileFileOrFolder.getName());
 							if (!roomFileOrProfileFile.exists()) {
-
 								this.copyFile(roomOrProfileFileOrFolder,
 										roomFileOrProfileFile);
-
 							} else {
-
-								log.debug("File does already exist :: ",
-										roomFileOrProfileName);
-
+								log.debug("File does already exist :: ", roomFileOrProfileFile);
 							}
-
 						}
-
 					}
-
 				}
 			}
-
 		}
 
 		// Now check the recordings and import them

Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml?rev=1340061&r1=1340060&r2=1340061&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml Fri May 18 10:16:02 2012
@@ -101,7 +101,7 @@
 				</li>
 				<li>Import the intermediate certificate(s) you normally receive with
 					the certificate:
-					keytool -import -alias intermed -keystore red5/conf/ keystore -trustcacerts
+					keytool -import -alias intermed -keystore red5/conf/keystore -trustcacerts
 					-file intermediate.crt
 				</li>
 				<li>Import the certificate you received: keytool -import -alias red5