rubys 2003/01/14 07:49:53
Modified: java Module.java Repository.java
project castor.xml
repository exolab.xml
site/xdocs module.xml repository.xml
stylesheet bash.xsl win2k.xsl
Log:
Two generalizations of the compress support, one I need for my environment,
the other for future exploitation.
1) Since I have -z3 in my .cvsrc, I need to have -z0 explicitly stated
on each command that wishes to override this value.
2) Allow compression to be specified repository wide, and optionally
overridden at the module level.
Revision Changes Path
1.21 +4 -4 jakarta-gump/java/Module.java
Index: Module.java
===================================================================
RCS file: /home/cvs/jakarta-gump/java/Module.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Module.java 14 Jan 2003 13:21:49 -0000 1.20
+++ Module.java 14 Jan 2003 15:49:50 -0000 1.21
@@ -307,7 +307,7 @@
cvs.setAttribute("password", r.get("password"));
if (cvs.getAttributeNode("compress") == null) {
- cvs.setAttribute("compress", "true");
+ cvs.setAttribute("compress", r.get("compress"));
}
}
}
1.4 +7 -3 jakarta-gump/java/Repository.java
Index: Repository.java
===================================================================
RCS file: /home/cvs/jakarta-gump/java/Repository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Repository.java 1 Jan 2003 07:04:58 -0000 1.3
+++ Repository.java 14 Jan 2003 15:49:51 -0000 1.4
@@ -100,6 +100,10 @@
this.element = element;
name = element.getAttribute("name");
+ if (element.getAttributeNode("compress") == null) {
+ element.setAttribute("compress", "-z3");
+ }
+
resolve(element);
repositories.put(name, this);
1.20 +1 -1 jakarta-gump/project/castor.xml
Index: castor.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/castor.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- castor.xml 14 Jan 2003 13:21:48 -0000 1.19
+++ castor.xml 14 Jan 2003 15:49:51 -0000 1.20
@@ -5,7 +5,7 @@
Java to XML, SQL, LDAP bindings
</description>
- <cvs repository="exolab" host-prefix="castor" dir="castor" compress="false"/>
+ <cvs repository="exolab" host-prefix="castor" dir="castor"/>
<project name="castor">
<package>org.exolab.castor</package>
1.2 +1 -1 jakarta-gump/repository/exolab.xml
Index: exolab.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/repository/exolab.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exolab.xml 16 Apr 2001 19:25:08 -0000 1.1
+++ exolab.xml 14 Jan 2003 15:49:51 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<repository name="exolab" type="cvs">
+<repository name="exolab" type="cvs" compress="-z0">
<title>ExoLab</title>
<home-page>http://www.exolab.org/</home-page>
<cvsweb>http://virtuals.intalio.com/cgi-bin/cvsweb.cgi/castor/?cvsroot=castor</cvsweb>
1.8 +3 -5 jakarta-gump/site/xdocs/module.xml
Index: module.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/site/xdocs/module.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- module.xml 14 Jan 2003 13:21:49 -0000 1.7
+++ module.xml 14 Jan 2003 15:49:52 -0000 1.8
@@ -111,11 +111,9 @@
</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>
+ <td>Set the compression level. Some CVS client/server combinations
+ will not work with compression.</td>
+ <td>No. Defaults to the compress value for the repository</td>
</tr>
</table>
</subsection>
1.5 +6 -0 jakarta-gump/site/xdocs/repository.xml
Index: repository.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/site/xdocs/repository.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- repository.xml 27 May 2002 17:53:49 -0000 1.4
+++ repository.xml 14 Jan 2003 15:49:52 -0000 1.5
@@ -29,6 +29,12 @@
<td>Type of repository.</td>
<td>Yes, though cvs is the only type supported currently.</td>
</tr>
+ <tr>
+ <td>compress</td>
+ <td>Set the compression level. Some CVS client/server combinations
+ will not work with compression.</td>
+ <td>No, defaults to <code>-z3</code>.</td>
+ </tr>
</table>
<p/>
1.84 +4 -8 jakarta-gump/stylesheet/bash.xsl
Index: bash.xsl
===================================================================
RCS file: /home/cvs/jakarta-gump/stylesheet/bash.xsl,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- bash.xsl 14 Jan 2003 13:21:48 -0000 1.83
+++ bash.xsl 14 Jan 2003 15:49:52 -0000 1.84
@@ -643,10 +643,8 @@
<xsl:text>test -d </xsl:text>
<xsl:value-of select="translate(@srcdir,'\','/')"/>
- <xsl:text> && export CMD="cvs</xsl:text>
- <xsl:if test="@compress='true'">
- <xsl:text> -z3</xsl:text>
- </xsl:if>
+ <xsl:text> && export CMD="cvs </xsl:text>
+ <xsl:value-of select="@compress"/>
<xsl:text> -d </xsl:text>
<xsl:value-of select="@cvsroot"/>
@@ -669,10 +667,8 @@
<xsl:text>test -d </xsl:text>
<xsl:value-of select="translate(@srcdir,'\','/')"/>
- <xsl:text> || export CMD="cvs</xsl:text>
- <xsl:if test="@compress='true'">
- <xsl:text> -z3</xsl:text>
- </xsl:if>
+ <xsl:text> || export CMD="cvs </xsl:text>
+ <xsl:value-of select="@compress"/>
<xsl:text> -d </xsl:text>
<xsl:value-of select="@cvsroot"/>
1.43 +4 -8 jakarta-gump/stylesheet/win2k.xsl
Index: win2k.xsl
===================================================================
RCS file: /home/cvs/jakarta-gump/stylesheet/win2k.xsl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- win2k.xsl 14 Jan 2003 13:21:48 -0000 1.42
+++ win2k.xsl 14 Jan 2003 15:49:52 -0000 1.43
@@ -576,10 +576,8 @@
<xsl:text>if exist </xsl:text>
<xsl:value-of select="translate(@srcdir,'/','\')"/>
- <xsl:text> SET CMD=cvs</xsl:text>
- <xsl:if test="@compress='true'">
- <xsl:text> -z3</xsl:text>
- </xsl:if>
+ <xsl:text> SET CMD=cvs </xsl:text>
+ <xsl:value-of select="@compress"/>
<xsl:text> -d </xsl:text>
<xsl:value-of select="@cvsroot"/>
@@ -602,10 +600,8 @@
<xsl:text>if not exist </xsl:text>
<xsl:value-of select="translate(@srcdir,'/','\')"/>
- <xsl:text> SET CMD=cvs</xsl:text>
- <xsl:if test="@compress='true'">
- <xsl:text> -z3</xsl:text>
- </xsl:if>
+ <xsl:text> SET CMD=cvs </xsl:text>
+ <xsl:value-of select="@compress"/>
<xsl:text> -d </xsl:text>
<xsl:value-of select="@cvsroot"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
