bodewig 2003/01/14 05:21:49
Modified: project castor.xml
stylesheet bash.xsl win2k.xsl
site/xdocs module.xml
java Module.java
Log:
Some client/server combinations of CVS versions seem to choke on
compression. Witness with castor's CVS updates that have been failing
for months now.
Introduce an optional compress attribute to <cvs> and make it default
to true, disable compression for castor.
Revision Changes Path
1.19 +1 -1 jakarta-gump/project/castor.xml
Index: castor.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/castor.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- castor.xml 27 Sep 2002 07:21:59 -0000 1.18
+++ castor.xml 14 Jan 2003 13:21:48 -0000 1.19
@@ -5,7 +5,7 @@
Java to XML, SQL, LDAP bindings
</description>
- <cvs repository="exolab" host-prefix="castor" dir="castor"/>
+ <cvs repository="exolab" host-prefix="castor" dir="castor" compress="false"/>
<project name="castor">
<package>org.exolab.castor</package>
1.83 +10 -2 jakarta-gump/stylesheet/bash.xsl
Index: bash.xsl
===================================================================
RCS file: /home/cvs/jakarta-gump/stylesheet/bash.xsl,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- bash.xsl 10 Dec 2002 02:59:56 -0000 1.82
+++ bash.xsl 14 Jan 2003 13:21:48 -0000 1.83
@@ -643,7 +643,11 @@
<xsl:text>test -d </xsl:text>
<xsl:value-of select="translate(@srcdir,'\','/')"/>
- <xsl:text> && export CMD="cvs -z3 -d </xsl:text>
+ <xsl:text> && export CMD="cvs</xsl:text>
+ <xsl:if test="@compress='true'">
+ <xsl:text> -z3</xsl:text>
+ </xsl:if>
+ <xsl:text> -d </xsl:text>
<xsl:value-of select="@cvsroot"/>
<xsl:text> update -P -d</xsl:text>
@@ -665,7 +669,11 @@
<xsl:text>test -d </xsl:text>
<xsl:value-of select="translate(@srcdir,'\','/')"/>
- <xsl:text> || export CMD="cvs -z3 -d </xsl:text>
+ <xsl:text> || export CMD="cvs</xsl:text>
+ <xsl:if test="@compress='true'">
+ <xsl:text> -z3</xsl:text>
+ </xsl:if>
+ <xsl:text> -d </xsl:text>
<xsl:value-of select="@cvsroot"/>
<xsl:text> checkout -P</xsl:text>
1.42 +10 -2 jakarta-gump/stylesheet/win2k.xsl
Index: win2k.xsl
===================================================================
RCS file: /home/cvs/jakarta-gump/stylesheet/win2k.xsl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- win2k.xsl 1 Jan 2003 07:32:20 -0000 1.41
+++ win2k.xsl 14 Jan 2003 13:21:48 -0000 1.42
@@ -576,7 +576,11 @@
<xsl:text>if exist </xsl:text>
<xsl:value-of select="translate(@srcdir,'/','\')"/>
- <xsl:text> SET CMD=cvs -z3 -d </xsl:text>
+ <xsl:text> SET CMD=cvs</xsl:text>
+ <xsl:if test="@compress='true'">
+ <xsl:text> -z3</xsl:text>
+ </xsl:if>
+ <xsl:text> -d </xsl:text>
<xsl:value-of select="@cvsroot"/>
<xsl:text> update -P -d</xsl:text>
@@ -598,7 +602,11 @@
<xsl:text>if not exist </xsl:text>
<xsl:value-of select="translate(@srcdir,'/','\')"/>
- <xsl:text> SET CMD=cvs -z3 -d </xsl:text>
+ <xsl:text> SET CMD=cvs</xsl:text>
+ <xsl:if test="@compress='true'">
+ <xsl:text> -z3</xsl:text>
+ </xsl:if>
+ <xsl:text> -d </xsl:text>
<xsl:value-of select="@cvsroot"/>
<xsl:text> checkout -P</xsl:text>
1.7 +8 -0 jakarta-gump/site/xdocs/module.xml
Index: module.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/site/xdocs/module.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- module.xml 7 Aug 2002 14:28:50 -0000 1.6
+++ module.xml 14 Jan 2003 13:21:49 -0000 1.7
@@ -109,6 +109,14 @@
<td>Specify the cvs tag desired.</td>
<td>No. Effectively defaults to HEAD.</td>
</tr>
+ <tr>
+ <td>compress</td>
+ <td>Whether to pass the <code>-z</code> option to the CVS
+ executable or not. Some CVS client/server combinations will
+ not work with compression.</td>
+ <td>No. Defaults to true, which corresponds to
+ <code>-z3</code>.</td>
+ </tr>
</table>
</subsection>
1.20 +8 -4 jakarta-gump/java/Module.java
Index: Module.java
===================================================================
RCS file: /home/cvs/jakarta-gump/java/Module.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Module.java 27 Aug 2002 14:54:09 -0000 1.19
+++ Module.java 14 Jan 2003 13:21:49 -0000 1.20
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -305,6 +305,10 @@
cvs.setAttribute("cvsroot", cvsroot);
cvs.setAttribute("password", r.get("password"));
+
+ if (cvs.getAttributeNode("compress") == null) {
+ cvs.setAttribute("compress", "true");
+ }
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
