Author: diwaker
Date: Wed Nov 23 00:39:00 2005
New Revision: 348398

URL: http://svn.apache.org/viewcvs?rev=348398&view=rev
Log:
Making file names more consistent. Better use of locationmap still possible in 
some of these.


Added:
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/book-to-menu.xsl
      - copied unchanged from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/book2menu.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/document-to-html.xsl
      - copied unchanged from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/document2html.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/site-to-xhtml.xsl
      - copied unchanged from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/site2xhtml.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/tab-to-menu.xsl
      - copied unchanged from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/tab2menu.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book-to-menu.xsl
      - copied, changed from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book2menu.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document-to-html.xsl
      - copied, changed from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2html.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab-to-menu.xsl
      - copied, changed from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab2menu.xsl
Removed:
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/book2menu.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/document2html.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/site2xhtml.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/tab2menu.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book2menu.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2html.xsl
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab2menu.xsl
Modified:
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap

Modified: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap
URL: 
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap?rev=348398&r1=348397&r2=348398&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap
 Wed Nov 23 00:39:00 2005
@@ -44,7 +44,7 @@
       <!-- HTML rendered from intermediate format -->
       <map:match pattern="**.body.xml">
         <map:generate src="cocoon:/{1}.source.rewritten.xml" />
-        <map:transform src="{lm:dataModel-html-document2html.xsl}">
+        <map:transform src="{lm:dataModel-html-document-to-html.xsl}">
           <map:parameter name="path" value="{1}.html" />
         </map:transform>
         <map:serialize />
@@ -111,7 +111,7 @@
         <map:transform type="linkrewriter"
           src="cocoon://{1}linkmap-{2}.html" />
         <map:transform src="{lm:transform.html.broken-links}"/>
-        <map:transform src="{lm:dataModel-html-book2menu.xsl}">
+        <map:transform src="{lm:dataModel-html-book-to-menu.xsl}">
           <map:parameter name="path" value="{1}{2}.html" />
         </map:transform>
         <map:serialize />

Copied: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book-to-menu.xsl
 (from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book2menu.xsl)
URL: 
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book-to-menu.xsl?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book-to-menu.xsl&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book2menu.xsl&r1=348389&r2=348398&rev=348398&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book2menu.xsl
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/book-to-menu.xsl
 Wed Nov 23 00:39:00 2005
@@ -22,7 +22,7 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
 
-       <xsl:import href="../common/xslt/html/book2menu.xsl"/>
+       <xsl:import href="../common/xslt/html/book-to-menu.xsl"/>
 
   <xsl:template match="book">
     <div id="menu">

Copied: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document-to-html.xsl
 (from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2html.xsl)
URL: 
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document-to-html.xsl?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document-to-html.xsl&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2html.xsl&r1=348389&r2=348398&rev=348398&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2html.xsl
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document-to-html.xsl
 Wed Nov 23 00:39:00 2005
@@ -21,7 +21,7 @@
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
-  <xsl:import href="../common/xslt/html/document2html.xsl"/>
+  <xsl:import href="../common/xslt/html/document-to-html.xsl"/>
   <xsl:include href="../helper/generateId.xsl"/>
   <xsl:template match="document">
     <div id="content">

Copied: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab-to-menu.xsl
 (from r348389, 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab2menu.xsl)
URL: 
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab-to-menu.xsl?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab-to-menu.xsl&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab2menu.xsl&r1=348389&r2=348398&rev=348398&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab2menu.xsl
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/tab-to-menu.xsl
 Wed Nov 23 00:39:00 2005
@@ -41,7 +41,7 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
 
-       <xsl:import href="../common/xslt/html/tab2menu.xsl"/>
+       <xsl:import href="../common/xslt/html/tab-to-menu.xsl"/>
 
   <xsl:template match="tabs">
        <ul id="nav-main">

Modified: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap
URL: 
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap?rev=348398&r1=348397&r2=348398&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap
 Wed Nov 23 00:39:00 2005
@@ -65,11 +65,12 @@
           </map:when>
         </map:select>
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.html"/>
-        <map:transform src="{lm:dataModel-html-tab2menu.xsl}">
+        <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"/>
         </map:transform>
         <map:serialize />
       </map:match>
     </map:pipeline>
   </map:pipelines>
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>


Reply via email to