svn commit: r533129 - in /lenya/docu: build.xml tools/generateModuleDocs.xsl

Author: andreas
Date: Fri Apr 27 07:56:50 2007
New Revision: 533129

URL: http://svn.apache.org/viewvc?view=rev&rev=533129
Log:
Simplified generation of module list

Modified:
    lenya/docu/build.xml
    lenya/docu/tools/generateModuleDocs.xsl

Modified: lenya/docu/build.xml
URL: 
http://svn.apache.org/viewvc/lenya/docu/build.xml?view=diff&rev=533129&r1=533128&r2=533129
==============================================================================
--- lenya/docu/build.xml (original)
+++ lenya/docu/build.xml Fri Apr 27 07:56:50 2007
@@ -18,10 +18,10 @@
 <project name="lenya-docs" default="main">
 
   <target name="modules">
-    <property name="lenyaHome" value="../../trunk"/>
+    <property name="lenyaHome" value="../trunk"/>
     <property name="site" value="src/documentation/content/xdocs/site.xml"/>
     <xslt
-      in="${site}"
+      in="${lenyaHome}/build/lenya/temp/modules.xconf"
       out="build/templates/modules.xml"
       style="tools/generateModuleDocs.xsl">
       <param name="lenyaHome" expression="${lenyaHome}"/>

Modified: lenya/docu/tools/generateModuleDocs.xsl
URL: 
http://svn.apache.org/viewvc/lenya/docu/tools/generateModuleDocs.xsl?view=diff&rev=533129&r1=533128&r2=533129
==============================================================================
--- lenya/docu/tools/generateModuleDocs.xsl (original)
+++ lenya/docu/tools/generateModuleDocs.xsl Fri Apr 27 07:56:50 2007
@@ -5,61 +5,43 @@
   xmlns:modules="http://apache.org/lenya/module-list/1.0";
   >
   
-  <xsl:param name="lenyaHome"/>
-  
   <xsl:output indent="yes" method="xml"/>
   
-  <xsl:variable name="moduleList" select="concat($lenyaHome, 
'/build/lenya/temp/modules.xconf')"/>
-  
-  
-  <xsl:template match="/*">
-    <xsl:apply-templates select=".//site:module_list"/>
-  </xsl:template>
-  
-  <xsl:template match="site:module_list">
-    <xsl:variable name="listNode" select="current()"/>
-    <xsl:copy>
-      <xsl:copy-of select="site:index"/>
+  <xsl:template match="/xconf">
+    <modules>
       <xsl:comment>
         The template for this module list is generated.
         Run "ant modules" in the documentation root directory,
         but make sure not to include your custom modules.
         The generated list is in build/templates/modules.xml.
       </xsl:comment>
-      <core_modules label="Core Modules">
-        <xsl:apply-templates 
select="document($moduleList)/xconf/component/modules/module">
+      <core_modules label="Core Modules" href="../modules/">
+        <xsl:apply-templates select="component/modules/module">
           <xsl:with-param name="pattern">/modules-core/</xsl:with-param>
-          <xsl:with-param name="listNode" select="$listNode"/>
           <xsl:sort select="@shortcut"/>
         </xsl:apply-templates>
       </core_modules>
-      <standard_modules label="Standard Modules">
-        <xsl:apply-templates 
select="document($moduleList)/xconf/component/modules/module">
+      <standard_modules label="Standard Modules" href="../modules/">
+        <xsl:apply-templates select="component/modules/module">
           <xsl:with-param name="pattern">/modules/</xsl:with-param>
-          <xsl:with-param name="listNode" select="$listNode"/>
           <xsl:sort select="@shortcut"/>
         </xsl:apply-templates>
       </standard_modules>
-    </xsl:copy>
+    </modules>
   </xsl:template>
   
   
   <xsl:template match="module">
     <xsl:param name="pattern"/>
-    <xsl:param name="listNode"/>
     <xsl:if test="contains(@src, $pattern)">
-      <xsl:element name="{@shortcut}_module_section" 
namespace="http://apache.org/forrest/linkmap/1.0";>
+      <xsl:element name="{@shortcut}_module_section">
         <xsl:attribute name="label"><xsl:value-of 
select="@shortcut"/></xsl:attribute>
-        <xsl:copy-of select="$listNode//*[local-name() = 
concat(current()/@shortcut, '_module_section')]/*[not(@label = 'API')]"/>
-        <!--
-        <xsl:element name="{@shortcut}_module_overview" 
namespace="http://apache.org/forrest/linkmap/1.0";>
+        <xsl:attribute name="href"><xsl:value-of 
select="@shortcut"/>/</xsl:attribute>
+        <xsl:element name="{@shortcut}_module_overview">
           <xsl:attribute name="label">Overview</xsl:attribute>
-          <xsl:attribute name="href"><xsl:value-of 
select="@shortcut"/>.html</xsl:attribute>
+          <xsl:attribute name="href">index.html</xsl:attribute>
         </xsl:element>
-        <xsl:call-template name="lineBreak"/>
-        <xsl:text>  </xsl:text>
-        -->
-        <xsl:element name="{@shortcut}_module_api" 
namespace="http://apache.org/forrest/linkmap/1.0";>
+        <xsl:element name="{@shortcut}_module_api">
           <xsl:attribute name="label">API</xsl:attribute>
           <xsl:attribute 
name="href">../../../../apidocs/1.4/modules/<xsl:value-of 
select="@shortcut"/>/index.html</xsl:attribute>
         </xsl:element>
@@ -67,13 +49,5 @@
     </xsl:if>
   </xsl:template>
   
-  
-  <!--
-  <xsl:template match="@*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-  -->
 
 </xsl:stylesheet>