jmartin 01/02/06 15:54:30
Modified: src/xsl build.build.xsl build.cvs.xsl build.javadoc.xsl
build.test.xsl left-advanced.xsl merge.xsl
migrate0.2.xml
Log:
I fixes to new changes made to move to new schema
Revision Changes Path
1.10 +10 -10 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.build.xsl 2001/02/04 23:54:35 1.9
+++ build.build.xsl 2001/02/06 23:54:22 1.10
@@ -10,30 +10,30 @@
<target name="all">
<xsl:attribute name="depends">
- <xsl:for-each select = "project/revision">
+ <xsl:for-each select = "project">
<xsl:if test="../build">
<xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
- <xsl:value-of select="../module"/><xsl:text>.</xsl:text>
+ <xsl:value-of select="module"/><xsl:text>.</xsl:text>
<xsl:value-of select="@tag"/>
</xsl:if>
</xsl:for-each>
</xsl:attribute>
</target>
- <xsl:apply-templates select="project/revision"/>
+ <xsl:apply-templates select="project"/>
</project>
</xsl:template>
- <xsl:template match="project/revision">
- <xsl:variable name="module" select="../module"/>
- <xsl:variable name="javasrc" select="../javasrc"/>
- <xsl:variable name="build.file" select="../build/@file"/>
- <xsl:variable name="build.target" select="../build/@target"/>
- <xsl:variable name="build.classpath" select="../build/@classpath"/>
+ <xsl:template match="project">
+ <xsl:variable name="module" select="module"/>
+ <xsl:variable name="javasrc" select="javasrc"/>
+ <xsl:variable name="build.file" select="build/@file"/>
+ <xsl:variable name="build.target" select="build/@target"/>
+ <xsl:variable name="build.classpath" select="build/@classpath"/>
- <xsl:if test="../build">
+ <xsl:if test="build">
<target name="{$module}.{@tag}">
<java
fork="true"
1.6 +7 -7 jakarta-alexandria/src/xsl/build.cvs.xsl
Index: build.cvs.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.cvs.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.cvs.xsl 2001/02/04 23:54:35 1.5
+++ build.cvs.xsl 2001/02/06 23:54:23 1.6
@@ -11,23 +11,23 @@
<taskdef name="aggtests" classname="org.apache.alexandria.AggregateTests" />
<target name="all">
<xsl:attribute name="depends">
- <xsl:for-each select = "project/revision">
+ <xsl:for-each select = "project">
<xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
- <xsl:value-of select="../module"/><xsl:text>.</xsl:text>
+ <xsl:value-of select="module"/><xsl:text>.</xsl:text>
<xsl:value-of select="@tag"/>
</xsl:for-each>
</xsl:attribute>
</target>
- <xsl:apply-templates select="project/revision"/>
+ <xsl:apply-templates select="project"/>
</project>
</xsl:template>
- <xsl:template match="revision">
+ <xsl:template match="project">
- <xsl:variable name="name" select="../@repository"/>
+ <xsl:variable name="name" select="@repository"/>
<xsl:variable name="repository" select="/workspace/repository[@name=$name]"/>
<xsl:if test="not($repository)">
@@ -37,9 +37,9 @@
</xsl:if>
<xsl:variable name="type" select="$repository/@type"/>
- <xsl:variable name="module" select="../module"/>
+ <xsl:variable name="module" select="module"/>
<xsl:variable name="root" select="$repository/root"/>
- <xsl:variable name="javasrc" select="../javasrc"/>
+ <xsl:variable name="javasrc" select="javasrc"/>
<xsl:variable name="cvsweb-url" select="$repository/cvsweb"/>
<target name="{$module}.{@tag}">
1.5 +7 -7 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.javadoc.xsl 2001/02/04 23:54:35 1.4
+++ build.javadoc.xsl 2001/02/06 23:54:23 1.5
@@ -10,25 +10,25 @@
<taskdef name="aggtests" classname="org.apache.alexandria.AggregateTests" />
<target name="all">
<xsl:attribute name="depends">
- <xsl:for-each select = "project/revision">
+ <xsl:for-each select = "project">
<xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
- <xsl:value-of select="../module"/><xsl:text>.</xsl:text>
+ <xsl:value-of select="module"/><xsl:text>.</xsl:text>
<xsl:value-of select="@tag"/>
</xsl:for-each>
</xsl:attribute>
</target>
- <xsl:apply-templates select="project/revision"/>
+ <xsl:apply-templates select="project"/>
</project>
</xsl:template>
- <xsl:template match="revision">
+ <xsl:template match="project">
- <xsl:variable name="module" select="../module"/>
- <xsl:variable name="name" select="../title"/>
- <xsl:variable name="javasrc" select="../javasrc"/>
+ <xsl:variable name="module" select="module"/>
+ <xsl:variable name="name" select="title"/>
+ <xsl:variable name="javasrc" select="javasrc"/>
<target name="{$module}.{@tag}">
1.12 +11 -11 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.test.xsl 2001/02/04 23:54:35 1.11
+++ build.test.xsl 2001/02/06 23:54:24 1.12
@@ -18,8 +18,8 @@
<target name="all">
<xsl:attribute name="depends">
- <xsl:for-each select = "project/revision">
- <xsl:if test="../test">
+ <xsl:for-each select = "project">
+ <xsl:if test="test">
<xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
<xsl:value-of select="../module"/><xsl:text>.</xsl:text>
<xsl:value-of select="@tag"/>
@@ -28,22 +28,22 @@
</xsl:attribute>
</target>
- <xsl:apply-templates select="project/revision"/>
+ <xsl:apply-templates select="project"/>
</project>
</xsl:template>
- <xsl:template match="project/revision">
+ <xsl:template match="project">
- <xsl:variable name="module" select="../module"/>
- <xsl:variable name="name" select="../name"/>
- <xsl:variable name="javasrc" select="../javasrc"/>
- <xsl:variable name="test.file" select="../test/@file"/>
- <xsl:variable name="test.target" select="../test/@target"/>
- <xsl:variable name="test.classpath" select="../test/@classpath"/>
+ <xsl:variable name="module" select="module"/>
+ <xsl:variable name="name" select="name"/>
+ <xsl:variable name="javasrc" select="javasrc"/>
+ <xsl:variable name="test.file" select="test/@file"/>
+ <xsl:variable name="test.target" select="test/@target"/>
+ <xsl:variable name="test.classpath" select="test/@classpath"/>
- <xsl:if test="../test">
+ <xsl:if test="test">
<target name="{$module}.{@tag}">
<java
fork="true"
1.12 +12 -19 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- left-advanced.xsl 2001/02/04 23:54:35 1.11
+++ left-advanced.xsl 2001/02/06 23:54:24 1.12
@@ -24,36 +24,31 @@
level1 = insFld(foldersTree, gFld("<xsl:value-of select="$title" />", "
<xsl:value-of select="$project-url" /> "));
- <xsl:apply-templates select="./revision" />
- </xsl:template>
-
- <xsl:template match="revision">
- <xsl:variable name="type" select="../../@type" />
+ <xsl:variable name="type" select="@type" />
- <xsl:variable name="opensource" select="../../@opensource" />
+ <xsl:variable name="opensource" select="@opensource" />
- <xsl:variable name="build.file" select="../build/@file" />
+ <xsl:variable name="build.file" select="build/@file" />
- <xsl:variable name="test.file" select="../test/@file" />
+ <xsl:variable name="test.file" select="test/@file" />
- <xsl:variable name="module"
- select="../module" />
+ <xsl:variable name="module" select="module" />
<xsl:variable name="tag" select="@tag" />
- <xsl:variable name="root" select="../../root" />
+ <xsl:variable name="root" select="root" />
- <xsl:variable name="javasrc" select="../javasrc" />
+ <xsl:variable name="javasrc" select="javasrc" />
- <xsl:variable name="title" select="../title" />
+ <xsl:variable name="title" select="title" />
- <xsl:variable name="cvsweb" select="../../cvsweb" />
+ <xsl:variable name="cvsweb" select="cvsweb" />
<xsl:variable name="project-url"
select="concat('../right.html#', $module)" />
level2 = insFld(level1, gFld("<xsl:value-of select="$tag" />", ""));
- <xsl:apply-templates select="../javasrc" />
+ <xsl:apply-templates select="javasrc" />
<!-- cvsweb -->
<xsl:if test="$type='cvs'">insDoc(level2, gLnk(2, "CVSWeb","<xsl:value-of
select="concat($cvsweb, $module)" />"));</xsl:if>
@@ -105,11 +100,10 @@
</xsl:template>
<xsl:template match="javasrc">
- <xsl:variable name="module"
- select="../module" />
+ <xsl:variable name="module" select="../module" />
<!-- FIX ME: this will break on multiple revisions -->
- <xsl:variable name="tag" select="../revision/@tag" />
+ <xsl:variable name="tag" select="../@tag" />
<xsl:variable name="title" select="../title" />
@@ -119,4 +113,3 @@
insDoc(level2, gLnk(2, "Javadoc","<xsl:value-of select="$browse-url" />"));
</xsl:template>
</xsl:stylesheet>
-
1.2 +8 -0 jakarta-alexandria/src/xsl/merge.xsl
Index: merge.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/merge.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merge.xsl 2001/02/04 23:54:35 1.1
+++ merge.xsl 2001/02/06 23:54:25 1.2
@@ -61,10 +61,12 @@
<xsl:variable name="defined-in"
select="substring-before(substring-after(@href,'/'),'.')"/>
+ <xsl:variable name="tag" select="@tag"/>
<xsl:for-each select="$file/project">
<xsl:call-template name="project">
<xsl:with-param name="home" select="$home"/>
<xsl:with-param name="basedir" select="$basedir"/>
+ <xsl:with-param name="tag" select="$tag"/>
<xsl:with-param name="defined-in" select="$defined-in"/>
</xsl:call-template>
</xsl:for-each>
@@ -93,6 +95,7 @@
<xsl:copy-of select="$file[not(self::home|self::project)] |@*| text()"/>
+
</xsl:for-each>
</xsl:copy>
@@ -105,6 +108,7 @@
<xsl:template name="project">
<xsl:param name="home"/>
<xsl:param name="basedir"/>
+ <xsl:param name="tag"/>
<xsl:param name="defined-in"/>
<xsl:variable name="project" select="@name"/>
@@ -139,6 +143,10 @@
<xsl:attribute name="srcdir">
<xsl:value-of select="$srcdir"/>
+ </xsl:attribute>
+
+ <xsl:attribute name="tag">
+ <xsl:value-of select="$tag"/>
</xsl:attribute>
<xsl:copy-of select="*[not(self::home|self::project)] | text()"/>
1.2 +2 -1 jakarta-alexandria/src/xsl/migrate0.2.xml
Index: migrate0.2.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/migrate0.2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- migrate0.2.xml 2001/02/04 23:54:35 1.1
+++ migrate0.2.xml 2001/02/06 23:54:25 1.2
@@ -21,6 +21,7 @@
<redirect:write select="concat('repositories/',name,'.xml')">
<xsl:copy>
<xsl:attribute name="name"><xsl:value-of select="name"/></xsl:attribute>
+ <xsl:attribute name="type">cvs</xsl:attribute>
<title><xsl:value-of select="name"/></title>
<xsl:copy-of select="@*"/>
<xsl:copy-of select="*[not(self::module)][not(self::name)]"/>
@@ -31,7 +32,7 @@
<xsl:for-each select="repository/module/revision">
<project>
<xsl:attribute name="href"><xsl:value-of
select="concat('projects/',../name,'.xml')" /></xsl:attribute>
- <xsl:attribute name="revision"><xsl:value-of
select="@tag"/></xsl:attribute>
+ <xsl:attribute name="tag"><xsl:value-of select="@tag"/></xsl:attribute>
</project>
<redirect:write select="concat('projects/',../name,'.xml')">
<project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
