Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 50759 invoked from network); 22 Feb 2010 21:54:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Feb 2010 21:54:11 -0000 Received: (qmail 35872 invoked by uid 500); 22 Feb 2010 21:54:11 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 35808 invoked by uid 500); 22 Feb 2010 21:54:11 -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 35799 invoked by uid 99); 22 Feb 2010 21:54:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Feb 2010 21:54:11 +0000 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; Mon, 22 Feb 2010 21:54:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A04B02388900; Mon, 22 Feb 2010 21:53:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r915082 - /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/JarUtils.java Date: Mon, 22 Feb 2010 21:53:50 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100222215350.A04B02388900@eris.apache.org> Author: gawor Date: Mon Feb 22 21:53:50 2010 New Revision: 915082 URL: http://svn.apache.org/viewvc?rev=915082&view=rev Log: make sure directory entries end with / Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/JarUtils.java Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/JarUtils.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/JarUtils.java?rev=915082&r1=915081&r2=915082&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/JarUtils.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/JarUtils.java Mon Feb 22 21:53:50 2010 @@ -275,7 +275,7 @@ } String name = baseName + file.getName(); if (file.isDirectory()) { - out.putNextEntry(new ZipEntry(name)); + out.putNextEntry(new ZipEntry(name + "/")); out.closeEntry(); jarDirectory(file, name + "/", destinationFile, out); } else if (file.isFile()) {