Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 60125DD28 for ; Thu, 1 Nov 2012 16:25:14 +0000 (UTC) Received: (qmail 79572 invoked by uid 500); 1 Nov 2012 16:25:13 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 79434 invoked by uid 500); 1 Nov 2012 16:25:12 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 78921 invoked by uid 99); 1 Nov 2012 16:25:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2012 16:25:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 01 Nov 2012 16:25:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D436D2388A64 for ; Thu, 1 Nov 2012 16:24:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1404660 - in /tomcat/tc7.0.x/trunk: ./ test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar Date: Thu, 01 Nov 2012 16:24:27 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121101162427.D436D2388A64@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Nov 1 16:24:27 2012 New Revision: 1404660 URL: http://svn.apache.org/viewvc?rev=1404660&view=rev Log: Fix broken test by adding relative ordering to resources2.jar so it is processed after resources.jar Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1404658 Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar?rev=1404660&r1=1404659&r2=1404660&view=diff ============================================================================== Binary files - no diff available. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org