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 A9E73DFDB for ; Sun, 9 Sep 2012 21:55:02 +0000 (UTC) Received: (qmail 8901 invoked by uid 500); 9 Sep 2012 21:55:01 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 8840 invoked by uid 500); 9 Sep 2012 21:55:01 -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 8830 invoked by uid 99); 9 Sep 2012 21:55:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Sep 2012 21:55:01 +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; Sun, 09 Sep 2012 21:54:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A386E2388900 for ; Sun, 9 Sep 2012 21:54:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1382587 - in /tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources: DirResourceSet.java FileResource.java Date: Sun, 09 Sep 2012 21:54:15 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120909215415.A386E2388900@eris.apache.org> Author: markt Date: Sun Sep 9 21:54:15 2012 New Revision: 1382587 URL: http://svn.apache.org/viewvc?rev=1382587&view=rev Log: Special case to handle Resource JARs that have been unpacked under /WEB-INF/classes Eclipse requires this Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/FileResource.java Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java?rev=1382587&r1=1382586&r2=1382587&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java Sun Sep 9 21:54:15 2012 @@ -22,6 +22,7 @@ import java.util.Set; import org.apache.catalina.WebResource; import org.apache.catalina.WebResourceRoot; +import org.apache.catalina.WebResourceRoot.ResourceSetType; import org.apache.catalina.WebResourceSet; import org.apache.catalina.util.ResourceSet; @@ -43,6 +44,16 @@ public class DirResourceSet implements W } this.base = base; this.webAppMount = webAppMount; + + // Special case to handle Resource JARs that have been unpacked under + // /WEB-INF/classes + WebResource unpackedResourceJar = + getResource("/WEB-INF/classes/META-INF/resources"); + if (unpackedResourceJar.exists()) { + root.createWebResourceSet(ResourceSetType.RESOURCE_JAR, + ((FileResource) unpackedResourceJar).getResourceInternal() , + "", ""); + } } @Override Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/FileResource.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/FileResource.java?rev=1382587&r1=1382586&r2=1382587&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/FileResource.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/FileResource.java Sun Sep 9 21:54:15 2012 @@ -162,4 +162,8 @@ public class FileResource implements Web public WebResourceRoot getWebResourceRoot() { return root; } + + protected File getResourceInternal() { + return resource; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org