svn commit: r159775 - forrest/trunk/main/webapp/forrest.xmap

[ri...@apache.org]

Author: rick
Date: Sat Apr  2 08:47:33 2005
New Revision: 159775

URL: http://svn.apache.org/viewcvs?view=rev&rev=159775
Log:
A fix for FOR-450.  Moved the mounting of any input.xmap to start of the
<map:match> that's looking for "**.xml".

Could someone familiar with plugins sanity check this?  I'm worried
about possible performance hits or other side effects that I've 
overlooked.


Modified:
    forrest/trunk/main/webapp/forrest.xmap

Modified: forrest/trunk/main/webapp/forrest.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/forrest.xmap?view=diff&r1=159774&r2=159775
==============================================================================
--- forrest/trunk/main/webapp/forrest.xmap (original)
+++ forrest/trunk/main/webapp/forrest.xmap Sat Apr  2 08:47:33 2005
@@ -306,6 +306,14 @@
       <!-- ============================================================ -->
 
       <map:match type="wildcard" pattern="**.xml">
+       <map:select type="exists">
+         <map:when test="{project:temp-dir}/input.xmap">
+             <map:mount uri-prefix=""
+                        src="{project:temp-dir}/input.xmap"
+                        check-reload="yes"
+                        pass-through="true"/>
+         </map:when> 
+       </map:select>
        <map:match type="i18n" pattern="{project:content.xdocs}{1}.*.xml">
           <map:generate src="{source}" />
           <map:call resource="transform-to-document">
@@ -339,14 +347,6 @@
           </map:call>
           <map:serialize type="xml-document"/>
        </map:match>
-       <map:select type="exists">
-         <map:when test="{project:temp-dir}/input.xmap">
-             <map:mount uri-prefix=""
-                        src="{project:temp-dir}/input.xmap"
-                        check-reload="yes"
-                        pass-through="true"/>
-         </map:when> 
-       </map:select>
      </map:match>
       
   </map:pipeline>