forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r293042 - in /forrest/trunk/main/webapp: aggregate.xmap locationmap.xml
Date Sat, 01 Oct 2005 23:07:49 GMT
Author: rgardler
Date: Sat Oct  1 16:07:42 2005
New Revision: 293042

URL: http://svn.apache.org/viewcvs?rev=293042&view=rev
Log:
use locationmap for aggregate.xmap (FOR-684)

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

Modified: forrest/trunk/main/webapp/aggregate.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/aggregate.xmap?rev=293042&r1=293041&r2=293042&view=diff
==============================================================================
--- forrest/trunk/main/webapp/aggregate.xmap (original)
+++ forrest/trunk/main/webapp/aggregate.xmap Sat Oct  1 16:07:42 2005
@@ -49,14 +49,14 @@
       <!-- Aggregation of all XML in the site -->
       <map:match pattern="*.xml">
         <map:generate src="cocoon://abs-linkmap"/>
-        <map:transform src="{forrest:stylesheets}/site2book.xsl" />
-        <map:transform src="{forrest:stylesheets}/aggregates/book2cinclude.xsl">
+        <map:transform src="{lm:transform.site.book}" />
+        <map:transform src="{lm:transform-aggregate.book.cinclude}">
           <map:parameter name="ignore" value="{1}"/>
           <map:parameter name="title" value="{conf:project-name}"/>
         </map:transform>
         <map:transform type="cinclude"/>
-        <map:transform src="{forrest:stylesheets}/aggregates/doc2doc-uniqueids.xsl"/>
-        <map:transform src="{forrest:stylesheets}/aggregates/docs2document.xsl"/>
+        <map:transform src="{lm:transform-aggregate.doc.doc-uniqueids}"/>
+        <map:transform src="{lm:transform-aggregate.docs.document}"/>
         <map:serialize type="xml"/>
       </map:match>
 
@@ -68,7 +68,7 @@
       <map:match pattern="linkmap-*.*">
         <map:generate src="cocoon://abs-linkmap" />
 
-        <map:transform src="{forrest:stylesheets}/aggregates/relativize-split-linkmap.xsl">
+        <map:transform src="{lm:transform-aggregate.linkmap.relativized-linkmap}">
           <map:parameter name="path" value="{1}.{2}" />
         </map:transform>
         <map:serialize type="xml"/>

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=293042&r1=293041&r2=293042&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Sat Oct  1 16:07:42 2005
@@ -65,7 +65,6 @@
     <!-- ================================== -->
     <!-- utility transforms                 -->
     <!-- ================================== -->
-    
     <match pattern="transform.xml.xml-doctype-stripped">
       <location src="{forrest:stylesheets}/strip-doctype.xsl" />
     </match>
@@ -87,6 +86,17 @@
     
     <match pattern="transform.html.broken-links">
       <location src="resources/stylesheets/declare-broken-site-links.xsl" />
+    </match>
+    
+    <!-- ================================== -->
+    <!-- aggregate transforms                 -->
+    <!-- ================================== -->
+    <match pattern="transform-aggregate.*.*">
+      <location src="{forrest:stylesheets}/aggregates/{1}2{2}.xsl" />
+    </match>
+    
+    <match pattern="lm:transform-aggregate.linkmap.relativized-linkmap">
+      <location src="{forrest:stylesheets}/aggregates/relativize-split-linkmap.xsl" />
     </match>
     
     <!-- All core other transforms -->



Mime
View raw message