Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 39728 invoked from network); 11 Mar 2009 16:12:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Mar 2009 16:12:47 -0000 Received: (qmail 87128 invoked by uid 500); 11 Mar 2009 16:12:47 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 87089 invoked by uid 500); 11 Mar 2009 16:12:47 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 87080 invoked by uid 99); 11 Mar 2009 16:12:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Mar 2009 09:12:47 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Mar 2009 16:12:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 55CC62388965; Wed, 11 Mar 2009 16:12:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r752494 - /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ZipDirectoryPackager.java Date: Wed, 11 Mar 2009 16:12:24 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090311161224.55CC62388965@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Wed Mar 11 16:12:23 2009 New Revision: 752494 URL: http://svn.apache.org/viewvc?rev=752494&view=rev Log: Create zip file with proper filenames. Based on patch from Shawn Jiang (GERONIMO-4579) Modified: geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ZipDirectoryPackager.java Modified: geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ZipDirectoryPackager.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ZipDirectoryPackager.java?rev=752494&r1=752493&r2=752494&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ZipDirectoryPackager.java (original) +++ geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ZipDirectoryPackager.java Wed Mar 11 16:12:23 2009 @@ -56,7 +56,7 @@ unpack(targetDir, packedConfigurationDir); return targetDir; } - + public void unpack(File targetDir, File packedConfigurationDir) throws IOException { ZipFile zipFile = new ZipFile(packedConfigurationDir); Enumeration zipEntries = zipFile.entries(); @@ -83,6 +83,7 @@ out.close(); } } + zipFile.close(); } protected void zip(ZipOutputStream zos, File configurationDir, File nestedFile) throws IOException { @@ -94,7 +95,7 @@ } else { String nestedFilePath = nestedFile.getAbsolutePath(); String zipEntryName = nestedFilePath.substring(configurationDir.getAbsolutePath().length() + 1, nestedFilePath.length()); - ZipEntry zipEntry = new ZipEntry(zipEntryName); + ZipEntry zipEntry = new ZipEntry(normalizePathOfEntry(zipEntryName)); zos.putNextEntry(zipEntry); InputStream in = new FileInputStream(nestedFile); @@ -110,5 +111,9 @@ zos.closeEntry(); } } + + private String normalizePathOfEntry(String entryName){ + return entryName.replace('\\', '/'); + } }