rubys 01/10/07 05:16:01
Modified: proposal/gump/java Module.java
proposal/gump/stylesheet bash.xsl win2k.xsl
Log:
The repository attribute was serving a dual purpose - split into two
attributes.
Revision Changes Path
1.4 +10 -10 jakarta-alexandria/proposal/gump/java/Module.java
Index: Module.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Module.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Module.java 2001/10/06 21:22:16 1.3
+++ Module.java 2001/10/07 12:16:00 1.4
@@ -43,7 +43,7 @@
computeSrcDir();
promoteProjects();
- resolveRepository();
+ resolveCvsroot();
modules.put(name, this);
}
@@ -103,7 +103,7 @@
* Resolves a repository name into a cvsroot. In the process it also
* decorates the cvs tag with the module name and tag info.
*/
- private void resolveRepository() throws Exception {
+ private void resolveCvsroot() throws Exception {
Node child=element.getFirstChild();
for (; child != null; child=child.getNextSibling()) {
if (! child.getNodeName().equals("cvs")) continue;
@@ -118,19 +118,19 @@
if (!tag.equals("")) cvs.setAttribute("tag", tag);
Repository r = Repository.find(cvs.getAttribute("repository"));
- String repository = ":" + r.get("method");
- repository += ":" + r.get("user");
+ String cvsroot = ":" + r.get("method");
+ cvsroot += ":" + r.get("user");
- repository += "@";
+ cvsroot += "@";
if (cvs.getAttributeNode("host-prefix") != null)
- repository += cvs.getAttribute("host-prefix") + ".";
- repository += r.get("hostname");
+ cvsroot += cvs.getAttribute("host-prefix") + ".";
+ cvsroot += r.get("hostname");
- repository += ":" + r.get("path");
+ cvsroot += ":" + r.get("path");
if (cvs.getAttributeNode("dir") != null)
- repository += "/" + cvs.getAttribute("dir");
+ cvsroot += "/" + cvs.getAttribute("dir");
- cvs.setAttribute("repository", repository);
+ cvs.setAttribute("cvsroot", cvsroot);
cvs.setAttribute("password", r.get("password"));
}
}
1.44 +2 -2 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- bash.xsl 2001/10/01 18:52:49 1.43
+++ bash.xsl 2001/10/07 12:16:00 1.44
@@ -529,7 +529,7 @@
<xsl:text>test -d </xsl:text>
<xsl:value-of select="translate(@srcdir,'\','/')"/>
<xsl:text> && export CMD="cvs -z3 -d </xsl:text>
- <xsl:value-of select="@repository"/>
+ <xsl:value-of select="@cvsroot"/>
<xsl:text> update -P -d</xsl:text>
@@ -551,7 +551,7 @@
<xsl:value-of select="translate(@srcdir,'\','/')"/>
<xsl:text> || export CMD="cvs -z3 -d </xsl:text>
- <xsl:value-of select="@repository"/>
+ <xsl:value-of select="@cvsroot"/>
<xsl:text> checkout -P</xsl:text>
1.17 +2 -2 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- win2k.xsl 2001/09/22 01:02:41 1.16
+++ win2k.xsl 2001/10/07 12:16:00 1.17
@@ -481,7 +481,7 @@
<xsl:text>if exist </xsl:text>
<xsl:value-of select="translate(@srcdir,'/','\')"/>
<xsl:text> SET CMD=cvs -z3 -d </xsl:text>
- <xsl:value-of select="@repository"/>
+ <xsl:value-of select="@cvsroot"/>
<xsl:text> update -P -d</xsl:text>
@@ -503,7 +503,7 @@
<xsl:value-of select="translate(@srcdir,'/','\')"/>
<xsl:text> SET CMD=cvs -z3 -d </xsl:text>
- <xsl:value-of select="@repository"/>
+ <xsl:value-of select="@cvsroot"/>
<xsl:text> checkout -P</xsl:text>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
