rubys 01/08/28 09:15:38
Modified: proposal/gump gen.java
proposal/gump/profile gump.xml
proposal/gump/project jakarta-tomcat-40.xml
proposal/gump/stylesheet bash.xsl build.xsl defaults.xsl
jakarta.xsl update.xsl win2k.xsl
Log:
Further decoupling of project and module
Revision Changes Path
1.10 +35 -42 jakarta-alexandria/proposal/gump/gen.java
Index: gen.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/gen.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gen.java 2001/08/18 02:12:17 1.9
+++ gen.java 2001/08/28 16:15:38 1.10
@@ -136,26 +136,25 @@
* @param list Hashtable used for recursion. Must initially be empty.
* @param Node Starting point for search.
*/
- private void merge(String type, Hashtable list, Node parent) {
- Node child=parent.getFirstChild();
- while (child != null) {
- Node next=child.getNextSibling();
- if (child.getNodeName().equals(type)) {
- Element element = (Element) child;
- String name = element.getAttributeNode("name").getValue();
-
- Element priorDefinition = (Element)list.get(name);
- if (priorDefinition == null) {
- list.put(name, element);
- merge(type, list, element);
- } else if (priorDefinition != element) {
- element.getParentNode().removeChild(element);
- copyChildren(element, priorDefinition);
- element=priorDefinition;
- }
- }
- child=next;
- }
+ private void merge(String type, Hashtable list, Node document)
+ throws Exception
+ {
+ NodeIterator nl = XPathAPI.selectNodeIterator(document, "//"+type);
+ for (Node child=nl.nextNode(); child!=null; child=nl.nextNode()) {
+ Element element = (Element) child;
+ String name = element.getAttributeNode("name").getValue();
+
+ Element priorDefinition = (Element)list.get(name);
+ if (priorDefinition != null && priorDefinition != element) {
+ Element parent = (Element)priorDefinition.getParentNode();
+ String definedIn = parent.getAttribute("name");
+ if (!definedIn.equals(""))
+ element.setAttribute("defined-in",definedIn);
+ copyChildren(priorDefinition, element);
+ parent.removeChild(priorDefinition);
+ }
+ list.put(name, element);
+ }
}
/**
@@ -167,7 +166,9 @@
* @param type Element localname. Typically project or repository.
* @param Node Root (workspace) node
*/
- private void flatten(String type, Node root) {
+ private Hashtable flatten(String type, Node root)
+ throws Exception
+ {
Hashtable list = new Hashtable();
merge(type, list, root);
for (Enumeration e=list.keys(); e.hasMoreElements();) {
@@ -180,6 +181,7 @@
root.appendChild(element);
}
}
+ return list;
}
/**
@@ -225,27 +227,18 @@
}
/**
- * Rename <module> to <project>. This is a transitional convenience
- * as I move from the nested project approach to a simple declaration
- * of the projects (or perhaps, instead the targets) contained within
- * a module.
- * @param document to be transformed
+ * Flatten all modules, and in the process resolve all srcdirs.
+ * If the srcdir attribute is not present, it defaults to the value
+ * of name. Either way, basedir gets prepended.
*/
- private void renameModuleToProject(Document document) throws Exception {
-
- // safely get a list of all modules
- NodeIterator nl = XPathAPI.selectNodeIterator(document, "//module");
- Vector list = new Vector();
- for (Node module=nl.nextNode(); module!=null; module=nl.nextNode()) {
- list.add(module);
- }
-
- // replace all elements in that list with projects
- for (Enumeration e=list.elements(); e.hasMoreElements();) {
- Element module = (Element)e.nextElement();
- Element project = document.createElement("project");
- copyChildren(module, project);
- module.getParentNode().replaceChild(project, module);
+ private void computeSrcdir(Element workspace) throws Exception {
+ String basedir = workspace.getAttribute("basedir");
+ Hashtable modules = flatten("module", workspace);
+ for (Enumeration e=modules.keys(); e.hasMoreElements();) {
+ Element module = (Element)modules.get(e.nextElement());
+ String srcdir=module.getAttribute("srcdir");
+ if (srcdir.equals("")) srcdir=module.getAttribute("name");
+ module.setAttribute("srcdir", basedir + "/" + srcdir);
}
}
@@ -258,10 +251,10 @@
private gen(String source) throws Exception {
Document workspace = parse(source);
expand((Element)workspace.getFirstChild());
- renameModuleToProject(workspace);
flatten("project", workspace.getFirstChild());
flatten("repository", workspace.getFirstChild());
antDependsToProperties(workspace);
+ computeSrcdir((Element) workspace.getFirstChild());
Node resolved = transform(workspace, "defaults.xsl");
output (resolved, "work/merge.xml");
1.24 +83 -83 jakarta-alexandria/proposal/gump/profile/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/profile/gump.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gump.xml 2001/08/22 00:37:01 1.23
+++ gump.xml 2001/08/28 16:15:38 1.24
@@ -2,102 +2,102 @@
<!-- Apache.Jakarta -->
- <project href="project/jakarta-alexandria.xml"/>
- <project href="project/jakarta-ant.xml"/>
- <project href="project/jakarta-ant-antidote.xml"/>
- <project href="project/jakarta-avalon-cornerstone.xml"/>
- <project href="project/jakarta-avalon-excalibur.xml"/>
- <project href="project/jakarta-avalon-logkit.xml"/>
- <project href="project/jakarta-avalon-phoenix.xml"/>
- <project href="project/jakarta-avalon-testlet.xml"/>
- <project href="project/jakarta-avalon.xml"/>
- <project href="project/jakarta-commons.xml"/>
- <project href="project/jakarta-commons-sandbox.xml"/>
- <project href="project/jakarta-ecs.xml"/>
- <project href="project/jakarta-james.xml"/>
- <project href="project/jakarta-jetspeed.xml"/>
- <project href="project/jakarta-jmeter.xml"/>
- <project href="project/jakarta-log4j.xml"/>
- <project href="project/jakarta-oro.xml"/>
- <project href="project/jakarta-regexp.xml"/>
- <project href="project/jakarta-servletapi-4.xml"/>
- <project href="project/jakarta-servletapi.xml"/>
- <project href="project/jakarta-site2.xml"/>
- <project href="project/jakarta-slide.xml"/>
- <project href="project/jakarta-struts.xml"/>
- <project href="project/jakarta-taglibs.xml"/>
- <project href="project/jakarta-tomcat-40.xml"/>
+ <module href="project/jakarta-alexandria.xml"/>
+ <module href="project/jakarta-ant.xml"/>
+ <module href="project/jakarta-ant-antidote.xml"/>
+ <module href="project/jakarta-avalon-cornerstone.xml"/>
+ <module href="project/jakarta-avalon-excalibur.xml"/>
+ <module href="project/jakarta-avalon-logkit.xml"/>
+ <module href="project/jakarta-avalon-phoenix.xml"/>
+ <module href="project/jakarta-avalon-testlet.xml"/>
+ <module href="project/jakarta-avalon.xml"/>
+ <module href="project/jakarta-commons.xml"/>
+ <module href="project/jakarta-commons-sandbox.xml"/>
+ <module href="project/jakarta-ecs.xml"/>
+ <module href="project/jakarta-james.xml"/>
+ <module href="project/jakarta-jetspeed.xml"/>
+ <module href="project/jakarta-jmeter.xml"/>
+ <module href="project/jakarta-log4j.xml"/>
+ <module href="project/jakarta-oro.xml"/>
+ <module href="project/jakarta-regexp.xml"/>
+ <module href="project/jakarta-servletapi-4.xml"/>
+ <module href="project/jakarta-servletapi.xml"/>
+ <module href="project/jakarta-site2.xml"/>
+ <module href="project/jakarta-slide.xml"/>
+ <module href="project/jakarta-struts.xml"/>
+ <module href="project/jakarta-taglibs.xml"/>
+ <module href="project/jakarta-tomcat-40.xml"/>
<!-- project href="project/jakarta-tomcat-41.xml"/ -->
- <project href="project/jakarta-tomcat-connectors.xml"/>
- <project href="project/jakarta-tomcat-jasper.xml"/>
- <project href="project/jakarta-tomcat.xml"/>
- <project href="project/jakarta-tools.xml"/>
- <project href="project/jakarta-turbine-2.xml"/>
- <project href="project/jakarta-turbine-3.xml"/>
- <project href="project/jakarta-turbine-flux.xml"/>
- <project href="project/jakarta-turbine-fulcrum.xml"/>
- <project href="project/jakarta-turbine-torque.xml"/>
- <project href="project/jakarta-velocity.xml"/>
- <project href="project/jakarta-watchdog.xml"/>
+ <module href="project/jakarta-tomcat-connectors.xml"/>
+ <module href="project/jakarta-tomcat-jasper.xml"/>
+ <module href="project/jakarta-tomcat.xml"/>
+ <module href="project/jakarta-tools.xml"/>
+ <module href="project/jakarta-turbine-2.xml"/>
+ <module href="project/jakarta-turbine-3.xml"/>
+ <module href="project/jakarta-turbine-flux.xml"/>
+ <module href="project/jakarta-turbine-fulcrum.xml"/>
+ <module href="project/jakarta-turbine-torque.xml"/>
+ <module href="project/jakarta-velocity.xml"/>
+ <module href="project/jakarta-watchdog.xml"/>
<!-- Apache.XML -->
- <project href="project/xml-axis.xml"/>
- <project href="project/xml-batik.xml"/>
- <project href="project/xml-cocoon2.xml"/>
- <project href="project/xml-commons.xml"/>
- <project href="project/xml-crimson.xml"/>
- <project href="project/xml-fop.xml"/>
- <project href="project/xml-rpc.xml"/>
- <project href="project/xml-site.xml"/>
- <project href="project/xml-soap.xml"/>
- <project href="project/xml-stylebook.xml"/>
- <project href="project/xml-xalan.xml"/>
- <project href="project/xml-xerces.xml"/>
- <project href="project/xml-xerces2.xml"/>
+ <module href="project/xml-axis.xml"/>
+ <module href="project/xml-batik.xml"/>
+ <module href="project/xml-cocoon2.xml"/>
+ <module href="project/xml-commons.xml"/>
+ <module href="project/xml-crimson.xml"/>
+ <module href="project/xml-fop.xml"/>
+ <module href="project/xml-rpc.xml"/>
+ <module href="project/xml-site.xml"/>
+ <module href="project/xml-soap.xml"/>
+ <module href="project/xml-stylebook.xml"/>
+ <module href="project/xml-xalan.xml"/>
+ <module href="project/xml-xerces.xml"/>
+ <module href="project/xml-xerces2.xml"/>
<!-- exolab -->
- <project href="project/castor.xml"/>
- <project href="project/openejb.xml"/>
- <project href="project/openjms.xml"/>
- <project href="project/openorb.xml"/>
- <project href="project/tyrex.xml"/>
+ <module href="project/castor.xml"/>
+ <module href="project/openejb.xml"/>
+ <module href="project/openjms.xml"/>
+ <module href="project/openorb.xml"/>
+ <module href="project/tyrex.xml"/>
<!-- other -->
- <project href="project/bsf.xml"/>
- <project href="project/cruisecontrol.xml"/>
- <project href="project/dom4j.xml"/>
- <project href="project/dbxml.xml"/>
- <project href="project/httpunit.xml"/>
- <project href="project/jdom.xml"/>
- <project href="project/jtidy.xml"/>
- <project href="project/junit.xml"/>
- <project href="project/lucene.xml"/>
- <project href="project/rhino.xml"/>
- <project href="project/scarab.xml"/>
- <project href="project/town.xml"/>
- <project href="project/village.xml"/>
- <project href="project/wsdl4j.xml"/>
+ <module href="project/bsf.xml"/>
+ <module href="project/cruisecontrol.xml"/>
+ <module href="project/dom4j.xml"/>
+ <module href="project/dbxml.xml"/>
+ <module href="project/httpunit.xml"/>
+ <module href="project/jdom.xml"/>
+ <module href="project/jtidy.xml"/>
+ <module href="project/junit.xml"/>
+ <module href="project/lucene.xml"/>
+ <module href="project/rhino.xml"/>
+ <module href="project/scarab.xml"/>
+ <module href="project/town.xml"/>
+ <module href="project/village.xml"/>
+ <module href="project/wsdl4j.xml"/>
<!-- Sun -->
- <project href="project/ejb.xml"/>
- <project href="project/j2ee-connector.xml"/>
- <project href="project/jaas.xml"/>
- <project href="project/jaf.xml"/>
- <project href="project/javamail.xml"/>
- <project href="project/jaxp.xml"/>
- <project href="project/jaxp11.xml"/>
- <project href="project/jdbc.xml"/>
- <project href="project/jms.xml"/>
- <project href="project/jmx.xml"/>
- <project href="project/jndi.xml"/>
- <project href="project/jsse.xml"/>
- <project href="project/jta.xml"/>
- <project href="project/jts.xml"/>
- <project href="project/tranquilo.xml"/>
+ <module href="project/ejb.xml"/>
+ <module href="project/j2ee-connector.xml"/>
+ <module href="project/jaas.xml"/>
+ <module href="project/jaf.xml"/>
+ <module href="project/javamail.xml"/>
+ <module href="project/jaxp.xml"/>
+ <module href="project/jaxp11.xml"/>
+ <module href="project/jdbc.xml"/>
+ <module href="project/jms.xml"/>
+ <module href="project/jmx.xml"/>
+ <module href="project/jndi.xml"/>
+ <module href="project/jsse.xml"/>
+ <module href="project/jta.xml"/>
+ <module href="project/jts.xml"/>
+ <module href="project/tranquilo.xml"/>
<!-- Installed packages -->
1.12 +1 -1 jakarta-alexandria/proposal/gump/project/jakarta-tomcat-40.xml
Index: jakarta-tomcat-40.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-tomcat-40.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-tomcat-40.xml 2001/08/18 07:03:16 1.11
+++ jakarta-tomcat-40.xml 2001/08/28 16:15:38 1.12
@@ -1,4 +1,4 @@
-<module name="jakarta-tomcat-4.0">
+<module name="jakarta-tomcat-40">
<description>
Servlet 2.3 and JSP 1.2 Reference Implementation
1.30 +3 -3 jakarta-alexandria/proposal/gump/stylesheet/bash.xsl
Index: bash.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/bash.xsl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bash.xsl 2001/06/10 13:14:57 1.29
+++ bash.xsl 2001/08/28 16:15:38 1.30
@@ -19,7 +19,7 @@
<xsl:param name="usage"/>
<xsl:text>case $1 in </xsl:text>
- <xsl:for-each select=".//project">
+ <xsl:for-each select=".//project | .//module">
<xsl:value-of select="@name"/>
<xsl:text>) export </xsl:text>
<xsl:value-of select="translate(@name,'-.','__')"/>
@@ -117,7 +117,7 @@
<xsl:text>fi </xsl:text>
</xsl:template>
- <xsl:template match="update//project">
+ <xsl:template match="update//module">
<xsl:text>echo Updating </xsl:text>
<xsl:value-of select="@name"/>
<xsl:text> </xsl:text>
@@ -255,7 +255,7 @@
<xsl:text>fi </xsl:text>
<xsl:text> if test $</xsl:text>
- <xsl:value-of select="translate(ancestor::project/@name,'-.','__')"/>
+ <xsl:value-of select="translate(@name,'-.','__')"/>
<xsl:text>; then </xsl:text>
<xsl:apply-templates/>
1.21 +21 -10 jakarta-alexandria/proposal/gump/stylesheet/build.xsl
Index: build.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/build.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xsl 2001/08/24 19:28:06 1.20
+++ build.xsl 2001/08/28 16:15:38 1.21
@@ -31,7 +31,7 @@
<delete dir="dist"/>
<xsl:if test="$build-sequence = 'bulk'">
- <xsl:for-each select="project[cvs]">
+ <xsl:for-each select="module[cvs]">
<delete dir="{@srcdir}"/>
<copy fromdir="{$cvsdir}/{@name}" todir="{@srcdir}"/>
</xsl:for-each>
@@ -84,8 +84,8 @@
<xsl:template match="project">
<xsl:copy>
<xsl:copy-of select="@*"/>
- <xsl:variable name="srcdir" select="@srcdir"/>
<xsl:variable name="module" select="@module"/>
+ <xsl:variable name="srcdir" select="../module[@name=$module]/@srcdir"/>
<html log="{$logdir}/{@name}.html"
banner-image="{$banner-image}" banner-link="{$banner-link}">
@@ -93,10 +93,18 @@
<title>
<xsl:text>Build </xsl:text>
<xsl:value-of select="@name"/>
- <xsl:if test="description">
- <xsl:text> - </xsl:text>
- <xsl:value-of select="normalize-space(description)"/>
- </xsl:if>
+ <xsl:choose>
+ <xsl:when test="description">
+ <xsl:text> - </xsl:text>
+ <xsl:value-of select="normalize-space(description)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="../module[@name=$module]/description">
+ <xsl:text> - </xsl:text>
+ <xsl:value-of select="normalize-space(.)"/>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
</title>
<xsl:copy-of select="note"/>
@@ -166,7 +174,7 @@
</prereq>
</xsl:for-each>
- <logic>
+ <logic name="{@name}">
<initdir dir="{$srcdir}" basedon="{$cvsdir}/{$module}"/>
<chdir dir="{$srcdir}"/>
@@ -223,8 +231,11 @@
<xsl:template match="project[not(ant) and not(script)]"/>
<xsl:template match="ant">
+ <xsl:variable name="module" select="ancestor::project/@module"/>
+ <xsl:variable name="srcdir" select="/workspace/module[@name=$module]/@srcdir"/>
+
<xsl:if test="@basedir">
- <chdir dir="{../@srcdir}/{@basedir}"/>
+ <chdir dir="{$srcdir}/{@basedir}"/>
</xsl:if>
<xsl:copy>
@@ -285,12 +296,12 @@
<xsl:when test="@reference='srcdir'">
<xsl:variable name="project" select="@project"/>
<xsl:for-each select="/workspace/project[@name=$project]">
- <property name="{$name}" value="{@srcdir}" type="path"/>
+ <property name="{$name}" value="{$srcdir}" type="path"/>
</xsl:for-each>
</xsl:when>
<xsl:when test="@path">
- <property name="{$name}" value="{ancestor::project/@srcdir}/{@path}"
type="path"/>
+ <property name="{$name}" value="$srcdir/{@path}" type="path"/>
</xsl:when>
<xsl:otherwise>
1.9 +6 -18 jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl
Index: defaults.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- defaults.xsl 2001/08/16 19:40:50 1.8
+++ defaults.xsl 2001/08/28 16:15:38 1.9
@@ -95,6 +95,9 @@
<xsl:variable name="module">
<xsl:choose>
+ <xsl:when test="@module">
+ <xsl:value-of select="@module"/>
+ </xsl:when>
<xsl:when test="@defined-in">
<xsl:value-of select="@defined-in"/>
</xsl:when>
@@ -104,31 +107,16 @@
</xsl:choose>
</xsl:variable>
- <!-- determine the name of the source directory -->
+ <xsl:variable name="srcdir" select="../module[@name=$module]/@srcdir"/>
- <xsl:variable name="srcdir">
- <xsl:choose>
- <xsl:when test="@srcdir">
- <xsl:value-of select="concat($basedir,'/',@srcdir)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="concat($basedir,'/',$module)"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
<xsl:copy>
- <xsl:apply-templates select="@*[name()!='srcdir']"/>
+ <xsl:apply-templates select="@*[name()!='module']"/>
<xsl:attribute name="module">
<xsl:value-of select="$module"/>
</xsl:attribute>
-
- <xsl:attribute name="srcdir">
- <xsl:value-of select="$srcdir"/>
- </xsl:attribute>
- <xsl:apply-templates select="*[not(self::home|self::project)] | text()"/>
+ <xsl:apply-templates select="*[not(self::home)] | text()"/>
<!-- Compute fully qualified home directory -->
1.7 +2 -2 jakarta-alexandria/proposal/gump/stylesheet/jakarta.xsl
Index: jakarta.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/jakarta.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jakarta.xsl 2001/03/17 21:15:01 1.6
+++ jakarta.xsl 2001/08/28 16:15:38 1.7
@@ -12,7 +12,7 @@
<xsl:copy-of select="@*"/>
<head>
- <title><xsl:value-of select="title/."/></title>
+ <xsl:apply-templates select="title/*|title/text()"/>
<meta http-equiv="Content-Type"
content="text/html; charset=iso-8859-1"/>
<style type="text/css">
@@ -70,7 +70,7 @@
<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr>
<td class="title">
- <xsl:apply-templates select="title/*|title/text()"/>
+ <xsl:apply-templates select="title"/>
</td>
</tr>
</table>
1.11 +9 -9 jakarta-alexandria/proposal/gump/stylesheet/update.xsl
Index: update.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/update.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- update.xsl 2001/08/16 23:53:04 1.10
+++ update.xsl 2001/08/28 16:15:38 1.11
@@ -56,7 +56,7 @@
<th>Status</th>
</tr>
- <xsl:apply-templates select="project">
+ <xsl:apply-templates select="module">
<xsl:sort select="@name"/>
</xsl:apply-templates>
</table>
@@ -68,7 +68,7 @@
</xsl:template>
- <xsl:template match="project">
+ <xsl:template match="module">
<xsl:copy>
<xsl:copy-of select="@*"/>
@@ -98,7 +98,7 @@
</menu>
<content>
- <logic>
+ <logic name="{@name}">
<xsl:apply-templates select="cvs"/>
</logic>
</content>
@@ -118,7 +118,7 @@
</xsl:copy>
</xsl:template>
- <xsl:template match="project[not(cvs)]"/>
+ <xsl:template match="module[not(cvs)]"/>
<!-- =================================================================== -->
<!-- pre-resolve repository for later convenience -->
@@ -126,7 +126,7 @@
<xsl:template match="cvs">
<xsl:variable name="repository" select="@repository"/>
- <cvs srcdir="{ancestor::project/@module}">
+ <cvs srcdir="{ancestor::module/@name}">
<xsl:variable name="dir" select="@dir"/>
<xsl:variable name="host-prefix" select="@host-prefix"/>
@@ -188,23 +188,23 @@
</xsl:for-each>
</xsl:attribute>
- <!-- specify the module (defaults to project name) -->
+ <!-- specify the module (defaults to module name) -->
<xsl:attribute name="module">
<xsl:choose>
<xsl:when test="@module">
<xsl:value-of select="@module"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="ancestor::project/@name"/>
+ <xsl:value-of select="ancestor::module/@name"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<!-- optionally add a tag -->
<xsl:choose>
- <xsl:when test="ancestor::project/@tag">
+ <xsl:when test="ancestor::module/@tag">
<xsl:attribute name="tag">
- <xsl:value-of select="ancestor::project/@tag"/>
+ <xsl:value-of select="ancestor::module/@tag"/>
</xsl:attribute>
</xsl:when>
<xsl:when test="@tag">
1.10 +4 -4 jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl
Index: win2k.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- win2k.xsl 2001/08/16 12:08:38 1.9
+++ win2k.xsl 2001/08/28 16:15:38 1.10
@@ -60,7 +60,7 @@
<xsl:text>if "%1"=="all" goto header </xsl:text>
<xsl:text>:top </xsl:text>
- <xsl:for-each select=".//project">
+ <xsl:for-each select=".//module">
<xsl:text>if "%1"=="</xsl:text>
<xsl:value-of select="@name"/>
<xsl:text>" goto </xsl:text>
@@ -86,7 +86,7 @@
<xsl:text>ENDLOCAL </xsl:text>
</xsl:template>
- <xsl:template match="update//project">
+ <xsl:template match="update//module">
<xsl:text> echo Updating </xsl:text>
<xsl:value-of select="@name"/>
<xsl:text> </xsl:text>
@@ -223,7 +223,7 @@
<xsl:text>echo ^<pre^> %OUT% </xsl:text>
<xsl:text>:</xsl:text>
- <xsl:value-of select="ancestor::project/@name"/>
+ <xsl:value-of select="@name"/>
<xsl:text> </xsl:text>
<xsl:apply-templates/>
@@ -232,7 +232,7 @@
<xsl:text>echo ^</pre^> %OUT% </xsl:text>
<xsl:text>:end_</xsl:text>
- <xsl:value-of select="ancestor::project/@name"/>
+ <xsl:value-of select="@name"/>
<xsl:text> </xsl:text>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
