inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.1) to HEAD (5.2)

Browse Source 
122997 mrogers: Merged WOLF-8 (5.1.0) to 5.1.N (5.1.1)
      114287 mward: UTF-170: Move TrueZip unmount call to a final block.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 22:32:52 +00:00
parent f7ce09fe3e
commit c4b6a1e7a7
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java
View File

@@ -19,8 +19,10 @@
package org.alfresco.repo.module.tool;
import de.schlichtherle.truezip.file.*;
import de.schlichtherle.truezip.fs.FsSyncException;
import de.schlichtherle.truezip.fs.archive.zip.JarDriver;
import de.schlichtherle.truezip.socket.sl.IOPoolLocator;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.module.ModuleVersionNumber;
import org.alfresco.service.cmr.module.ModuleDetails;
@@ -192,14 +194,14 @@ public class ModuleManagementTool implements LogOutput
* installation will be followed and reported, but the WAR file will not be modified.
* @param forceInstall indicates whether the installed files will be replaced regardless of the currently installed
* version of the AMP. Generally used during development of the AMP.
* @param backupWAR indicates whether we should backup the war we are modifying or not
* @param backupWAR indicates whether we should backup the war we are modifying or not
*/
public void installModule(String ampFileLocation, String warFileLocation, boolean preview, boolean forceInstall, boolean backupWAR)
{
TFile warFile = new TFile(warFileLocation);
try
{
outputVerboseMessage("Installing AMP '" + ampFileLocation + "' into WAR '" + warFileLocation + "'");
TFile warFile = new TFile(warFileLocation);
if (!warFile.exists())
{
throw new ModuleManagementToolException("The war file '" + warFile + "' does not exist.");
@@ -273,9 +275,6 @@ public class ModuleManagementTool implements LogOutput
{
warFile.setLastModified(System.currentTimeMillis());
}
// Update the zip filessync
TVFS.umount();
}
}
catch (AlfrescoRuntimeException exception)
@@ -286,6 +285,19 @@ public class ModuleManagementTool implements LogOutput
{
throw new ModuleManagementToolException("An IO error was encountered during deployment of the AMP into the WAR", exception);
}
finally
{
try
{
TVFS.umount(warFile);
}
catch (FsSyncException e)
{
throw new ModuleManagementToolException(
"Error when attempting to unmount WAR file: "+warFile.getPath(),
e);
}
}
}
private void uninstallIfNecessary(String warFileLocation, ModuleDetails installedModuleDetails, boolean preview,