Return-Path: 
 <svn-return-4234-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 41890 invoked from network); 11 Nov 2005 16:20:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 11 Nov 2005 16:20:19 -0000
Received: (qmail 99288 invoked by uid 500); 11 Nov 2005 16:20:09 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 99183 invoked by uid 500); 11 Nov 2005 16:20:09 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 98963 invoked by uid 99); 11 Nov 2005 16:20:08 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Nov 2005 08:20:07 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 11 Nov 2005 08:19:59 -0800
Received: (qmail 41622 invoked by uid 65534); 11 Nov 2005 16:19:45 -0000
Message-ID: <20051111161945.41601.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r332589 - in /forrest/trunk/main/webapp: locationmap.xml
 resources.xmap
Date: Fri, 11 Nov 2005 16:19:44 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Fri Nov 11 08:19:33 2005
New Revision: 332589

URL: http://svn.apache.org/viewcvs?rev=332589&view=rev
Log:
fix handling of **/images/** via locationmap (FOR-693)

Modified:
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/main/webapp/resources.xmap

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=332589&r1=332588&r2=332589&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Fri Nov 11 08:19:33 2005
@@ -65,9 +65,10 @@
     
     <match pattern="project.images.**.*">
       <select>
-        <location src="{project:content.xdocs}/images/{1}.{2}" />
-        <location src="{project:content.xdocs}/{1}.{2}" />
-        <location src="{project:content}/../resources/images/{1}.{2}" />
+        <location src="{project:content.xdocs}images/{1}.{2}" />
+        <location src="{project:content.xdocs}{1}.{2}" />
+        <location src="{project:resources.images}{1}.{2}" />
+        <location src="{project:content}../resources/images/{1}.{2}" />
       </select>
     </match>
     

Modified: forrest/trunk/main/webapp/resources.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources.xmap?rev=332589&r1=332588&r2=332589&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources.xmap (original)
+++ forrest/trunk/main/webapp/resources.xmap Fri Nov 11 08:19:33 2005
@@ -220,9 +220,16 @@
       </map:match>
 
       <map:match pattern="**/images/**.*">
-        <map:read src="{lm:project.images.{1}/{2}.{3}}" mime-type="image/{3}" />
+        <map:select type="exists">
+          <map:when test="{lm:project.images.{1}/images/{2}.{3}}">
+            <map:read src="{lm:project.images.{1}/images/{2}.{3}}" mime-type="image/{3}" />
+          </map:when>
+          <map:when test="{lm:project.images.{2}.{3}}">
+            <map:read src="{lm:project.images.{2}.{3}}" mime-type="image/{3}" />
+          </map:when>
+        </map:select>
       </map:match>
-
+      
       <map:match pattern="**.png">
         <map:select type="exists">
           <map:when test="{lm:project.images.{1}.svg}">