forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r293018 - in /forrest/trunk/main/webapp: locationmap.xml sitemap.xmap
Date Sat, 01 Oct 2005 19:41:01 GMT
Author: rgardler
Date: Sat Oct  1 12:40:54 2005
New Revision: 293018

URL: http://svn.apache.org/viewcvs?rev=293018&view=rev
Log:
resolve fo transform via locationmap

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

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=293018&r1=293017&r2=293018&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Sat Oct  1 12:40:54 2005
@@ -44,6 +44,16 @@
     <!-- transforms                         -->
     <!-- ================================== -->
     
+    
+    <!-- FO -->
+    <match pattern="transform.*.fo">
+      <select>
+        <location src="{project:skins-dir}{forrest:skin}/xslt/fo/{1}2fo.xsl" />
+        <location src="{forrest:context}/skins/{forrest:skin}/xslt/fo/{1}2fo.xsl"/>
+        <location src="{forrest:context}/skins/common/xslt/fo/{1}2fo.xsl"/>
+      </select>
+    </match>
+    
     <!-- skins                              -->
     <match pattern="transform.xdoc.html">
       <select>
@@ -58,6 +68,7 @@
         <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/{1}2{2}.xsl"/>
       </select>
     </match>
+    
     
     <!-- ================================== -->
     <!-- skinconf files                     -->

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=293018&r1=293017&r2=293018&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Sat Oct  1 12:40:54 2005
@@ -607,26 +607,10 @@
             <!-- <map:transform type="idgen"/> -->
             <map:transform type="xinclude"/>
             <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.fo"/>
-            <map:select type="exists">
-              <map:when test="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
-                <map:transform src="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
-                  <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-                  <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
-                </map:transform>
-              </map:when>
-              <map:when test="{forrest:context}/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
-                <map:transform src="{forrest:context}/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
-                  <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-                  <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
-                </map:transform>
-              </map:when>
-              <map:otherwise>
-                <map:transform src="{forrest:context}/skins/common/xslt/fo/document2fo.xsl">
-                  <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-                  <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
-                </map:transform>
-              </map:otherwise>
-            </map:select>
+            <map:transform src="{lm:transform.document.fo}">
+              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
+              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
+            </map:transform>
         </map:otherwise>
       </map:select>
         <map:serialize type="xml"/>



Mime
View raw message