forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r332589 - in /forrest/trunk/main/webapp: locationmap.xml resources.xmap
Date Fri, 11 Nov 2005 16:19:44 GMT
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}">



Mime
View raw message