forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r103455 - forrest/trunk/main/webapp
Date Fri, 19 Nov 2004 03:39:39 GMT
Author: rick
Date: Thu Nov 18 19:39:38 2004
New Revision: 103455

Modified:
   forrest/trunk/main/webapp/sitemap.xmap
Log:
Moved the mounting of the output.xmap plugin xmap to the "OUTPUT
FORMATS" section.

It was mounting before such things as the linkmap match that was causing
at least the text-output plugin to fail.

See http://marc.theaimsgroup.com/?t=110082796200003&r=1&w=2 for the
original problem statement.



Modified: forrest/trunk/main/webapp/sitemap.xmap
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap	(original)
+++ forrest/trunk/main/webapp/sitemap.xmap	Thu Nov 18 19:39:38 2004
@@ -325,14 +325,6 @@
       </map:pipeline>
       
       <map:pipeline internal-only="false">
-        <map:select type="exists">
-          <map:when test="{forrest:plugins}/output.xmap">
-            <map:mount uri-prefix="" src="{forrest:plugins}/output.xmap" check-reload="yes"
pass-through="true"/>
-          </map:when>
-        </map:select>
-      </map:pipeline>
-       
-      <map:pipeline internal-only="false">
          <map:match pattern="skinconf.xml">
            <map:generate src="{project:skinconf}" />
            <map:transform src="{forrest:stylesheets}/strip-doctype.xsl"/>
@@ -530,6 +522,14 @@
         </map:select>
       </map:match>      
 
+      <map:pipeline internal-only="false">
+        <map:select type="exists">
+          <map:when test="{forrest:plugins}/output.xmap">
+            <map:mount uri-prefix="" src="{forrest:plugins}/output.xmap" check-reload="yes"
pass-through="true"/>
+          </map:when>
+        </map:select>
+      </map:pipeline>
+       
       <!-- FIXME: temporary fix to get s5 plugin working
            this mount should be managed by the plugns framework -->
       <map:pipeline internal-only="false">

Mime
View raw message