Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 660D511E4D for ; Mon, 1 Sep 2014 04:05:18 +0000 (UTC) Received: (qmail 56527 invoked by uid 500); 1 Sep 2014 04:05:18 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 56480 invoked by uid 500); 1 Sep 2014 04:05:18 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 56470 invoked by uid 99); 1 Sep 2014 04:05:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2014 04:05:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D8C868C2926; Mon, 1 Sep 2014 04:05:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: olamy@apache.org To: commits@archiva.apache.org Date: Mon, 01 Sep 2014 04:05:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: [MRM-1854] Last modified date is epoch on directory listing for a group [MRM-1854] Last modified date is epoch on directory listing for a group Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/d4c85abf Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/d4c85abf Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/d4c85abf Branch: refs/heads/master Commit: d4c85abfac8d0920549f20735caf0e4028149c5c Parents: d42a81a Author: Olivier Lamy Authored: Mon Sep 1 14:04:41 2014 +1000 Committer: Olivier Lamy Committed: Mon Sep 1 14:04:41 2014 +1000 ---------------------------------------------------------------------- .../archiva/webdav/ArchivaDavResourceFactory.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/d4c85abf/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index 9d4b8ce..375c4d8 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -244,7 +244,7 @@ public class ArchivaDavResourceFactory getResourceFromGroup( request, repoGroupConfig.getRepositories(), archivaLocator, repoGroupConfig ); - setHeaders( response, locator, davResource ); + setHeaders( response, locator, davResource, true ); return davResource; @@ -291,7 +291,7 @@ public class ArchivaDavResourceFactory auditListeners, // scheduler, // fileLockManager ); - setHeaders( response, locator, resource ); + setHeaders( response, locator, resource, false ); return resource; } } @@ -432,7 +432,7 @@ public class ArchivaDavResourceFactory } } - setHeaders( response, locator, resource ); + setHeaders( response, locator, resource, false ); // compatibility with MRM-440 to ensure browsing the repository works ok if ( resource.isCollection() && !request.getRequestURI().endsWith( "/" ) ) @@ -873,7 +873,8 @@ public class ArchivaDavResourceFactory this.auditListeners.remove( listener ); } - private void setHeaders( DavServletResponse response, DavResourceLocator locator, DavResource resource ) + private void setHeaders( DavServletResponse response, DavResourceLocator locator, DavResource resource, + boolean group ) { // [MRM-503] - Metadata file need Pragma:no-cache response // header. @@ -894,6 +895,14 @@ public class ArchivaDavResourceFactory response.setHeader( "Cache-Control", "no-cache" ); response.setDateHeader( "Last-Modified", new Date().getTime() ); } + else if ( group ) + { + if ( resource instanceof ArchivaVirtualDavResource ) + { + //MRM-1854 here we have a directory so force "Last-Modified" + response.setDateHeader( "Last-Modified", new Date().getTime() ); + } + } else { // We need to specify this so connecting wagons can work correctly