forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r375445 - in /forrest/trunk/whiteboard/plugins: org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap org.apache.forrest.themes.core/themes/pelt.fv
Date Tue, 07 Feb 2006 02:03:12 GMT
Author: thorsten
Date: Mon Feb  6 18:03:11 2006
New Revision: 375445

URL: http://svn.apache.org/viewcvs?rev=375445&view=rev
Log:
Fixed all linkrewriter related pipeline matches in the dataModel, which prevented that the
links have been rewritten correctly. I did a first BUILD SUCCESSFUL with 'forrest site' on
fresh-site. :). Related to FOR-796

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap?rev=375445&r1=375444&r2=375445&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
Mon Feb  6 18:03:11 2006
@@ -33,8 +33,13 @@
         <map:generate src="cocoon://{1}.xml" />
         <map:transform type="idgen" />
         <map:transform type="xinclude" />
-        <map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
-        <map:transform src="{lm:transform.html.broken-links}" />
+        <map:match pattern="**/*.source.rewritten.xml">
+          <map:transform type="linkrewriter" src="cocoon://{1}/linkmap-{2}" />
+        </map:match>
+        <map:match pattern="*.source.rewritten.xml">
+          <map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
+        </map:match>
+        <map:transform src="{lm:transform.html.broken-links}"/>
         <map:serialize />
       </map:match>
     </map:pipeline>
@@ -91,7 +96,12 @@
     <map:pipeline>
       <map:match pattern="**.menu.xml">
         <map:generate src="cocoon://{1}.book.xml" />
-        <map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
+        <map:match pattern="**/*.menu.xml">
+          <map:transform type="linkrewriter" src="cocoon://{1}/linkmap-{2}" />
+        </map:match>
+        <map:match pattern="*.menu.xml">
+          <map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
+        </map:match>
         <map:transform src="{lm:transform.html.broken-links}" />
         <map:transform src="{lm:dataModel-html-book-to-menu.xsl}">
           <map:parameter name="path" value="{1}.html" />
@@ -125,7 +135,12 @@
             </map:act>
           </map:when>
         </map:select>
-        <map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
+        <map:match pattern="**/*.tab.xml">
+          <map:transform type="linkrewriter" src="cocoon://{1}/linkmap-{2}" />
+        </map:match>
+        <map:match pattern="*.tab.xml">
+          <map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
+        </map:match>
         <map:transform src="{lm:dataModel-html-tab-to-menu.xsl}">
           <!--<map:transform src="{lm:dataModel-html-tab2menu.xsl}">-->
           <map:parameter name="path" value="{1}{2}.html" />
@@ -137,15 +152,15 @@
       <map:match pattern="**.book.xml">
         <map:match pattern="**/*.book.xml">
           <map:select type="exists">
-            <map:when test="{project:content.xdocs}{1}book.xml">
+            <map:when test="{project:content.xdocs}{1}/book.xml">
               <!-- If a hand-created book.xml exists, use it -->
               <map:parameter name="url"
-                value="{project:content.xdocs}{1}book.xml" />
-              <map:generate src="{project:content.xdocs}{1}book.xml" />
+                value="{project:content.xdocs}{1}/book.xml" />
+              <map:generate src="{project:content.xdocs}{1}/book.xml" />
             </map:when>
             <map:otherwise>
               <!-- If no book.xml, generate it from the linkmap. -->
-              <map:generate src="cocoon:/menulinks-{1}{2}" />
+              <map:generate src="cocoon:/{1}/menulinks-{2}" />
               <!-- The above generates the subset of the linkmap relevant to our directory.
-->
               <map:transform
                 src="{forrest:stylesheets}/site-to-book.xsl" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv?rev=375445&r1=375444&r2=375445&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv Mon Feb
 6 18:03:11 2006
@@ -201,7 +201,8 @@
         <css url="pelt.basic.css" media="screen" theme="Pelt"/>
         <css url="pelt.screen.css" media="screen" theme="Pelt"/>
         <!-- You can request request specific css, but beware that you need to use the
*.dispatcher.css extension!!!-->
-        <css url="{$getRequest}.dispatcher.css" media="screen" theme="Pelt"/>
+        <!-- FIXME: that is not working ATM in forrest for subdir/bla needs more testing
-->
+        <!--<css url="#{$getRequest}.dispatcher.css" media="screen" theme="Pelt"/>-->
         <css url="pelt.print.css" media="print"/>
         <css>/* Extra css */
     p.quote {



Mime
View raw message