OO-1681: rename the file if it already exists

src/main/java/org/olat/core/util/ExportUtil.java

@@ -31,8 +31,6 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.olat.core.logging.AssertException;
-
 /**
  * Initial Date:  Jul 20, 2004
  *     
@@ -54,7 +52,10 @@ public class ExportUtil {
 
 	public static File writeContentToFile(String fileName, String content, File exportDirectory, String enc) {
 		File f = new File(exportDirectory, fileName);
-		if (f.exists()) { throw new AssertException("File " + fileName + " already exists!"); }
+		if (f.exists()) {
+			String newFileName = FileUtils.rename(f);
+			f = new File(exportDirectory, newFileName);
+		}
 		FileUtils.save(f, content, enc);
 		return f;
 	}

src/main/java/org/olat/course/archiver/ScoreAccountingArchiveController.java

@@ -111,7 +111,7 @@ public class ScoreAccountingArchiveController extends BasicController {
 		File downloadFile = ExportUtil.writeContentToFile(fileName, result, exportDirectory, charset);
 
 		vcFeedback = createVelocityContainer("feedback");
-		vcFeedback.contextPut("body", translate("course.res.feedback", new String[] { fileName }));
+		vcFeedback.contextPut("body", translate("course.res.feedback", new String[] { downloadFile.getName() }));
 		downloadButton = LinkFactory.createButtonSmall("cmd.download", vcFeedback, this);
 		downloadButton.setUserObject(downloadFile);
 		myPanel.setContent(vcFeedback);

src/main/java/org/olat/ims/qti/export/QTIExportManager.java

@@ -192,8 +192,8 @@ public class QTIExportManager extends BasicManager{
 	private String writeContentToFile(String shortTitle, File exportDirectory, String charset, QTIExportFormatter qef, String fileNameSuffix) {
 		// defining target filename
 		String targetFileName = getFilename(shortTitle, qef, fileNameSuffix);
-		ExportUtil.writeContentToFile(targetFileName, qef.getReport(), exportDirectory, charset);
-		return targetFileName;
+		File savedFile = ExportUtil.writeContentToFile(targetFileName, qef.getReport(), exportDirectory, charset);
+		return savedFile.getName();
 	}
 	
 	private String getFilename(String shortTitle, QTIExportFormatter qef, String fileNameSuffix) {