From 43ffcaaaaa80ddab3bc539730a465626214965e8 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 11 Mar 2015 22:42:56 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 99297: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 99194: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2) 99083: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5) 99042: Merged DEV to V4.1-BUG-FIX (4.1.10) 98346 : MNT-13351 : MMT corrupts file names during module installation - Use JarDriver to consider UTF8 files within an AMP git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/module/tool/ModuleManagementTool.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java b/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java index a2eebdf836..78782a0452 100644 --- a/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java +++ b/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java @@ -38,7 +38,7 @@ import de.schlichtherle.truezip.file.TConfig; import de.schlichtherle.truezip.file.TFile; import de.schlichtherle.truezip.file.TFileInputStream; import de.schlichtherle.truezip.file.TVFS; -import de.schlichtherle.truezip.fs.archive.zip.ZipDriver; +import de.schlichtherle.truezip.fs.archive.zip.JarDriver; import de.schlichtherle.truezip.socket.sl.IOPoolLocator; /** @@ -96,7 +96,7 @@ public class ModuleManagementTool implements LogOutput public ModuleManagementTool() { TConfig config = TConfig.get(); - config.setArchiveDetector(new TArchiveDetector("war|amp", new ZipDriver(IOPoolLocator.SINGLETON))); + config.setArchiveDetector(new TArchiveDetector("war|amp", new JarDriver(IOPoolLocator.SINGLETON))); // Load the default file mapping properties this.defaultFileMappingProperties = new Properties();