Author: bodewig
Date: Thu Oct 16 05:41:52 2008
New Revision: 705228
URL: http://svn.apache.org/viewvc?rev=705228&view=rev
Log:
Make port attribute work for some "non-standard" CVS clients. submitted by
Johann Herunter. PR 30124.
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Modified: ant/core/trunk/CONTRIBUTORS
URL:
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=705228&r1=705227&r2=705228&view=diff
==============================================================================
Binary files - no diff available.
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=705228&r1=705227&r2=705228&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Oct 16 05:41:52 2008
@@ -446,6 +446,11 @@
* <cvsversion> is supposed to support CVSNT now.
Bugzilla Report 31409.
+ * <cvs>' port attribute should now work for all clients that use the
+ environment variable CVS_PSERVER_PORT instead of the "official"
+ CVS_CLIENT_PORT.
+ Bugzilla Report 30124.
+
Changes from Ant 1.7.0 TO Ant 1.7.1
=============================================
Modified: ant/core/trunk/contributors.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=705228&r1=705227&r2=705228&view=diff
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Thu Oct 16 05:41:52 2008
@@ -593,6 +593,14 @@
<last>Richey</last>
</name>
<name>
+ <first>Johann</first>
+ <last>Herunter</last>
+ </name>
+ <name>
+ <first>John</first>
+ <last>Sisson</last>
+ </name>
+ <name>
<first>Jon</first>
<last>Dickinson</last>
</name>
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java?rev=705228&r1=705227&r2=705228&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Thu Oct 16 05:41:52 2008
@@ -260,7 +260,7 @@
// native CVS stuff around (SM)
// We can't do it ourselves as jCVS is GPLed, a third party task
- // outside of jakarta repositories would be possible though (SB).
+ // outside of Apache repositories would be possible though (SB).
Environment env = new Environment();
@@ -269,6 +269,13 @@
var.setKey("CVS_CLIENT_PORT");
var.setValue(String.valueOf(port));
env.addVariable(var);
+
+ // non-standard environment variable used by CVSNT, WinCVS
+ // and others
+ var = new Environment.Variable();
+ var.setKey("CVS_PSERVER_PORT");
+ var.setValue(String.valueOf(port));
+ env.addVariable(var);
}
/**
