Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 26974 invoked from network); 23 Mar 2005 15:03:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Mar 2005 15:03:08 -0000 Received: (qmail 58567 invoked by uid 500); 23 Mar 2005 15:03:01 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 58203 invoked by uid 500); 23 Mar 2005 15:03:00 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 58179 invoked by uid 500); 23 Mar 2005 15:03:00 -0000 Received: (qmail 58176 invoked by uid 99); 23 Mar 2005 15:03:00 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 23 Mar 2005 07:02:59 -0800 Received: (qmail 26926 invoked by uid 1670); 23 Mar 2005 15:02:58 -0000 Date: 23 Mar 2005 15:02:58 -0000 Message-ID: <20050323150258.26924.qmail@minotaur.apache.org> From: yoavs@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N yoavs 2005/03/23 07:02:58 Modified: catalina/src/share/org/apache/catalina/startup ExpandWar.java webapps/docs changelog.xml Log: Bugzilla 33636: set lastModified attribute on files expanded from WARs. Revision Changes Path 1.11 +12 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java Index: ExpandWar.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ExpandWar.java 1 Feb 2005 13:12:31 -0000 1.10 +++ ExpandWar.java 23 Mar 2005 15:02:58 -0000 1.11 @@ -152,7 +152,14 @@ continue; } input = jarFile.getInputStream(jarEntry); - expand(input, docBase, name); + + // Bugzilla 33636 + File expandedFile = expand(input, docBase, name); + long lastModified = jarEntry.getTime(); + if ((lastModified != -1) && (lastModified != 0) && (expandedFile != null)) { + expandedFile.setLastModified(lastModified); + } + input.close(); input = null; } @@ -291,10 +298,11 @@ * @param input InputStream to be copied * @param docBase Document base directory into which we are expanding * @param name Relative pathname of the file to be created + * @return A handle to the expanded File * * @exception IOException if an input/output error occurs */ - protected static void expand(InputStream input, File docBase, String name) + protected static File expand(InputStream input, File docBase, String name) throws IOException { File file = new File(docBase, name); @@ -319,6 +327,7 @@ } } + return file; } 1.245 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- changelog.xml 15 Mar 2005 13:06:31 -0000 1.244 +++ changelog.xml 23 Mar 2005 15:02:58 -0000 1.245 @@ -78,6 +78,9 @@ 34016: Save and restore docBase when using antiResourceLocking, for compatibility with the admin webapp (remm) + + 33636: Set lastModified attribute when expanding WAR files. (yoavs) + --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org