mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merge 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4351 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4352 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4353 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -166,6 +166,9 @@ public class RepositoryExporterComponent implements RepositoryExporterService
|
||||
handle.mimeType = exportHandle.mimeType;
|
||||
handle.exportFile = repoExportFile;
|
||||
repoExportHandles.add(handle);
|
||||
|
||||
// delete temporary export file
|
||||
exportHandle.exportFile.delete();
|
||||
}
|
||||
|
||||
return repoExportHandles.toArray(new RepositoryExportHandle[repoExportHandles.size()]);
|
||||
@@ -326,7 +329,8 @@ public class RepositoryExporterComponent implements RepositoryExporterService
|
||||
public FileExportHandle exportStore(ExporterCrawlerParameters exportParameters, String packageName, Exporter progress)
|
||||
{
|
||||
// create a temporary file to hold the acp export
|
||||
File tempFile = TempFileProvider.createTempFile("repoExp" + packageName, "." + ACPExportPackageHandler.ACP_EXTENSION);
|
||||
File systemTempDir = TempFileProvider.getSystemTempDir();
|
||||
File tempFile = TempFileProvider.createTempFile("repoExp" + packageName, "." + ACPExportPackageHandler.ACP_EXTENSION, systemTempDir);
|
||||
|
||||
// create acp export handler around the temp file
|
||||
File dataFile = new File(packageName);
|
||||
@@ -361,7 +365,8 @@ public class RepositoryExporterComponent implements RepositoryExporterService
|
||||
public FileExportHandle exportSystem(String packageName)
|
||||
{
|
||||
// create a temporary file to hold the system info export
|
||||
File tempFile = TempFileProvider.createTempFile("repoExpSystemInfo", ".xml");
|
||||
File systemTempDir = TempFileProvider.getSystemTempDir();
|
||||
File tempFile = TempFileProvider.createTempFile("repoExpSystemInfo", ".xml", systemTempDir);
|
||||
|
||||
try
|
||||
{
|
||||
|
Reference in New Issue
Block a user