jmartin 01/02/22 01:32:41
Modified: src/xsl build.build.xsl build.javadoc.xsl build.test.xsl
left-advanced.xsl left-basic.xsl merge.xsl
nav-page.xsl right.xsl
Log:
Changed files to support more gumpish workspace DTD
Revision Changes Path
1.11 +9 -1 jakarta-alexandria/src/xsl/build.build.xsl
Index: build.build.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.build.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.build.xsl 2001/02/06 23:54:22 1.10
+++ build.build.xsl 2001/02/22 09:32:40 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output indent="yes"/>
@@ -35,6 +35,9 @@
<xsl:if test="build">
<target name="{$module}.{@tag}">
+ <echo file="logs/alexandria.log" append="yes">
+ Building <xsl:value-of select="$module"/><xsl:value-of select="@tag"/>
+ </echo>
<java
fork="true"
classname="org.apache.tools.ant.Main">
@@ -70,6 +73,11 @@
<pathelement path="${{java.home}}/../lib/tools.jar"/>
<pathelement path="Alexandria.jar"/>
<pathelement path="lib/castor-0.8.11.jar"/>
+ <xsl:for-each select="depend|option">
+ <pathelement>
+ <xsl:attribute name="path"><xsl:value-of
select="/workspace/project[@name=current()/@project]/jar/@name"/></xsl:attribute>
+ </pathelement>
+ </xsl:for-each>
</classpath>
</java>
1.6 +3 -0 jakarta-alexandria/src/xsl/build.javadoc.xsl
Index: build.javadoc.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.javadoc.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.javadoc.xsl 2001/02/06 23:54:23 1.5
+++ build.javadoc.xsl 2001/02/22 09:32:40 1.6
@@ -31,6 +31,9 @@
<xsl:variable name="javasrc" select="javasrc"/>
<target name="{$module}.{@tag}">
+ <echo file="logs/alexandria.log" append="yes">
+ Building Javadoc for <xsl:value-of select="$module"/> <xsl:value-of
select="@tag"/>
+ </echo>
<!--
Remove the old Javadoc for this module
1.13 +9 -6 jakarta-alexandria/src/xsl/build.test.xsl
Index: build.test.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.test.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.test.xsl 2001/02/06 23:54:24 1.12
+++ build.test.xsl 2001/02/22 09:32:40 1.13
@@ -7,12 +7,6 @@
<project name="Alexandria" default="all" basedir=".">
<property file="etc/AlexandriaResources.properties" />
- <property name="xx.lib.xerces" value="../../lib/xerces.jar" />
- <property name="lib.svg" value="lib/svg.jar" />
- <property name="lib.css" value="lib/css.jar" />
- <property name="lib.dom2" value="lib/dom2.jar" />
- <property name="lib.js" value="lib/js.jar" />
- <property name="lib.JimiProClasses.zip" value="lib/JimiProClasses.zip" />
<taskdef name="aggtests" classname="org.apache.alexandria.AggregateTests" />
@@ -45,6 +39,10 @@
<xsl:if test="test">
<target name="{$module}.{@tag}">
+ <echo file="logs/alexandria.log" append="yes">
+ Testing <xsl:value-of select="$module"/> <xsl:value-of select="@tag"/>
+ </echo>
+
<java
fork="true"
classname="org.apache.tools.ant.Main">
@@ -75,6 +73,11 @@
<pathelement path="${{java.home}}/../lib/tools.jar"/>
<pathelement path="Alexandria.jar"/>
<pathelement path="lib/castor-0.8.11.jar"/>
+ <xsl:for-each select="depend|option">
+ <pathelement>
+ <xsl:attribute name="path"><xsl:value-of
select="/workspace/project[@name=current()/@project]/jar/@name"/></xsl:attribute>
+ </pathelement>
+ </xsl:for-each>
</classpath>
</java>
<xstyle
1.15 +45 -43 jakarta-alexandria/src/xsl/left-advanced.xsl
Index: left-advanced.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/left-advanced.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- left-advanced.xsl 2001/02/09 10:28:08 1.14
+++ left-advanced.xsl 2001/02/22 09:32:40 1.15
@@ -20,57 +20,59 @@
<!-- For each projcet get the list of projects and tegs that match
-->
<xsl:for-each select="$project-list">
- <xsl:variable name="project-url"
- select="concat('../right.html#', module)" />
- level1 = insFld(foldersTree, gFld("<xsl:value-of select="title" />", "
<xsl:value-of select="$project-url" /> "));
+ <xsl:variable name="project-url"
+ select="concat('../right.html#', module)" />
+ level1 = insFld(foldersTree, gFld("<xsl:value-of select="title" />", "
<xsl:value-of select="$project-url" /> "));
<xsl:sort select="title" order="ascending" case-order="upper-first" />
<xsl:apply-templates select="/workspace/project[title=current()/title]"/>
</xsl:for-each>
</xsl:template>
<xsl:template match="project">
- <xsl:variable name="build.file" select="build/@file" />
- <xsl:variable name="test.file" select="test/@file" />
- <xsl:variable name="repository"
select="/workspace/repository[@name=current()/@repository]" />
-
- <xsl:variable name="browse-url"
- select="concat('../../cvs/', module, '/', @tag, '/', module )" />
- <xsl:variable name="doc-url"
- select="concat('../../html/javadoc/', module, '/', @tag )" />
- <xsl:variable name="blame-url"
- select="concat('../../html/', module, '.', @tag, '.blame.html')" />
-
- level2 = insFld(level1, gFld("<xsl:value-of select="@tag" />", ""));
-
- <xsl:if test="$repository[@type='cvs']">
- <xsl:if test="$repository/cvsweb">
- insDoc(level2, gLnk(2, "CVSWeb","<xsl:value-of
select="concat($repository/cvsweb, module)" />"));
+ <xsl:if test="@show='true'">
+ <xsl:variable name="build.file" select="build/@file" />
+ <xsl:variable name="test.file" select="test/@file" />
+ <xsl:variable name="repository"
select="/workspace/repository[@name=current()/@repository]" />
+
+ <xsl:variable name="browse-url"
+ select="concat('../../cvs/', module, '/', @tag, '/', module )" />
+ <xsl:variable name="doc-url"
+ select="concat('../../html/javadoc/', module, '/', @tag )" />
+ <xsl:variable name="blame-url"
+ select="concat('../../html/', module, '.', @tag, '.blame.html')" />
+
+ level2 = insFld(level1, gFld("<xsl:value-of select="@tag" />", ""));
+
+ <xsl:if test="$repository[@type='cvs']">
+ <xsl:if test="$repository/cvsweb">
+ insDoc(level2, gLnk(2, "CVSWeb","<xsl:value-of
select="concat($repository/cvsweb, module)" />"));
+ </xsl:if>
+ insDoc(level2, gLnk(2, "Change Log","<xsl:value-of
select="$browse-url"/>/ChangeLog.html"));
</xsl:if>
- insDoc(level2, gLnk(2, "Change Log","<xsl:value-of
select="$browse-url"/>/ChangeLog.html"));
- </xsl:if>
- <xsl:if test="@opensource='true'">
- insDoc(level2, gLnk(2, "Browse","<xsl:value-of
select="$browse-url"/>/alexandria.index.html" ));
- </xsl:if>
-
- <xsl:if test="string-length( $build.file ) > 0">
-
- <!-- Build Log -->
- insDoc(level2, gLnk(2, "Build Log","<xsl:value-of
select="$browse-url"/>/build.html"));
-
- <!-- Blame Log -->
- insDoc(level2, gLnk(2, "Blame Log","<xsl:value-of select="$blame-url" />"));
- </xsl:if>
- <xsl:if test="string-length( $test.file ) > 0">
- <!-- Test Log -->
- insDoc(level2, gLnk(2, "Unit Tests","<xsl:value-of
select="$browse-url"/>/testsuite.html"));
- <!-- Test Log -->
- insDoc(level2, gLnk(2, "Unit Tests Stats","<xsl:value-of
select="$browse-url"/>/stats.html"));
- <!-- Build Log -->
- insDoc(level2, gLnk(2, "Test Log","<xsl:value-of
select="$browse-url"/>/test.html"));
- </xsl:if>
- <xsl:if test="javasrc">
- insDoc(level2, gLnk(2, "Javadoc","<xsl:value-of
select="$doc-url"/>/index.html"));
+ <xsl:if test="@opensource='true'">
+ insDoc(level2, gLnk(2, "Browse","<xsl:value-of
select="$browse-url"/>/alexandria.index.html" ));
+ </xsl:if>
+
+ <xsl:if test="string-length( $build.file ) > 0">
+
+ <!-- Build Log -->
+ insDoc(level2, gLnk(2, "Build Log","<xsl:value-of
select="$browse-url"/>/build.html"));
+
+ <!-- Blame Log -->
+ insDoc(level2, gLnk(2, "Blame Log","<xsl:value-of select="$blame-url" />"));
+ </xsl:if>
+ <xsl:if test="string-length( $test.file ) > 0">
+ <!-- Test Log -->
+ insDoc(level2, gLnk(2, "Unit Tests","<xsl:value-of
select="$browse-url"/>/testsuite.html"));
+ <!-- Test Log -->
+ insDoc(level2, gLnk(2, "Unit Tests Stats","<xsl:value-of
select="$browse-url"/>/stats.html"));
+ <!-- Build Log -->
+ insDoc(level2, gLnk(2, "Test Log","<xsl:value-of
select="$browse-url"/>/test.html"));
+ </xsl:if>
+ <xsl:if test="javasrc">
+ insDoc(level2, gLnk(2, "Javadoc","<xsl:value-of
select="$doc-url"/>/index.html"));
+ </xsl:if>
</xsl:if>
</xsl:template>
</xsl:stylesheet>
1.5 +1 -1 jakarta-alexandria/src/xsl/left-basic.xsl
Index: left-basic.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/left-basic.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- left-basic.xsl 2001/02/04 23:54:35 1.4
+++ left-basic.xsl 2001/02/22 09:32:40 1.5
@@ -32,7 +32,7 @@
<!-- name -->
<tr>
<td colspan="3">
- <a href="{home}" target="right"><xsl:value-of select="$title"/></a>
+ <a href="{home-page}" target="right"><xsl:value-of select="$title"/></a>
</td>
</tr>
1.3 +7 -9 jakarta-alexandria/src/xsl/merge.xsl
Index: merge.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/merge.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merge.xsl 2001/02/06 23:54:25 1.2
+++ merge.xsl 2001/02/22 09:32:40 1.3
@@ -4,6 +4,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output indent="yes"/>
<!-- =================================================================== -->
<!-- process all projects referenced in a workspace -->
<!-- =================================================================== -->
@@ -41,10 +42,7 @@
<xsl:for-each select="project[@href]">
<xsl:variable name="home" select="@home"/>
- <xsl:message>
- <xsl:text>- </xsl:text>
- <xsl:value-of select="@href"/>
- </xsl:message>
+<xsl:message>Including project <xsl:value-of select="@href"/></xsl:message>
<xsl:text> </xsl:text>
<!-- is the file found? -->
@@ -75,10 +73,7 @@
<!-- Process repositories -->
<xsl:for-each select="repository[@href]">
- <xsl:message>
- <xsl:text>- </xsl:text>
- <xsl:value-of select="@href"/>
- </xsl:message>
+<xsl:message>Including repository <xsl:value-of select="@href"/></xsl:message>
<xsl:text> </xsl:text>
<!-- is the file found? -->
@@ -106,10 +101,12 @@
<!-- =================================================================== -->
<xsl:template name="project">
+ <xsl:message>Processing project</xsl:message>
<xsl:param name="home"/>
<xsl:param name="basedir"/>
<xsl:param name="tag"/>
<xsl:param name="defined-in"/>
+ <xsl:param name="show">true</xsl:param>
<xsl:variable name="project" select="@name"/>
@@ -135,6 +132,7 @@
<xsl:copy>
<xsl:copy-of select="@*[name()!='srcdir']"/>
+ <xsl:attribute name="show"><xsl:value-of select="$show"/></xsl:attribute>
<xsl:if test="$defined-in">
<xsl:attribute name="defined-in">
<xsl:value-of select="$defined-in"/>
@@ -204,7 +202,6 @@
</xsl:if>
</xsl:for-each>
-
</xsl:copy>
<!-- process nested projects -->
@@ -215,6 +212,7 @@
<xsl:with-param name="home" select="$home"/>
<xsl:with-param name="basedir" select="$basedir"/>
<xsl:with-param name="defined-in" select="$defined-in"/>
+ <xsl:with-param name="show" select="'false'"/>
</xsl:call-template>
</xsl:for-each>
1.2 +1 -1 jakarta-alexandria/src/xsl/nav-page.xsl
Index: nav-page.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/nav-page.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nav-page.xsl 2001/02/04 23:54:35 1.1
+++ nav-page.xsl 2001/02/22 09:32:40 1.2
@@ -9,7 +9,7 @@
<target name="menus" description="Generate Alexandria menus">
<xsl:for-each select="nav-page">
- <xstyle in="${{workspace}}" out="${{content.dir}}/{@out}"
style="{@style}"/>
+ <xstyle in="var/${{workspace}}" out="${{content.dir}}/{@out}"
style="{@style}"/>
</xsl:for-each>
<chmod perm="ug+rwX" type="both">
1.6 +8 -7 jakarta-alexandria/src/xsl/right.xsl
Index: right.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/right.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- right.xsl 2001/02/14 13:08:49 1.5
+++ right.xsl 2001/02/22 09:32:40 1.6
@@ -13,6 +13,7 @@
<p><h2>Documentation currently available within Alexandria:</h2></p>
+ <!--<xsl:apply-templates select="project[@show='true']">-->
<xsl:apply-templates select="project">
<xsl:sort select="title"
@@ -29,12 +30,12 @@
<xsl:template match="project">
- <xsl:variable name="repository"
select="/workspace/repository[@name=current()/@repository]"/>
+ <xsl:if test="@show='true'">
+ <xsl:variable name="repository"
select="/workspace/repository[@name=current()/@repository]"/>
- <a name="{module}"></a>
- <li>
+ <a name="{module}"></a>
<p>
- <a href="{home}"><xsl:value-of select="title"/></a>: <xsl:value-of
select="description"/>
+ <a href="{home-page}"><xsl:value-of select="title"/></a>: <xsl:value-of
select="description"/>
</p>
<xsl:if test="$repository[@type='cvs']">
<p>
@@ -45,9 +46,9 @@
cvs -d <xsl:value-of select="$repository/root"/> checkout <xsl:value-of
select="module"/> <br/>
</p>
</xsl:if>
- </li>
- <hr/>
-
+ <hr/>
+
+ </xsl:if>
</xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
