cvs commit: ant/xdocs contributors.xml
bodewig 2003/03/06 01:27:21 Modified:docs antnews.html contributors.html xdocscontributors.xml Log: Jon has declared himself "emeritus" Revision ChangesPath 1.57 +0 -1 ant/docs/antnews.html Index: antnews.html === RCS file: /home/cvs/ant/docs/antnews.html,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- antnews.html 3 Mar 2003 15:24:12 - 1.56 +++ antnews.html 6 Mar 2003 09:27:21 - 1.57 @@ -392,7 +392,6 @@ Make Ant more easily extendable by allowing additional tasks to be "dropped" in. Allow Ant to function as a component to simplify integration with GUIs and IDEs. Make Ant more regular and logical. - It is expected that Ant 2.0 will break Ant 1.x based build files. The intention is to 1.6 +3 -3 ant/docs/contributors.html Index: contributors.html === RCS file: /home/cvs/ant/docs/contributors.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- contributors.html 10 Feb 2003 23:41:09 - 1.5 +++ contributors.html 6 Mar 2003 09:27:21 - 1.6 @@ -277,9 +277,6 @@ also serving as the Chairman of the Jakarta PMC. -Jon Skeet - - Magesh Umasankar (umagesh at apache.org) Magesh is a lead software developer at @@ -317,6 +314,9 @@ was one of the rabble-rousers within Sun that helped make the Jakarta Project a reality and served as the first Chairman of the Jakarta PMC. + +Jon Skeet + Committers 1.3 +4 -4 ant/xdocs/contributors.xml Index: contributors.xml === RCS file: /home/cvs/ant/xdocs/contributors.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- contributors.xml 27 Jan 2003 10:17:58 - 1.2 +++ contributors.xml 6 Mar 2003 09:27:21 - 1.3 @@ -80,10 +80,6 @@ -Jon Skeet - - - Magesh Umasankar (umagesh at apache.org) Magesh is a lead software developer at @@ -117,6 +113,10 @@ was one of the rabble-rousers within Sun that helped make the Jakarta Project a reality and served as the first Chairman of the Jakarta PMC. + + +Jon Skeet +
cvs commit: ant/xdocs external.xml
bodewig 2003/03/06 01:59:37 Modified:docs external.html xdocsexternal.xml Log: Add pointer to generics compiler adapter. Submitted by: Matt Quail Revision ChangesPath 1.93 +55 -0 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- external.html 24 Feb 2003 15:02:15 - 1.92 +++ external.html 6 Mar 2003 09:59:37 - 1.93 @@ -2826,6 +2826,61 @@ Compiler Implementations + + + + +Generics (JSR14) Early-Access Compiler Adapter + + + +This is an Ant compiler-adapter that allows you to use the +normal <javac> task plus Sun's early-access +compiler to compile Generics-enabled Java code. (This is only +necessary until JDK1.5 is released.) + + + + Compatibility: + + + Ant 1.5 and later + + + + + URL: + + + http://www.madbean.com/blog/3/";>http://www.madbean.com/blog/3/ + + + + + Contact: + + + Matt Quail <spud[at]madbean[dot]com> + + + + + License: + + + Public Domain + + + + 1.70 +28 -0 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- external.xml 24 Feb 2003 15:02:15 - 1.69 +++ external.xml 6 Mar 2003 09:59:37 - 1.70 @@ -1340,6 +1340,34 @@ + + + +This is an Ant compiler-adapter that allows you to use the +normal <javac> task plus Sun's early-access +compiler to compile Generics-enabled Java code. (This is only +necessary until JDK1.5 is released.) + + + +Compatibility: +Ant 1.5 and later + + +URL: +http://www.madbean.com/blog/3/";>http://www.madbean.com/blog/3/ + + +Contact: +Matt Quail <spud[at]madbean[dot]com> + + +License: +Public Domain + + + + miniRMI is a freeware opensource library that serves as a
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh - New directory
bodewig 2003/03/06 04:02:01 ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh - New directory
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional/ssh - New directory
bodewig 2003/03/06 04:31:20 ant/src/testcases/org/apache/tools/ant/taskdefs/optional/ssh - New directory
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional/ssh ScpTest.java
bodewig 2003/03/06 04:42:44
Modified:.WHATSNEW build.xml
docs/manual install.html optionaltasklist.html
src/main/org/apache/tools/ant/taskdefs defaults.properties
Added: docs/manual/OptionalTasks scp.html
src/main/org/apache/tools/ant/taskdefs/optional/ssh
AbstractSshMessage.java Directory.java
LogListener.java Scp.java ScpFromMessage.java
ScpToMessage.java
src/testcases/org/apache/tools/ant/taskdefs/optional/ssh
ScpTest.java
Log:
Submitted by: charliehubbard76 at yahoo dot com
Revision ChangesPath
1.361 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- WHATSNEW 6 Mar 2003 12:04:59 - 1.360
+++ WHATSNEW 6 Mar 2003 12:42:43 - 1.361
@@ -157,6 +157,9 @@
* The task subelement has been enhanced to allow files
with tag mappings to be used.
+* New task that supports file transfers over SSH. Requires
+ jsch, a BSD licensed SSH library that can be found at
+ http://www.jcraft.com/jsch/index.html
Changes from Ant 1.5.1 to Ant 1.5.2
=
1.354 +22 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- build.xml 26 Feb 2003 13:06:06 - 1.353
+++ build.xml 6 Mar 2003 12:42:43 - 1.354
@@ -155,7 +155,10 @@
-
+
+
+
+
@@ -1616,6 +1634,9 @@
-->
+
+
+
1.47 +6 -0 ant/docs/manual/install.html
Index: install.html
===
RCS file: /home/cvs/ant/docs/manual/install.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- install.html 24 Feb 2003 08:25:19 - 1.46
+++ install.html 6 Mar 2003 12:42:43 - 1.47
@@ -418,6 +418,12 @@
target="_top">http://gump.covalent.net/jars/latest/xml-commons/
for a nightly snapshot.
+
+jsch.jar
+scp task
+http://www.jcraft.com/jsch/index.html";
+target="_top">http://www.jcraft.com/jsch/index.html
+
1.35 +1 -0 ant/docs/manual/optionaltasklist.html
Index: optionaltasklist.html
===
RCS file: /home/cvs/ant/docs/manual/optionaltasklist.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- optionaltasklist.html 7 Nov 2002 16:26:18 - 1.34
+++ optionaltasklist.html 6 Mar 2003 12:42:43 - 1.35
@@ -55,6 +55,7 @@
Rpm
ServerDeploy
Setproxy
+Scp
Script
Sound
SourceOffSite
1.1 ant/docs/manual/OptionalTasks/scp.html
Index: scp.html
===
SCP Task
SCP
Description
Copies a file or FileSet to or from a remote machine running SSH daemon.
FileSet only works for copying files from the local machine to a
remote machine.
Note: This task depends on external libraries not included
in the Ant distribution. See Library Dependencies
for more information.
Parameters
Attribute
Description
Required
file
The file to copy. This can be a local path or a
remote path of the form user:[EMAIL
PROTECTED]:/directory/path.
Yes, unless a nested
<fileset> element is used.
todir
The directory to copy to. This can be a local path
or a remote path of the form user:[EMAIL
PROTECTED]:/directory/path
Yes
port
The port to connect to on the remote host.
No, defaults to 22.
trust
This trusts all unknown hosts if set to yes/true.
No, defaults to No.
knownhosts
This sets the known hosts file to use to validate
the identity of the remote host. This must be a SSH2 format file.
SSH1 format is not supported.
No, defaults to
${user.dir}/.ssh/known_hosts.
failonerror
Log a warning message, but do not stop the build,
when the transfer does not work.
No; defaults to true.
Parameters specified as nested elements
fileset
FileSets are used to select
se
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2003/03/07 00:07:18
Modified:src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
Set file mode correctly for files read from s.
PR: 17648
Submitted by: Antoine Levy-Lambert
Revision ChangesPath
1.99 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Zip.java 26 Feb 2003 09:57:01 - 1.98
+++ Zip.java 7 Mar 2003 08:07:17 - 1.99
@@ -538,7 +538,7 @@
prefix = zfs.getPrefix();
fullpath = zfs.getFullpath();
dirMode = zfs.getDirMode();
-fileMode = zfs.getDirMode();
+fileMode = zfs.getFileMode();
}
if (prefix.length() > 0 && fullpath.length() > 0) {
cvs commit: ant/src/script ant
bodewig 2003/03/07 00:42:26
Modified:src/script ant
Log:
Make JIKESPATH construction on Mac OS X take JAVA_HOME into account.
This won't change anything if the user doesn't set JAVA_HOME.
PR: 17458
Submitted by: Dwayne Schultz
Revision ChangesPath
1.34 +1 -1 ant/src/script/ant
Index: ant
===
RCS file: /home/cvs/ant/src/script/ant,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ant 21 Feb 2003 11:53:26 - 1.33
+++ ant 7 Mar 2003 08:42:26 - 1.34
@@ -145,7 +145,7 @@
# OSX hack to make Ant work with jikes
if $darwin ; then
-
OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
+OSXHACK="${JAVA_HOME}/../Classes"
if [ -d "${OSXHACK}" ] ; then
for i in "${OSXHACK}"/*.jar
do
cvs commit: ant/xdocs antnews.xml contributors.xml index.xml
bodewig 2003/03/07 03:32:20
Modified:docs antnews.html contributors.html index.html
docs/manual credits.html
xdocsantnews.xml contributors.xml index.xml
Log:
This is what I think about ePost's new business model
Revision ChangesPath
1.58 +1 -1 ant/docs/antnews.html
Index: antnews.html
===
RCS file: /home/cvs/ant/docs/antnews.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- antnews.html 6 Mar 2003 09:27:21 - 1.57
+++ antnews.html 7 Mar 2003 11:32:18 - 1.58
@@ -10,7 +10,7 @@
-
+
1.7 +1 -1 ant/docs/contributors.html
Index: contributors.html
===
RCS file: /home/cvs/ant/docs/contributors.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- contributors.html 6 Mar 2003 09:27:21 - 1.6
+++ contributors.html 7 Mar 2003 11:32:19 - 1.7
@@ -228,7 +228,7 @@
Stephane Bailliez
-Stefan Bodewig (stefan.bodewig at epost.de)
+Stefan Bodewig (stefan.bodewig at freenet.de)
Stefan is a senior developer at BoST interactive, where he is mainly
responsible for a rule based configurator system. He spends some
1.267 +1 -1 ant/docs/index.html
Index: index.html
===
RCS file: /home/cvs/ant/docs/index.html,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- index.html3 Mar 2003 15:24:13 - 1.266
+++ index.html7 Mar 2003 11:32:19 - 1.267
@@ -10,7 +10,7 @@
-
+
1.20 +2 -2 ant/docs/manual/credits.html
Index: credits.html
===
RCS file: /home/cvs/ant/docs/manual/credits.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- credits.html 13 Dec 2002 12:04:03 - 1.19
+++ credits.html 7 Mar 2003 11:32:19 - 1.20
@@ -16,7 +16,7 @@
Stephane Bailliez (mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED])
Nicola Ken Barozzi (mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED])
Jacques Bergeron (mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED])
- Stefan Bodewig (mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED])
+ Stefan Bodewig (mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED])
Patrick Chanezon (mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED])
James Duncan Davidson (mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED])
Tom Dimock (mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED])
1.39 +1 -1 ant/xdocs/antnews.xml
Index: antnews.xml
===
RCS file: /home/cvs/ant/xdocs/antnews.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- antnews.xml 3 Mar 2003 15:24:14 - 1.38
+++ antnews.xml 7 Mar 2003 11:32:20 - 1.39
@@ -3,7 +3,7 @@
Conor MacNeill
-Stefan Bodewig
+Stefan Bodewig
Magesh Umasankar
News
1.4 +1 -1 ant/xdocs/contributors.xml
Index: contributors.xml
===
RCS file: /home/cvs/ant/xdocs/contributors.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- contributors.xml 6 Mar 2003 09:27:21 - 1.3
+++ contributors.xml 7 Mar 2003 11:32:20 - 1.4
@@ -23,7 +23,7 @@
-Stefan Bodewig (stefan.bodewig at epost.de)
+Stefan Bodewig (stefan.bodewig at freenet.de)
Stefan is a senior developer at BoST interactive, where he is mainly
responsible for a rule based configurator system. He spends some
1.43 +1 -1 ant/xdocs/index.xml
Index: index.xml
===
RCS file: /home/cvs/ant/xdocs/index.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- index.xml 3 Mar 2003 15:24:14 - 1.42
+++ index.xml 7 Mar 2003 11:32:20 - 1.43
@@ -3,7 +3,7 @@
Conor MacNeill
-Stefan Bodewig
+Stefan Bodewig
Welcome
cvs commit: ant KEYS
bodewig 2003/03/07 03:56:10 Modified:.KEYS Log: Some PGP key changes Revision ChangesPath 1.9 +20 -21ant/KEYS Index: KEYS === RCS file: /home/cvs/ant/KEYS,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- KEYS 18 Jul 2002 14:41:33 - 1.8 +++ KEYS 7 Mar 2003 11:56:10 - 1.9 @@ -68,20 +68,19 @@ =Icm2 -END PGP PUBLIC KEY BLOCK- -pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -sig5F6B8B72 2002-01-11 Stefan Bodewig <[EMAIL PROTECTED]> +pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2003-03-07 Stefan Bodewig <[EMAIL PROTECTED]> uid Stefan Bodewig <[EMAIL PROTECTED]> -sig 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -sig51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> uidStefan Bodewig <[EMAIL PROTECTED]> -sig5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -sig51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> sub 1024g/24774157 2001-05-28 -sig5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v1.0.6 (GNU/Linux) -Comment: Weitere Infos: siehe http://www.gnupg.org +Version: GnuPG v1.2.0 (GNU/Linux) mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ 5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82 @@ -99,18 +98,18 @@ ZmFuIEJvZGV3aWcgPGJvZGV3aWdAYm9zdC5kZT6IVwQTEQIAFwUCOxI5gQULBwoD BAMVAwIDFgIBAheAAAoJEKIRWuFfa4tyyboAoNoD/9Jgm/alxfAYELz05LMa/HLe AKDWTHqq7rMkppZoTUv2gWpVzrk5RIhGBBARAgAGBQI8PtWVAAoJEIEEZE9RiYUE -0LMAn22/u01Lo3Bo5lDxxHSkayUkYq25AKCm20yaGFGtTDJW4Rdz50pfut1AwrQo -U3RlZmFuIEJvZGV3aWcgPHN0ZWZhbi5ib2Rld2lnQGVwb3N0LmRlPohXBBMRAgAX -BQI8Pto2BQsHCgMEAxUDAgMWAgECF4AACgkQohFa4V9ri3Kz/gCg0PlCER3JUjKk -G8JQe/lIJoApx38AoMW2G1lOuMX54RiWS08tG0j3ON4TuQENBDsSIlQQBADNUpZL -xCuTKzJ1tMm7b/XjAhvPYKiL3doAZ6XALBdLF/nQmlh1jcuRy93QWpPxtwSfPjcw -JLHy+Uq5tC1SnH1YwYhviLG1KEsniUBroUmV2HJyHP92fFI3LPk3xbqxvLh1NXFp -zSuWjGMA66sZqeEbtMy2B8OLRwQShdHIBWgrIwADBQP+PWkmbg2mraaUmgTswre8 -CGArBgcV+WYm6yaq9IC1G4V1PXmlswmsDlsAr6UDdJU46GFZMIi2WmFJHarEkIBw -FN44ypSLmiEVwKRJE2/CYO0f7zQHcF6GUSwQo2TxneahrZyHs7GdvpcRcfm0YnlC -/H1CJ3pl8FpfHttzzIrIJviIRgQYEQIABgUCOxIiVAAKCRCiEVrhX2uLcg0yAKCd -zbaSPxN+OS1Tq7hJRSq53blllwCfQHZvTM+MqMa6LB0pKeQVs1wVLeA= -=TAHR +0LMAn22/u01Lo3Bo5lDxxHSkayUkYq25AKCm20yaGFGtTDJW4Rdz50pfut1AwrQq +U3RlZmFuIEJvZGV3aWcgPHN0ZWZhbi5ib2Rld2lnQGZyZWVuZXQuZGU+iFwEExEC +ABwFAj5ogVwCGwMECwcDAgMVAgMDFgIBAh4BAheAAAoJEKIRWuFfa4tyTygAn14R +Tq+IDDCEMBBr1G+if1+GrLsyAJ43th/U9a/40lYtTWyBLUH26ZskF7kBDQQ7EiJU +EAQAzVKWS8QrkysydbTJu2/14wIbz2Coi93aAGelwCwXSxf50JpYdY3Lkcvd0FqT +8bcEnz43MCSx8vlKubQtUpx9WMGIb4ixtShLJ4lAa6FJldhychz/dnxSNyz5N8W6 +sby4dTVxac0rloxjAOurGanhG7TMtgfDi0cEEoXRyAVoKyMAAwUD/j1pJm4Npq2m +lJoE7MK3vAhgKwYHFflmJusmqvSAtRuFdT15pbMJrA5bAK+lA3SVOOhhWTCItlph +SR2qxJCAcBTeOMqUi5ohFcCkSRNvwmDtH+80B3BehlEsEKNk8Z3moa2ch7Oxnb6X +EXH5tGJ5Qvx9Qid6ZfBaXx7bc8yKyCb4iEYEGBECAAYFAjsSIlQACgkQohFa4V9r +i3INMgCgnc22kj8TfjktU6u4SUUqud25ZZcAn0B2b0zPjKjGuiwdKSnkFbNcFS3g +=rSF1 -END PGP PUBLIC KEY BLOCK- Type Bits/KeyIDDate User ID
cvs commit: ant/xdocs antnews.xml contributors.xml external.xml faq.xml index.xml
bodewig 2003/03/07 04:36:20 Modified:.Tag: ANT_15_BRANCH KEYS docs Tag: ANT_15_BRANCH antnews.html contributors.html external.html faq.html index.html docs/manual Tag: ANT_15_BRANCH credits.html xdocsTag: ANT_15_BRANCH antnews.xml contributors.xml external.xml faq.xml index.xml Log: Merge some doc changes from HEAD Revision ChangesPath No revision No revision 1.6.2.3 +20 -21ant/KEYS Index: KEYS === RCS file: /home/cvs/ant/KEYS,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- KEYS 18 Jul 2002 14:41:44 - 1.6.2.2 +++ KEYS 7 Mar 2003 12:36:18 - 1.6.2.3 @@ -68,20 +68,19 @@ =Icm2 -END PGP PUBLIC KEY BLOCK- -pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -sig5F6B8B72 2002-01-11 Stefan Bodewig <[EMAIL PROTECTED]> +pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2003-03-07 Stefan Bodewig <[EMAIL PROTECTED]> uid Stefan Bodewig <[EMAIL PROTECTED]> -sig 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -sig51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> uidStefan Bodewig <[EMAIL PROTECTED]> -sig5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -sig51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> sub 1024g/24774157 2001-05-28 -sig5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v1.0.6 (GNU/Linux) -Comment: Weitere Infos: siehe http://www.gnupg.org +Version: GnuPG v1.2.0 (GNU/Linux) mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ 5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82 @@ -99,18 +98,18 @@ ZmFuIEJvZGV3aWcgPGJvZGV3aWdAYm9zdC5kZT6IVwQTEQIAFwUCOxI5gQULBwoD BAMVAwIDFgIBAheAAAoJEKIRWuFfa4tyyboAoNoD/9Jgm/alxfAYELz05LMa/HLe AKDWTHqq7rMkppZoTUv2gWpVzrk5RIhGBBARAgAGBQI8PtWVAAoJEIEEZE9RiYUE -0LMAn22/u01Lo3Bo5lDxxHSkayUkYq25AKCm20yaGFGtTDJW4Rdz50pfut1AwrQo -U3RlZmFuIEJvZGV3aWcgPHN0ZWZhbi5ib2Rld2lnQGVwb3N0LmRlPohXBBMRAgAX -BQI8Pto2BQsHCgMEAxUDAgMWAgECF4AACgkQohFa4V9ri3Kz/gCg0PlCER3JUjKk -G8JQe/lIJoApx38AoMW2G1lOuMX54RiWS08tG0j3ON4TuQENBDsSIlQQBADNUpZL -xCuTKzJ1tMm7b/XjAhvPYKiL3doAZ6XALBdLF/nQmlh1jcuRy93QWpPxtwSfPjcw -JLHy+Uq5tC1SnH1YwYhviLG1KEsniUBroUmV2HJyHP92fFI3LPk3xbqxvLh1NXFp -zSuWjGMA66sZqeEbtMy2B8OLRwQShdHIBWgrIwADBQP+PWkmbg2mraaUmgTswre8 -CGArBgcV+WYm6yaq9IC1G4V1PXmlswmsDlsAr6UDdJU46GFZMIi2WmFJHarEkIBw -FN44ypSLmiEVwKRJE2/CYO0f7zQHcF6GUSwQo2TxneahrZyHs7GdvpcRcfm0YnlC -/H1CJ3pl8FpfHttzzIrIJviIRgQYEQIABgUCOxIiVAAKCRCiEVrhX2uLcg0yAKCd -zbaSPxN+OS1Tq7hJRSq53blllwCfQHZvTM+MqMa6LB0pKeQVs1wVLeA= -=TAHR +0LMAn22/u01Lo3Bo5lDxxHSkayUkYq25AKCm20yaGFGtTDJW4Rdz50pfut1AwrQq +U3RlZmFuIEJvZGV3aWcgPHN0ZWZhbi5ib2Rld2lnQGZyZWVuZXQuZGU+iFwEExEC +ABwFAj5ogVwCGwMECwcDAgMVAgMDFgIBAh4BAheAAAoJEKIRWuFfa4tyTygAn14R +Tq+IDDCEMBBr1G+if1+GrLsyAJ43th/U9a/40lYtTWyBLUH26ZskF7kBDQQ7EiJU +EAQAzVKWS8QrkysydbTJu2/14wIbz2Coi93aAGelwCwXSxf50JpYdY3Lkcvd0FqT +8bcEnz43MCSx8vlKubQtUpx9WMGIb4ixtShLJ4lAa6FJldhychz/dnxSNyz5N8W6 +sby4dTVxac0rloxjAOurGanhG7TMtgfDi0cEEoXRyAVoKyMAAwUD/j1pJm4Npq2m +lJoE7MK3vAhgKwYHFflmJusmqvSAtRuFdT15pbMJrA5bAK+lA3SVOOhhWTCItlph +SR2qxJCAcBTeOMqUi5ohFcCkSRNvwmDtH+80B3BehlEsEKNk8Z3moa2ch7Oxnb6X +EXH5tGJ5Qvx9Qid6ZfBaXx7bc8yKyCb4iEYEGBECAAYFAjsSIlQACgkQohFa4V9r +i3INMgCgnc22kj8TfjktU6u4SUUqud25ZZcAn0B2b0zPjKjGuiwdKSnkFbNcFS3g +=rSF1 -END PGP PUBLIC KEY BLOCK- Type Bits/KeyIDDate User ID No revision No revision 1.31.2.7 +22 -1 ant/docs/antnews.html Index: antnews.html === RCS file: /home/cvs/ant/docs/antnews.html,v retrieving revision 1.31.2.6 retrieving revision 1.31.2.7 diff -u -r1.31.2.6 -r1.31.2.7 --- antnews.html 19 Feb 2003 09:11:16 - 1.31.2.6 +++ antnews.html 7 Mar 2003 12:36:18 - 1.31.2.7 @@ -10,7 +10,7 @@ - + @@ -210,6 +210,27 @@
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2003/03/07 04:38:39
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Zip.java
Log:
Merge fix for bug 17648 from HEAD
Revision ChangesPath
No revision
No revision
1.78.2.12 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.78.2.11
retrieving revision 1.78.2.12
diff -u -r1.78.2.11 -r1.78.2.12
--- Zip.java 26 Feb 2003 10:07:00 - 1.78.2.11
+++ Zip.java 7 Mar 2003 12:38:39 - 1.78.2.12
@@ -517,7 +517,7 @@
prefix = zfs.getPrefix();
fullpath = zfs.getFullpath();
dirMode = zfs.getDirMode();
-fileMode = zfs.getDirMode();
+fileMode = zfs.getFileMode();
}
if (prefix.length() > 0 && fullpath.length() > 0) {
cvs commit: ant/src/main/org/apache/tools/ant AntClassLoader.java
bodewig 2003/03/07 06:41:10
Modified:docs/manual credits.html
src/main/org/apache/tools/ant AntClassLoader.java
Log:
Improve log message when classloader fails to read a resource.
Submitted by: Sascha Freitag
Revision ChangesPath
1.21 +1 -1 ant/docs/manual/credits.html
Index: credits.html
===
RCS file: /home/cvs/ant/docs/manual/credits.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- credits.html 7 Mar 2003 11:32:19 - 1.20
+++ credits.html 7 Mar 2003 14:41:10 - 1.21
@@ -44,7 +44,7 @@
$Id$
-Copyright © 2000-2002 Apache Software Foundation. All
rights
+Copyright © 2000-2003 Apache Software Foundation. All
rights
Reserved.
1.67 +2 -1 ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- AntClassLoader.java 10 Feb 2003 14:13:29 - 1.66
+++ AntClassLoader.java 7 Mar 2003 14:41:10 - 1.67
@@ -1172,7 +1172,8 @@
throw se;
} catch (IOException ioe) {
// ioe.printStackTrace();
-log("Exception reading component " + pathComponent ,
+log("Exception reading component " + pathComponent
++ "(reason: " + ioe.getMessage() + ")",
Project.MSG_VERBOSE);
}
}
cvs commit: ant/src/main/org/apache/tools/ant AntClassLoader.java
bodewig 2003/03/07 06:43:17
Modified:src/main/org/apache/tools/ant AntClassLoader.java
Log:
looks better that way
Revision ChangesPath
1.68 +1 -1 ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- AntClassLoader.java 7 Mar 2003 14:41:10 - 1.67
+++ AntClassLoader.java 7 Mar 2003 14:43:17 - 1.68
@@ -1173,7 +1173,7 @@
} catch (IOException ioe) {
// ioe.printStackTrace();
log("Exception reading component " + pathComponent
-+ "(reason: " + ioe.getMessage() + ")",
++ " (reason: " + ioe.getMessage() + ")",
Project.MSG_VERBOSE);
}
}
cvs commit: ant/docs/manual/CoreTasks jar.html
bodewig 2003/03/07 06:48:52 Modified:docs/manual/CoreTasks jar.html Log: Fix ambiguity in the manual Revision ChangesPath 1.24 +1 -1 ant/docs/manual/CoreTasks/jar.html Index: jar.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jar.html 5 Feb 2003 10:43:07 - 1.23 +++ jar.html 7 Mar 2003 14:48:52 - 1.24 @@ -28,7 +28,7 @@ <patternset> elements. You can also use nested file sets for more flexibility, and specify multiple ones to merge together different trees of files into one JAR. -The extended fileset and groupfileset attributes from the zip task are +The extended fileset and groupfileset child elements from the zip task are also available in the jar task. See the Zip task for more details and examples. If the manifest is omitted, a simple one will be supplied by Ant.
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh Scp.java
bodewig 2003/03/07 06:53:36
Modified:docs/manual/OptionalTasks scp.html
src/main/org/apache/tools/ant/taskdefs/optional/ssh Scp.java
Log:
.ssh is in ${user.home}, not ${user.dir}.
Revision ChangesPath
1.2 +1 -1 ant/docs/manual/OptionalTasks/scp.html
Index: scp.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scp.html 6 Mar 2003 12:42:44 - 1.1
+++ scp.html 7 Mar 2003 14:53:36 - 1.2
@@ -54,7 +54,7 @@
the identity of the remote host. This must be a SSH2 format file.
SSH1 format is not supported.
No, defaults to
-${user.dir}/.ssh/known_hosts.
+${user.home}/.ssh/known_hosts.
failonerror
1.2 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
Index: Scp.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scp.java 6 Mar 2003 12:42:44 - 1.1
+++ Scp.java 7 Mar 2003 14:53:36 - 1.2
@@ -118,7 +118,7 @@
* Sets the path to the file that has the identities of
* all known hosts. This is used by SSH protocol to validate
* the identity of the host. The default is
- * {$user.dir}/.ssh/known_hosts.
+ * ${user.home}/.ssh/known_hosts.
* @param knownHosts a path to the known hosts file.
*/
@@ -161,7 +161,7 @@
super.init();
this.toUri = null;
this.fromUri = null;
-this.knownHosts = System.getProperty("user.dir") +
"/.ssh/known_hosts";
+this.knownHosts = System.getProperty("user.home") +
"/.ssh/known_hosts";
this.trust = false;
this.port = 22;
this.fileSets = null;
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh AbstractSshMessage.java Scp.java ScpFromMessage.java ScpToMessage.java
bodewig 2003/03/10 02:05:43
Modified:src/main/org/apache/tools/ant/taskdefs/optional/ssh
AbstractSshMessage.java Scp.java
ScpFromMessage.java ScpToMessage.java
Log:
Upgrade to jsch-0.1.2
Revision ChangesPath
1.2 +4 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java
Index: AbstractSshMessage.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractSshMessage.java 6 Mar 2003 12:42:44 - 1.1
+++ AbstractSshMessage.java 10 Mar 2003 10:05:43 - 1.2
@@ -54,9 +54,10 @@
package org.apache.tools.ant.taskdefs.optional.ssh;
-import com.jcraft.jsch.Session;
import com.jcraft.jsch.Channel;
import com.jcraft.jsch.ChannelExec;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
import java.io.IOException;
import java.io.OutputStream;
@@ -76,7 +77,7 @@
this.session = session;
}
-protected Channel openExecChannel( String command ) {
+protected Channel openExecChannel( String command ) throws JSchException
{
ChannelExec channel = (ChannelExec) session.openChannel( "exec" );
channel.setCommand( command );
@@ -97,7 +98,7 @@
} while (b > 0);
}
-public abstract void execute() throws IOException;
+public abstract void execute() throws IOException, JSchException;
public void setLogListener( LogListener aListener ) {
listener = aListener;
1.3 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
Index: Scp.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Scp.java 7 Mar 2003 14:53:36 - 1.2
+++ Scp.java 10 Mar 2003 10:05:43 - 1.3
@@ -201,7 +201,7 @@
if( failOnError ) {
throw new BuildException(e);
} else {
-e.printStackTrace();
+log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
}
}
}
@@ -317,7 +317,7 @@
}
private Directory createDirectory( FileSet set ) {
-DirectoryScanner scanner = set.getDirectoryScanner( project );
+DirectoryScanner scanner = set.getDirectoryScanner( getProject() );
Directory root = new Directory( scanner.getBasedir() );
String[] files = scanner.getIncludedFiles();
for (int j = 0; j < files.length; j++) {
1.2 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
Index: ScpFromMessage.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScpFromMessage.java 6 Mar 2003 12:42:44 - 1.1
+++ ScpFromMessage.java 10 Mar 2003 10:05:43 - 1.2
@@ -76,7 +76,7 @@
this.isRecursive = recursive;
}
-public void execute() throws IOException {
+public void execute() throws IOException, JSchException {
String command = "scp -f ";
if( isRecursive )
command += "-r ";
1.2 +5 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
Index: ScpToMessage.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScpToMessage.java 6 Mar 2003 12:42:44 - 1.1
+++ ScpToMessage.java 10 Mar 2003 10:05:43 - 1.2
@@ -54,8 +54,9 @@
package org.apache.tools.ant.taskdefs.optional.ssh;
-import com.jcraft.jsch.Session;
import com.jcraft.jsch.Channel;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.JSchException;
import java.io.*;
import java.util.*;
@@ -85,7 +86,7 @@
this.remotePath = aRemotePath;
}
-public void execute() throws IOException {
+public void execute() throws IOException, JSchException {
if( directoryList != null ) {
doMultipleTransfer();
}
@@ -95,7 +96,7 @@
log("done.\n");
}
-private void doSingleTransfer() throws IOException {
+private v
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet NetCommand.java
bodewig 2003/03/10 02:11:19 Modified:src/main/org/apache/tools/ant/taskdefs/optional/dotnet NetCommand.java Log: 2003 Revision ChangesPath 1.19 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java Index: NetCommand.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- NetCommand.java 10 Mar 2003 08:02:24 - 1.18 +++ NetCommand.java 10 Mar 2003 10:11:19 - 1.19 @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights + * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet CSharp.java VisualBasicCompile.java
bodewig 2003/03/11 00:28:39 Modified:src/main/org/apache/tools/ant/taskdefs/optional/dotnet CSharp.java VisualBasicCompile.java Log: 2003 Revision ChangesPath 1.31 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java Index: CSharp.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- CSharp.java 11 Mar 2003 06:07:37 - 1.30 +++ CSharp.java 11 Mar 2003 08:28:38 - 1.31 @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2002 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without 1.4 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java Index: VisualBasicCompile.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- VisualBasicCompile.java 11 Mar 2003 06:07:37 - 1.3 +++ VisualBasicCompile.java 11 Mar 2003 08:28:38 - 1.4 @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2002 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without
cvs commit: ant build.xml
bodewig 2003/03/11 00:41:36 Modified:.build.xml Log: .NET tests need .NET apps Revision ChangesPath 1.355 +2 -0 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- build.xml 6 Mar 2003 12:42:43 - 1.354 +++ build.xml 11 Mar 2003 08:41:35 - 1.355 @@ -1612,6 +1612,8 @@ +
cvs commit: ant/src/testcases/org/apache/tools/ant/types/selectors BaseSelectorTest.java FilenameSelectorTest.java
bodewig 2003/03/11 01:26:44
Modified:src/etc/testcases/taskdefs bunzip2.xml bzip2.xml
src/etc/testcases/types selectors.xml
src/testcases/org/apache/tools/ant/taskdefs BUnzip2Test.java
BZip2Test.java
src/testcases/org/apache/tools/ant/types/selectors
BaseSelectorTest.java FilenameSelectorTest.java
Added: src/etc/testcases/taskdefs/expected asf-logo-huge.tar.gz
Removed: src/etc/testcases/taskdefs/expected asf-logo-huge.tar
Log:
Save some (mega)bytes
Revision ChangesPath
1.4 +5 -1 ant/src/etc/testcases/taskdefs/bunzip2.xml
Index: bunzip2.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/bunzip2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bunzip2.xml 23 Jun 2002 01:20:01 - 1.3
+++ bunzip2.xml 11 Mar 2003 09:26:39 - 1.4
@@ -2,12 +2,16 @@
-
+
+
+
+
+
1.5 +6 -2 ant/src/etc/testcases/taskdefs/bzip2.xml
Index: bzip2.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/bzip2.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bzip2.xml 23 Jun 2002 01:20:01 - 1.4
+++ bzip2.xml 11 Mar 2003 09:26:40 - 1.5
@@ -2,11 +2,11 @@
-
+
-
+
@@ -14,6 +14,10 @@
+
+
+
+
1.1
ant/src/etc/testcases/taskdefs/expected/asf-logo-huge.tar.gz
<>
1.4 +4 -4 ant/src/etc/testcases/types/selectors.xml
Index: selectors.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/types/selectors.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- selectors.xml 9 Jul 2002 21:05:57 - 1.3
+++ selectors.xml 11 Mar 2003 09:26:44 - 1.4
@@ -26,8 +26,8 @@
tofile="${test.dir}/zip/asf-logo.gif.zip" />
-
+
-
@@ -72,7 +72,7 @@
-
+
1.7 +3 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
Index: BUnzip2Test.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BUnzip2Test.java 7 Mar 2003 11:23:11 - 1.6
+++ BUnzip2Test.java 11 Mar 2003 09:26:44 - 1.7
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,7 @@
public void setUp() {
configureProject("src/etc/testcases/taskdefs/bunzip2.xml");
+executeTarget("prepare");
}
public void tearDown() {
1.7 +3 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java
Index: BZip2Test.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BZip2Test.java7 Mar 2003 11:23:11 - 1.6
+++ BZip2Test.java11 Mar 2003 09:26:44 - 1.7
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,7 @@
public void setUp() {
configureProject("src/etc/testcases/taskdefs/bzip2.xml");
+executeTarget("prepare");
}
public void tearDown() {
1.5 +2 -2
ant/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
Index: BaseSelectorTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseSelectorTest.java 10 Feb 2003
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka ClassPathLoaderTest.java
bodewig 2003/03/11 02:30:15
Modified:src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka
ClassPathLoaderTest.java
Log:
Make test more robust. In particular - make it pass on Mac OS X.
Revision ChangesPath
1.3 +6 -4
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java
Index: ClassPathLoaderTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassPathLoaderTest.java 10 Feb 2003 14:14:54 - 1.2
+++ ClassPathLoaderTest.java 11 Mar 2003 10:30:15 - 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001,2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,7 @@
import java.io.File;
import junit.framework.TestCase;
+import org.apache.tools.ant.types.Path;
import
org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader;
/**
@@ -71,9 +72,10 @@
public void testgetClasses() throws Exception {
// good performance test...load all classes in rt.jar
-String path = System.getProperty("java.home") + File.separator +
"lib/rt.jar";
-ClassPathLoader cl = new ClassPathLoader(path);
- Hashtable map = cl.getClasses();
+Path p = new Path(null);
+p.addJavaRuntime();
+ClassPathLoader cl = new ClassPathLoader(p.toString());
+Hashtable map = cl.getClasses();
assertTrue(map.size() > 0);
}
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka XMLReportTest.java
bodewig 2003/03/11 02:42:28
Modified:src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka
XMLReportTest.java
Log:
Make test more robust. In particular - make it pass on Mac OS X.
Revision ChangesPath
1.3 +5 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReportTest.java
Index: XMLReportTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReportTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLReportTest.java10 Feb 2003 14:14:54 - 1.2
+++ XMLReportTest.java11 Mar 2003 10:42:28 - 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001,2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,7 @@
import javax.xml.transform.stream.StreamResult;
import junit.framework.TestCase;
+import org.apache.tools.ant.types.Path;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -95,7 +96,9 @@
incl.setMethod("set*");
filters.addInclude(incl);
report.setReportFilters(filters);
-Document doc = report.createDocument(new String[]{
System.getProperty("java.home") + "/lib/rt.jar"});
+Path p = new Path(null);
+p.addJavaRuntime();
+Document doc = report.createDocument(p.list());
Node snapshot = doc.getDocumentElement();
assertEquals("snapshot", snapshot.getNodeName());
cvs commit: ant/src/main/org/apache/tools/ant/types Path.java
bodewig 2003/03/11 02:57:43
Modified:src/main/org/apache/tools/ant/types Path.java
Log:
Adapt to JDK 1.4.1 for Mac OS X.
Note that there are more jars in that directory that I'm not sure
about (whether we want to add them in addJavaRuntime, that is).
Revision ChangesPath
1.47 +6 -1 ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Path.java 7 Mar 2003 11:23:07 - 1.46
+++ Path.java 11 Mar 2003 10:57:42 - 1.47
@@ -621,12 +621,17 @@
+ File.separator + "lib"
+ File.separator + "rt.jar"));
-// Sun's 1.4 has JCE and JSSE in separate jars.
+// Sun's and Apple's 1.4 have JCE and JSSE in separate jars.
String[] secJars = { "jce", "jsse" };
for (int i = 0; i < secJars.length; i++) {
addExisting(new Path(null,
System.getProperty("java.home")
+ File.separator + "lib"
+ + File.separator + secJars[i] +
".jar"));
+addExisting(new Path(null,
+ System.getProperty("java.home")
+ + File.separator + ".."
+ + File.separator + "Classes"
+ File.separator + secJars[i] +
".jar"));
}
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh SSHBase.java SSHUserInfo.java Scp.java
bodewig 2003/03/11 05:00:31
Modified:src/main/org/apache/tools/ant/taskdefs/optional/ssh Scp.java
Added: src/main/org/apache/tools/ant/taskdefs/optional/ssh
SSHBase.java SSHUserInfo.java
Log:
Add key based authentication to scp.
Submitted by: Robert Anderson
Revision ChangesPath
1.4 +48 -140
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
Index: Scp.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Scp.java 10 Mar 2003 10:05:43 - 1.3
+++ Scp.java 11 Mar 2003 13:00:31 - 1.4
@@ -74,19 +74,11 @@
* @author [EMAIL PROTECTED]
* @since Ant 1.6
*/
-public class Scp extends Task implements LogListener {
+public class Scp extends SSHBase {
private String fromUri;
private String toUri;
-private String knownHosts;
-private boolean trust = false;
-private int port = 22;
private List fileSets = null;
-private boolean failOnError = true;
-
-public void setFailonerror( boolean failure ) {
-failOnError = failure;
-}
/**
* Sets the file to be transferred. This can either be a remote
@@ -114,35 +106,7 @@
this.toUri = aToUri;
}
-/**
- * Sets the path to the file that has the identities of
- * all known hosts. This is used by SSH protocol to validate
- * the identity of the host. The default is
- * ${user.home}/.ssh/known_hosts.
-
- * @param knownHosts a path to the known hosts file.
- */
-public void setKnownhosts( String knownHosts ) {
-this.knownHosts = knownHosts;
-}
-/**
- * Setting this to true trusts hosts whose identity is unknown.
- *
- * @param yesOrNo if true trust the identity of unknown hosts.
- */
-public void setTrust( boolean yesOrNo ) {
-this.trust = yesOrNo;
-}
-
-/**
- * Changes the port used to connect to the remote host.
- *
- * @param port port number of remote host.
- */
-public void setPort( int port ) {
-this.port = port;
-}
/**
* Adds a FileSet tranfer to remote host. NOTE: Either
@@ -161,9 +125,6 @@
super.init();
this.toUri = null;
this.fromUri = null;
-this.knownHosts = System.getProperty("user.home") +
"/.ssh/known_hosts";
-this.trust = false;
-this.port = 22;
this.fileSets = null;
}
@@ -174,12 +135,13 @@
if ( fromUri == null && fileSets == null ) {
throw new BuildException("Either the 'file' attribute or one " +
-"FileSet is required.");
+ "FileSet is required.");
}
boolean isFromRemote = false;
-if( fromUri != null )
+if( fromUri != null ) {
isFromRemote = isRemoteUri(fromUri);
+}
boolean isToRemote = isRemoteUri(toUri);
try {
if (isFromRemote && !isToRemote) {
@@ -194,11 +156,11 @@
// not implemented yet.
} else {
throw new BuildException("'todir' and 'file' attributes " +
-"must have syntax like the following: " +
-"user:[EMAIL PROTECTED]:/path");
+ "must have syntax like the
following: " +
+ "user:[EMAIL PROTECTED]:/path");
}
} catch (Exception e) {
-if( failOnError ) {
+if(getFailonerror()) {
throw new BuildException(e);
} else {
log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
@@ -207,20 +169,17 @@
}
private void download( String fromSshUri, String toPath )
-throws JSchException, IOException {
-String[] fromValues = parseUri(fromSshUri);
+throws JSchException, IOException {
+String file = parseUri(fromSshUri);
Session session = null;
try {
-session = openSession(fromValues[0],
-fromValues[1],
-fromValues[2],
-port );
+session = openSession();
ScpFromMessage message = new ScpFromMessage( session,
-fromValues[3],
-new File( toPath ),
-
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh SSHExec.java SSHBase.java
bodewig 2003/03/11 05:15:44
Modified:src/main/org/apache/tools/ant/taskdefs defaults.properties
src/main/org/apache/tools/ant/taskdefs/optional/ssh
SSHBase.java
Added: src/main/org/apache/tools/ant/taskdefs/optional/ssh
SSHExec.java
Log:
New task .
Submitted by: Robert Anderson
Revision ChangesPath
1.141 +1 -0
ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Index: defaults.properties
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- defaults.properties 6 Mar 2003 12:42:44 - 1.140
+++ defaults.properties 11 Mar 2003 13:15:43 - 1.141
@@ -182,6 +182,7 @@
chown=org.apache.tools.ant.taskdefs.optional.unix.Chown
attrib=org.apache.tools.ant.taskdefs.optional.windows.Attrib
scp=org.apache.tools.ant.taskdefs.optional.ssh.Scp
+sshexec=org.apache.tools.ant.taskdefs.optional.ssh.SSHExec
# deprecated ant tasks (kept for back compatibility)
starteam=org.apache.tools.ant.taskdefs.optional.scm.AntStarTeamCheckOut
1.2 +3 -0
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
Index: SSHBase.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SSHBase.java 11 Mar 2003 13:00:31 - 1.1
+++ SSHBase.java 11 Mar 2003 13:15:43 - 1.2
@@ -102,6 +102,9 @@
this.host = host;
}
+public String getHost() {
+return host;
+}
public void setFailonerror( boolean failure ) {
failOnError = failure;
1.1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Index: SSHExec.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* "This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/)."
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "Ant" and "Apache Software
*Foundation" must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
*nor may "Apache" appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.tools.ant.taskdefs.optio
cvs commit: ant/docs/manual/OptionalTasks scp.html
bodewig 2003/03/11 05:56:58
Modified:docs/manual/OptionalTasks scp.html
Log:
document new scp functionality
Revision ChangesPath
1.3 +42 -2 ant/docs/manual/OptionalTasks/scp.html
Index: scp.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scp.html 7 Mar 2003 14:53:36 - 1.2
+++ scp.html 11 Mar 2003 13:56:58 - 1.3
@@ -28,14 +28,18 @@
file
The file to copy. This can be a local path or a
-remote path of the form user:[EMAIL
PROTECTED]:/directory/path.
+remote path of the form user[:[EMAIL PROTECTED]:/directory/path.
+:password can be ommitted if you use key based
+authentication or specify the password attribute.
Yes, unless a nested
<fileset> element is used.
todir
The directory to copy to. This can be a local path
-or a remote path of the form user:[EMAIL
PROTECTED]:/directory/path
+or a remote path of the form user[:[EMAIL
PROTECTED]:/directory/path.
+:password can be ommitted if you use key based
+authentication or specify the password attribute.
Yes
@@ -63,6 +67,25 @@
No; defaults to true.
+
+password
+ The password.
+ Not if you are using key based
+ authentication or the password has been given in the file or
+ todir attribute.
+
+
+keyfile
+ Location of the file holding the private key.
+ Yes, if you are using key based
+ authentication.
+
+
+passphrase
+ Passphrase for your private key.
+ Yes, if you are using key based
+ authentication.
+
Parameters specified as nested elements
@@ -76,6 +99,23 @@
<scp file="myfile.txt" todir="user:[EMAIL
PROTECTED]:/home/chuck"/>
+
+Copy a single local file to a remote machine with separate
+password attribute
+
+ <scp file="myfile.txt" todir="[EMAIL
PROTECTED]:/home/chuck" password="password"/>
+
+
+Copy a single local file to a remote machine using key base
+authentication.
+
+ <scp file="myfile.txt"
+ todir="[EMAIL PROTECTED]:/home/chuck"
+ keyfile="${user.home}/.ssh/id_dsa"
+ passphrase="my extremely secret passphrase"
+ />
+
+
Copy a single remote file to a local directory
<scp file="user:[EMAIL PROTECTED]:/home/chuck/myfile.txt"
todir="../some/other/dir"/>
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh SSHBase.java
bodewig 2003/03/11 06:21:31
Modified:src/main/org/apache/tools/ant/taskdefs/optional/ssh
SSHBase.java
Log:
No reason for a dummy passphrase.
Pointed out by: Atsuhiko Yamanaka
Revision ChangesPath
1.3 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
Index: SSHBase.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SSHBase.java 11 Mar 2003 13:15:43 - 1.2
+++ SSHBase.java 11 Mar 2003 14:21:31 - 1.3
@@ -195,7 +195,7 @@
protected Session openSession() throws JSchException {
JSch jsch = new JSch();
if (null != userInfo.getKeyfile()) {
-jsch.addIdentity(userInfo.getKeyfile(), "passphrase");
+jsch.addIdentity(userInfo.getKeyfile());
}
if( knownHosts != null ) {
cvs commit: ant/docs/manual/OptionalTasks scp.html
bodewig 2003/03/11 06:31:53 Modified:docs/manual/OptionalTasks scp.html Log: better track the version for now, jsch is still in a flux a bit Revision ChangesPath 1.4 +1 -1 ant/docs/manual/OptionalTasks/scp.html Index: scp.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scp.html 11 Mar 2003 13:56:58 - 1.3 +++ scp.html 11 Mar 2003 14:31:53 - 1.4 @@ -16,7 +16,7 @@ Note: This task depends on external libraries not included in the Ant distribution. See Library Dependencies -for more information. +for more information. This task has been tested with jsch-0.1.2. Parameters
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh ScpFromMessage.java ScpToMessage.java
bodewig 2003/03/11 06:42:43
Modified:.build.xml
src/main/org/apache/tools/ant/taskdefs/optional/ssh
ScpFromMessage.java ScpToMessage.java
Log:
remove JDK 1.4 dependency
Revision ChangesPath
1.356 +1 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- build.xml 11 Mar 2003 08:41:35 - 1.355
+++ build.xml 11 Mar 2003 14:42:42 - 1.356
@@ -144,6 +144,7 @@
+
@@ -157,7 +158,6 @@
-
1.3 +1 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
Index: ScpFromMessage.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScpFromMessage.java 10 Mar 2003 10:05:43 - 1.2
+++ ScpFromMessage.java 11 Mar 2003 14:42:43 - 1.3
@@ -58,7 +58,6 @@
import java.io.*;
import java.util.StringTokenizer;
-import java.text.NumberFormat;
public class ScpFromMessage extends AbstractSshMessage {
@@ -154,8 +153,7 @@
String command = token.nextToken();
int filesize = Integer.parseInt( token.nextToken() );
String filename = token.nextToken();
-NumberFormat formatter = NumberFormat.getIntegerInstance();
-log( "Receiving: " + filename + " : " + formatter.format( filesize )
);
+log( "Receiving: " + filename + " : " + filesize);
File transferFile = ( localFile.isDirectory() )
? new File( localFile, filename )
: localFile;
1.3 +2 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
Index: ScpToMessage.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScpToMessage.java 10 Mar 2003 10:05:43 - 1.2
+++ ScpToMessage.java 11 Mar 2003 14:42:43 - 1.3
@@ -60,7 +60,6 @@
import java.io.*;
import java.util.*;
-import java.text.NumberFormat;
public class ScpToMessage extends AbstractSshMessage {
@@ -182,9 +181,8 @@
long startTime = System.currentTimeMillis();
int totalLength = 0;
try {
-NumberFormat formatter = NumberFormat.getIntegerInstance();
-log( "Sending: " + localFile.getName() + " : " +
-formatter.format( localFile.length() ) );
+log( "Sending: " + localFile.getName() + " : " +
+ localFile.length());
while (true) {
int len = fis.read(buf, 0, buf.length);
if (len <= 0) break;
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs JarTest.java
bodewig 2003/03/12 02:19:59
Modified:src/etc/testcases/taskdefs jar.xml
src/testcases/org/apache/tools/ant/taskdefs JarTest.java
Log:
currently failing testcase to demonstrate PR: 17780
Revision ChangesPath
1.10 +11 -0 ant/src/etc/testcases/taskdefs/jar.xml
Index: jar.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/jar.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jar.xml 26 Feb 2003 09:57:01 - 1.9
+++ jar.xml 12 Mar 2003 10:19:59 - 1.10
@@ -189,4 +189,15 @@
+
+
+
+
+
+
+
+
+
+
1.19 +9 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
Index: JarTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JarTest.java 26 Feb 2003 09:57:01 - 1.18
+++ JarTest.java 12 Mar 2003 10:19:59 - 1.19
@@ -67,6 +67,7 @@
public class JarTest extends BuildFileTest {
private static String tempJar = "tmp.jar";
+private static String tempDir = "jartmp/";
private Reader r1, r2;
public JarTest(String name) {
@@ -170,9 +171,9 @@
executeTarget("testManifestStaysIntact");
r1 = new FileReader(getProject()
-.resolveFile("jartmp/manifest"));
+.resolveFile(tempDir + "manifest"));
r2 = new FileReader(getProject()
-.resolveFile("jartmp/META-INF/MANIFEST.MF"));
+.resolveFile(tempDir + "META-INF/MANIFEST.MF"));
Manifest mf1 = new Manifest(r1);
Manifest mf2 = new Manifest(r2);
assertEquals(mf1, mf2);
@@ -218,5 +219,11 @@
executeTarget("testCreateWithEmptyFilesetSetUp");
executeTarget("testCreateWithEmptyFileset");
executeTarget("testCreateWithEmptyFileset");
+}
+
+public void testUpdateIfOnlyManifestHasChanged() {
+executeTarget("testUpdateIfOnlyManifestHasChanged");
+File jarXml = getProject().resolveFile(tempDir + "jar.xml");
+assertTrue(jarXml.exists());
}
}
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Jar.java Zip.java
bodewig 2003/03/12 03:23:28
Modified:src/main/org/apache/tools/ant/taskdefs Jar.java Zip.java
Log:
Fix the bug.
PR: 17780
Revision ChangesPath
1.71 +5 -3 ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Jar.java 17 Feb 2003 14:00:34 - 1.70
+++ Jar.java 12 Mar 2003 11:23:27 - 1.71
@@ -531,11 +531,12 @@
* out-of-date. Subclasses overriding this method are supposed to
* set this value correctly in their call to
* super.getResourcesToAdd.
- * @return an array of resources to add for each fileset passed in.
+ * @return an array of resources to add for each fileset passed in as
well
+ * as a flag that indicates whether the archive is uptodate.
*
* @exception BuildException if it likes
*/
-protected Resource[][] getResourcesToAdd(FileSet[] filesets,
+protected ArchiveState getResourcesToAdd(FileSet[] filesets,
File zipFile,
boolean needsUpdate)
throws BuildException {
@@ -581,7 +582,8 @@
ZipOutputStream zOut = null;
try {
-log("Building jar: " + getDestFile().getAbsolutePath());
+log("Building MANIFEST-only jar: "
++ getDestFile().getAbsolutePath());
zOut = new ZipOutputStream(new FileOutputStream(getDestFile()));
zOut.setEncoding(getEncoding());
1.101 +64 -11ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Zip.java 7 Mar 2003 11:23:03 - 1.100
+++ Zip.java 12 Mar 2003 11:23:27 - 1.101
@@ -344,7 +344,11 @@
// we don't need to update if the original file doesn't exist
addingNewFiles = true;
-doUpdate = doUpdate && zipFile.exists();
+if (doUpdate && !zipFile.exists()) {
+doUpdate = false;
+log("ignoring update attribute as " + archiveType
++ " doesn't exist.", Project.MSG_DEBUG);
+}
// Add the files found in groupfileset to fileset
for (int i = 0; i < groupfilesets.size(); i++) {
@@ -381,14 +385,16 @@
vfss.copyInto(fss);
boolean success = false;
try {
-Resource[][] addThem = getResourcesToAdd(fss, zipFile, false);
+// can also handle empty archives
+ArchiveState state = getResourcesToAdd(fss, zipFile, false);
// quick exit if the target is up to date
-// can also handle empty archives
-if (isEmpty(addThem)) {
+if (!state.isOutOfDate()) {
return;
}
+Resource[][] addThem = state.getResourcesToAdd();
+
if (doUpdate) {
renamedFile =
fileUtils.createTempFile("zip", ".tmp",
@@ -687,17 +693,38 @@
* out-of-date. Subclasses overriding this method are supposed to
* set this value correctly in their call to
* super.getResourcesToAdd.
- * @return an array of resources to add for each fileset passed in.
+ * @return an array of resources to add for each fileset passed in as
well
+ * as a flag that indicates whether the archive is uptodate.
*
* @exception BuildException if it likes
*/
-protected Resource[][] getResourcesToAdd(FileSet[] filesets,
+protected ArchiveState getResourcesToAdd(FileSet[] filesets,
File zipFile,
boolean needsUpdate)
throws BuildException {
Resource[][] initialResources = grabResources(filesets);
if (isEmpty(initialResources)) {
+if (needsUpdate && doUpdate) {
+/*
+ * This is a rather hairy case.
+ *
+ * One of our subclasses knows that we need to update the
+ * archive, but at the same time, there are no resources
+ * known to us that would need to be added. Only the
+ * subclass seems to know what's going on.
+ *
+ * T
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs JarTest.java
bodewig 2003/03/12 03:29:10
Modified:src/etc/testcases/taskdefs Tag: ANT_15_BRANCH jar.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Jar.java Zip.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_15_BRANCH JarTest.java
Log:
Merge tests and fix for bug 17780 from HEAD
Revision ChangesPath
No revision
No revision
1.4.2.4 +11 -0 ant/src/etc/testcases/taskdefs/jar.xml
Index: jar.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/jar.xml,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- jar.xml 26 Feb 2003 10:07:00 - 1.4.2.3
+++ jar.xml 12 Mar 2003 11:29:09 - 1.4.2.4
@@ -189,4 +189,15 @@
+
+
+
+
+
+
+
+
+
+
No revision
No revision
1.51.2.17 +5 -3 ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.51.2.16
retrieving revision 1.51.2.17
diff -u -r1.51.2.16 -r1.51.2.17
--- Jar.java 19 Feb 2003 08:13:59 - 1.51.2.16
+++ Jar.java 12 Mar 2003 11:29:10 - 1.51.2.17
@@ -535,11 +535,12 @@
* out-of-date. Subclasses overriding this method are supposed to
* set this value correctly in their call to
* super.getResourcesToAdd.
- * @return an array of resources to add for each fileset passed in.
+ * @return an array of resources to add for each fileset passed in as
well
+ * as a flag that indicates whether the archive is uptodate.
*
* @exception BuildException if it likes
*/
-protected Resource[][] getResourcesToAdd(FileSet[] filesets,
+protected ArchiveState getResourcesToAdd(FileSet[] filesets,
File zipFile,
boolean needsUpdate)
throws BuildException {
@@ -585,7 +586,8 @@
ZipOutputStream zOut = null;
try {
-log("Building jar: " + getDestFile().getAbsolutePath());
+log("Building MANIFEST-only jar: "
++ getDestFile().getAbsolutePath());
zOut = new ZipOutputStream(new FileOutputStream(getDestFile()));
zOut.setEncoding(getEncoding());
1.78.2.13 +64 -11ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.78.2.12
retrieving revision 1.78.2.13
diff -u -r1.78.2.12 -r1.78.2.13
--- Zip.java 7 Mar 2003 12:38:39 - 1.78.2.12
+++ Zip.java 12 Mar 2003 11:29:10 - 1.78.2.13
@@ -327,7 +327,11 @@
// we don't need to update if the original file doesn't exist
addingNewFiles = true;
-doUpdate = doUpdate && zipFile.exists();
+if (doUpdate && !zipFile.exists()) {
+doUpdate = false;
+log("ignoring update attribute as " + archiveType
++ " doesn't exist.", Project.MSG_DEBUG);
+}
// Add the files found in groupfileset to fileset
for (int i = 0; i < groupfilesets.size(); i++) {
@@ -364,14 +368,16 @@
vfss.copyInto(fss);
boolean success = false;
try {
-Resource[][] addThem = getResourcesToAdd(fss, zipFile, false);
+// can also handle empty archives
+ArchiveState state = getResourcesToAdd(fss, zipFile, false);
// quick exit if the target is up to date
-// can also handle empty archives
-if (isEmpty(addThem)) {
+if (!state.isOutOfDate()) {
return;
}
+Resource[][] addThem = state.getResourcesToAdd();
+
if (doUpdate) {
renamedFile =
fileUtils.createTempFile("zip", ".tmp",
@@ -666,17 +672,38 @@
* out-of-date. Subclasses overriding this method are supposed to
* set this value correctly in their call to
* super.getResourcesToAdd.
- * @return an array of resources to add for each fileset passed in.
+ * @return an array of resources to add for each fileset passed in as
well
+ * as a flag that indica
cvs commit: ant WHATSNEW
bodewig 2003/03/12 03:41:06 Modified:.Tag: ANT_15_BRANCH WHATSNEW Log: keep track of changes Revision ChangesPath No revision No revision 1.263.2.125 +25 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.263.2.124 retrieving revision 1.263.2.125 diff -u -r1.263.2.124 -r1.263.2.125 --- WHATSNEW 28 Feb 2003 15:19:58 - 1.263.2.124 +++ WHATSNEW 12 Mar 2003 11:41:05 - 1.263.2.125 @@ -1,3 +1,28 @@ +Changes from Ant 1.5.2 to Ant 1.5.3 +=== + +Changes that could break older environments: + + +* The task and friends have again changed a method signature + (sorry, was necessary to fix bug 17780). The return type of + getResourcesToAdd has changed. + +Fixed bugs: +--- + +* 's filemode would get ignored and the dirmode was used + for the included files as well. As a side effect, WinZIP was unable + to extract or display the files, so they seemed to be missing from + the archive. Bugzilla Report 17648. + +* could use the wrong path separator when trying to change the + remote working directory. Bugzilla Report 17735. + +* would loose all original files if you didn't + specify any nested <(zip)fileset>s and the manifest had changed. + Bugzilla Report 17780. + Changes from Ant 1.5.1 to Ant 1.5.2 ===
cvs commit: ant WHATSNEW
bodewig 2003/03/12 03:41:36 Modified:.WHATSNEW Log: keep track of changes Revision ChangesPath 1.362 +25 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- WHATSNEW 6 Mar 2003 12:42:43 - 1.361 +++ WHATSNEW 12 Mar 2003 11:41:36 - 1.362 @@ -161,6 +161,31 @@ jsch, a BSD licensed SSH library that can be found at http://www.jcraft.com/jsch/index.html +Changes from Ant 1.5.2 to Ant 1.5.3 +=== + +Changes that could break older environments: + + +* The task and friends have again changed a method signature + (sorry, was necessary to fix bug 17780). The return type of + getResourcesToAdd has changed. + +Fixed bugs: +--- + +* 's filemode would get ignored and the dirmode was used + for the included files as well. As a side effect, WinZIP was unable + to extract or display the files, so they seemed to be missing from + the archive. Bugzilla Report 17648. + +* could use the wrong path separator when trying to change the + remote working directory. Bugzilla Report 17735. + +* would loose all original files if you didn't + specify any nested <(zip)fileset>s and the manifest had changed. + Bugzilla Report 17780. + Changes from Ant 1.5.1 to Ant 1.5.2 =
cvs commit: ant/docs/manual/OptionalTasks sshexec.html
bodewig 2003/03/13 01:01:54
Modified:.WHATSNEW
docs/manual install.html optionaltasklist.html
Added: docs/manual/OptionalTasks sshexec.html
Log:
Documentation for .
Submitted by: Rob Anderson
Revision ChangesPath
1.363 +3 -3 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- WHATSNEW 12 Mar 2003 11:41:36 - 1.362
+++ WHATSNEW 13 Mar 2003 09:01:53 - 1.363
@@ -157,9 +157,9 @@
* The task subelement has been enhanced to allow files
with tag mappings to be used.
-* New task that supports file transfers over SSH. Requires
- jsch, a BSD licensed SSH library that can be found at
- http://www.jcraft.com/jsch/index.html
+* New tasks: supports file transfers, executes a
+ command over SSH. They require jsch, a BSD licensed SSH library that
+ can be found at http://www.jcraft.com/jsch/index.html
Changes from Ant 1.5.2 to Ant 1.5.3
===
1.48 +1 -1 ant/docs/manual/install.html
Index: install.html
===
RCS file: /home/cvs/ant/docs/manual/install.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- install.html 6 Mar 2003 12:42:43 - 1.47
+++ install.html 13 Mar 2003 09:01:53 - 1.48
@@ -420,7 +420,7 @@
jsch.jar
-scp task
+sshexec and scp tasks
http://www.jcraft.com/jsch/index.html";
target="_top">http://www.jcraft.com/jsch/index.html
1.36 +1 -0 ant/docs/manual/optionaltasklist.html
Index: optionaltasklist.html
===
RCS file: /home/cvs/ant/docs/manual/optionaltasklist.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- optionaltasklist.html 6 Mar 2003 12:42:43 - 1.35
+++ optionaltasklist.html 13 Mar 2003 09:01:54 - 1.36
@@ -60,6 +60,7 @@
Sound
SourceOffSite
Splash
+Sshexec
Starteam Tasks
Stylebook
Symlink
1.1 ant/docs/manual/OptionalTasks/sshexec.html
Index: sshexec.html
===
SSHEXEC Task
SSHEXEC
Description
Runs a command on a remote machine running SSH daemon.
Note: This task depends on external libraries not included
in the Ant distribution. See Library Dependencies
for more information. This task has been tested with jsch-0.1.2.
Parameters
Attribute
Description
Required
username
The username on the remote host to which you are
connecting.
Yes
command
The command to run on the remote host.
Yes
port
The port to connect to on the remote host.
No, defaults to 22.
trust
This trusts all unknown hosts if set to yes/true.
No, defaults to No.
knownhosts
This sets the known hosts file to use to validate
the identity of the remote host. This must be a SSH2 format file.
SSH1 format is not supported.
No, defaults to
${user.home}/.ssh/known_hosts.
failonerror
Log a warning message, but do not stop the build,
when the transfer does not work.
No; defaults to true.
password
The password.
Not if you are using key based
authentication or the password has been given in the file or
todir attribute.
keyfile
Location of the file holding the private key.
Yes, if you are using key based
authentication.
passphrase
Passphrase for your private key.
No, defaults to an empty string.
Examples
Run a command on a remote machine using password authentication
<sshexec host="somehost"
username="dude"
password="yo"
command="touch somefile"/>
Run a command on a remote machine using key authentication
<sshexec host="somehost"
username="dude"
keyfile="${user.home}/.ssh/id_dsa"
passphrase="yo its a secret"
command="touch somefile"/>
Run a command on a remote machine using key authentication with no
passphrase
<sshexec host="somehost"
username="dude"
keyfile="${user.home}/.ssh/id_dsa"
command="touch somefile"/>
Security Note: Hard c
cvs commit: ant/src/main/org/apache/tools/ant/util FileUtils.java
bodewig 2003/03/13 08:14:51
Modified:src/main/org/apache/tools/ant/taskdefs Ear.java War.java
src/main/org/apache/tools/ant/util FileUtils.java
Log:
This is supposed to fix bug 17871.
The patch looks innocent enough for me to merge it into the 1.5 branch
right away, but I cannot really verify it fixes the bug because of my
persistent (and self-imposed) lack of a Windows system.
Revision ChangesPath
1.23 +3 -1 ant/src/main/org/apache/tools/ant/taskdefs/Ear.java
Index: Ear.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Ear.java 7 Mar 2003 11:23:01 - 1.22
+++ Ear.java 13 Mar 2003 16:14:51 - 1.23
@@ -58,6 +58,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.ZipFileSet;
+import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.zip.ZipOutputStream;
/**
@@ -74,6 +75,7 @@
private File deploymentDescriptor;
private boolean descriptorAdded;
+private static final FileUtils fu = FileUtils.newFileUtils();
/**
* Create an Ear task.
@@ -146,7 +148,7 @@
// element.
if (vPath.equalsIgnoreCase("META-INF/application.xml")) {
if (deploymentDescriptor == null
-|| !deploymentDescriptor.equals(file)
+|| !fu.fileNameEquals(deploymentDescriptor, file)
|| descriptorAdded) {
log("Warning: selected " + archiveType
+ " files include a META-INF/application.xml which will"
1.32 +4 -1 ant/src/main/org/apache/tools/ant/taskdefs/War.java
Index: War.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- War.java 7 Mar 2003 11:23:02 - 1.31
+++ War.java 13 Mar 2003 16:14:51 - 1.32
@@ -59,6 +59,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.ZipFileSet;
+import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.zip.ZipOutputStream;
@@ -91,6 +92,8 @@
*/
private boolean descriptorAdded;
+private static final FileUtils fu = FileUtils.newFileUtils();
+
public War() {
super();
archiveType = "war";
@@ -180,7 +183,7 @@
// by the "webxml" attribute and in a element.
if (vPath.equalsIgnoreCase("WEB-INF/web.xml")) {
if (deploymentDescriptor == null
-|| !deploymentDescriptor.equals(file)
+|| !fu.fileNameEquals(deploymentDescriptor, file)
|| descriptorAdded) {
log("Warning: selected " + archiveType
+ " files include a WEB-INF/web.xml which will be
ignored "
1.38 +16 -2 ant/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- FileUtils.java7 Mar 2003 11:23:08 - 1.37
+++ FileUtils.java13 Mar 2003 16:14:51 - 1.38
@@ -734,7 +734,7 @@
return false;
}
-if (f1.equals(f2)) {
+if (fileNameEquals(f1, f2)) {
// same filename => true
return true;
}
@@ -999,6 +999,20 @@
// relative path
}
return path;
+}
+
+/**
+ * Compares two filenames.
+ *
+ * Unlike java.io.File#equals this method will try to compare
+ * the absolute paths and "normalize" the filenames
+ * before comparing them.
+ *
+ * @since Ant 1.5.2
+ */
+public boolean fileNameEquals(File f1, File f2) {
+return normalize(f1.getAbsolutePath())
+.equals(normalize(f2.getAbsolutePath()));
}
}
cvs commit: ant/src/main/org/apache/tools/ant/util FileUtils.java
bodewig 2003/03/13 08:15:47
Modified:src/main/org/apache/tools/ant/util FileUtils.java
Log:
misleading @since tag
Revision ChangesPath
1.39 +1 -1 ant/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- FileUtils.java13 Mar 2003 16:14:51 - 1.38
+++ FileUtils.java13 Mar 2003 16:15:47 - 1.39
@@ -1008,7 +1008,7 @@
* the absolute paths and "normalize" the filenames
* before comparing them.
*
- * @since Ant 1.5.2
+ * @since Ant 1.5.3
*/
public boolean fileNameEquals(File f1, File f2) {
return normalize(f1.getAbsolutePath())
cvs commit: ant/src/main/org/apache/tools/ant/util FileUtils.java
bodewig 2003/03/13 08:22:14
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Ear.java War.java
src/main/org/apache/tools/ant/util Tag: ANT_15_BRANCH
FileUtils.java
Log:
Merge fix for bug 17871 from HEAD
Revision ChangesPath
No revision
No revision
1.15.2.5 +4 -2 ant/src/main/org/apache/tools/ant/taskdefs/Ear.java
Index: Ear.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -r1.15.2.4 -r1.15.2.5
--- Ear.java 19 Feb 2003 08:13:59 - 1.15.2.4
+++ Ear.java 13 Mar 2003 16:22:13 - 1.15.2.5
@@ -56,6 +56,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.ZipFileSet;
+import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.zip.ZipOutputStream;
import java.io.File;
@@ -64,7 +65,7 @@
/**
* Creates a EAR archive. Based on WAR task
*
- * @author mailto:[EMAIL PROTECTED]">Stefan Bodewig
+ * @author Stefan Bodewig
* @author mailto:[EMAIL PROTECTED]">Les Hughes
*
* @since Ant 1.4
@@ -75,6 +76,7 @@
private File deploymentDescriptor;
private boolean descriptorAdded;
+private static final FileUtils fu = FileUtils.newFileUtils();
/**
* Create an Ear task.
@@ -147,7 +149,7 @@
// element.
if (vPath.equalsIgnoreCase("META-INF/application.xml")) {
if (deploymentDescriptor == null
-|| !deploymentDescriptor.equals(file)
+|| !fu.fileNameEquals(deploymentDescriptor, file)
|| descriptorAdded) {
log("Warning: selected " + archiveType
+ " files include a META-INF/application.xml which will"
1.23.2.6 +5 -2 ant/src/main/org/apache/tools/ant/taskdefs/War.java
Index: War.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
retrieving revision 1.23.2.5
retrieving revision 1.23.2.6
diff -u -r1.23.2.5 -r1.23.2.6
--- War.java 19 Feb 2003 08:13:59 - 1.23.2.5
+++ War.java 13 Mar 2003 16:22:13 - 1.23.2.6
@@ -57,6 +57,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.ZipFileSet;
+import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.zip.ZipOutputStream;
import java.io.File;
@@ -73,7 +74,7 @@
* attributes of zipfilesets in a Zip or Jar task.)
* The extended zipfileset element from the zip task (with attributes
prefix, fullpath, and src) is available in the War
task.
*
- * @author mailto:[EMAIL PROTECTED]">Stefan Bodewig
+ * @author Stefan Bodewig
*
* @since Ant 1.2
*
@@ -92,6 +93,8 @@
*/
private boolean descriptorAdded;
+private static final FileUtils fu = FileUtils.newFileUtils();
+
public War() {
super();
archiveType = "war";
@@ -181,7 +184,7 @@
// by the "webxml" attribute and in a element.
if (vPath.equalsIgnoreCase("WEB-INF/web.xml")) {
if (deploymentDescriptor == null
-|| !deploymentDescriptor.equals(file)
+|| !fu.fileNameEquals(deploymentDescriptor, file)
|| descriptorAdded) {
log("Warning: selected " + archiveType
+ " files include a WEB-INF/web.xml which will be
ignored "
No revision
No revision
1.25.2.8 +16 -1 ant/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.25.2.7
retrieving revision 1.25.2.8
diff -u -r1.25.2.7 -r1.25.2.8
--- FileUtils.java10 Feb 2003 14:25:24 - 1.25.2.7
+++ FileUtils.java13 Mar 2003 16:22:14 - 1.25.2.8
@@ -878,5 +878,20 @@
return p;
}
}
+
+/**
+ * Compares two filenames.
+ *
+ * Unlike java.io.File#equals this method will try to compare
+ * the absolute paths and "normalize" the filenames
+ * before comparing them.
+ *
+ * @since Ant 1.5.3
+ */
+public boolean fileNameEquals(File f1, File f2) {
+return normalize(f1.getAbsolutePath())
+.equals(normalize(f2.getAbsolutePath()));
+}
+
}
cvs commit: ant/xdocs bindownload.xml
bodewig 2003/03/14 01:23:59 Modified:docs bindownload.html xdocsbindownload.xml Log: Henri doesn't have the time to upload every new Ant RPM anymore, better stop providing them from our site, then. Revision ChangesPath 1.19 +2 -1 ant/docs/bindownload.html Index: bindownload.html === RCS file: /home/cvs/ant/docs/bindownload.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bindownload.html 3 Mar 2003 15:24:12 - 1.18 +++ bindownload.html 14 Mar 2003 09:23:58 - 1.19 @@ -218,7 +218,8 @@ than 100 characters and have been created using GNU tar extensions. Thus they must be untarred with a GNU compatible version of tar. -In addition we provide RPMs created and maintained by the http://www.jpackage.org";>JPackage team, see the distribution directory. +In addition the http://www.jpackage.org";>JPackage +project provides RPMs at their own distribution site. If you do not see the file you need in the links below, please see the http://www.apache.org/dist/ant/";>master distribution directory or, preferably, its mirror. 1.11 +2 -3 ant/xdocs/bindownload.xml Index: bindownload.xml === RCS file: /home/cvs/ant/xdocs/bindownload.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bindownload.xml 3 Mar 2003 15:24:14 - 1.10 +++ bindownload.xml 14 Mar 2003 09:23:59 - 1.11 @@ -23,9 +23,8 @@ Thus they must be untarred with a GNU compatible version of tar. -In addition we provide RPMs created and maintained by the http://www.jpackage.org";>JPackage team, see the distribution directory. +In addition the http://www.jpackage.org";>JPackage +project provides RPMs at their own distribution site. If you do not see the file you need in the links below, please see the http://www.apache.org/dist/ant/";>master distribution
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs SQLExec.java
bodewig 2003/03/14 01:24:41 Modified:src/main/org/apache/tools/ant/taskdefs SQLExec.java Log: Remove reference to Jakarta Revision ChangesPath 1.51 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java Index: SQLExec.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- SQLExec.java 13 Mar 2003 21:41:11 - 1.50 +++ SQLExec.java 14 Mar 2003 09:24:41 - 1.51 @@ -23,7 +23,7 @@ *Alternately, this acknowlegement may appear in the software itself, *if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Ant", and "Apache Software + * 4. The names "Ant" and "Apache Software *Foundation" must not be used to endorse or promote products derived *from this software without prior written permission. For written *permission, please contact [EMAIL PROTECTED]
cvs commit: ant/xdocs external.xml
bodewig 2003/03/14 04:03:51 Modified:docs external.html xdocsexternal.xml Log: Add pointer to XInclude. Submitted by: Mario Jeckle Revision ChangesPath 1.95 +57 -0 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- external.html 11 Mar 2003 13:51:33 - 1.94 +++ external.html 14 Mar 2003 12:03:51 - 1.95 @@ -2706,6 +2706,63 @@ + + + + +XInclude + + + +http://www.jeckle.de/freeStuff/xia/index.html";>XInclude is + a W3C standardized vocabulary for including arbitrary text or XML + documents in other XML documents. This task perfomes the inclusion + using an existing XInclude implementation + + + + Compatibility: + + + Ant 1.5.2 + + + + + URL: + + + + http://www.jeckle.de/freeStuff/xia/index.html";>http://www.jeckle.de/freeStuff/xia/index.html + + + + + + Contact: + + + mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + + + + + License: + + + Lesser GNU Public License + + + + 1.72 +29 -1 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- external.xml 11 Mar 2003 13:51:33 - 1.71 +++ external.xml 14 Mar 2003 12:03:51 - 1.72 @@ -1277,8 +1277,36 @@ - + +http://www.jeckle.de/freeStuff/xia/index.html";>XInclude is + a W3C standardized vocabulary for including arbitrary text or XML + documents in other XML documents. This task perfomes the inclusion + using an existing XInclude implementation + + +Compatibility: +Ant 1.5.2 + + +URL: + + http://www.jeckle.de/freeStuff/xia/index.html";>http://www.jeckle.de/freeStuff/xia/index.html + + + +Contact: +mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + + +License: +Lesser GNU Public License + + + + + + XmlTask provides a simple means to modify XML documents without having to learn XSLT. A simple path reference to an XML node specifies the node you want to change, and how you
cvs commit: ant/src/testcases/org/apache/tools/ant/filters EscapeUnicodeTest.java
bodewig 2003/03/14 05:45:17 Modified:docs/manual/CoreTypes filterchain.html src/etc/testcases/filters build.xml src/main/org/apache/tools/ant/types FilterChain.java Added: src/etc/testcases/filters/expected escapeunicode.test src/etc/testcases/filters/input escapeunicode.test src/main/org/apache/tools/ant/filters EscapeUnicode.java src/testcases/org/apache/tools/ant/filters EscapeUnicodeTest.java Log: New filter that translates non-ASCII characters to \u1234 escapes. addresses PR: 17506 Revision ChangesPath 1.5 +29 -1 ant/docs/manual/CoreTypes/filterchain.html Index: filterchain.html === RCS file: /home/cvs/ant/docs/manual/CoreTypes/filterchain.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- filterchain.html 3 Sep 2002 15:24:08 - 1.4 +++ filterchain.html 14 Mar 2003 13:45:16 - 1.5 @@ -89,6 +89,7 @@ nested elements. FilterReader ClassConstants +EscapeUnicode ExpandProperties HeadFilter LineContains @@ -162,6 +163,33 @@ </loadproperties> +EscapeUnicode + +This filter converts its input by changing all non US-ASCII characters +into their equivalent unicode escape backslash u plus 4 digits. + +since Ant 1.6 + +Example: + +This loads the basic constants defined in a Java class as Ant properties. + +<loadproperties srcfile="non_ascii_property.properties"> + <filterchain> +<filterreader classname="org.apache.tools.ant.filters.EscapeUnicode"/> + </filterchain> +</loadproperties> + + +Convenience method: + +<loadproperties srcfile="non_ascii_property.properties"> + <filterchain> +<escapeunicode/> + </filterchain> +</loadproperties> + + ExpandProperties If the data contains data that represents Ant @@ -629,5 +657,5 @@ -Copyright © 2002 Apache Software Foundation. All rights +Copyright © 2002-2003 Apache Software Foundation. All rights Reserved. 1.2 +21 -2 ant/src/etc/testcases/filters/build.xml Index: build.xml === RCS file: /home/cvs/ant/src/etc/testcases/filters/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.xml 30 Sep 2002 12:08:20 - 1.1 +++ build.xml 14 Mar 2003 13:45:16 - 1.2 @@ -6,18 +6,37 @@ - + - + + + + + + + + + + + + + + + + + + 1.1 ant/src/etc/testcases/filters/expected/escapeunicode.test Index: escapeunicode.test === #hebrew shalom olam (hello world) text.hebrew=\u05e9\u05dc\u05d5\u05dd \u05e2\u05d5\u05dc\u05dd #goethe gingko biloba text.german.1=Sp\u00fcrst du nicht an meinen Liedern, text.german.2=Da\u00df ich eins und doppelt bin ? # Francois Villon Ballade des Pendus text.french=Fr\u00e8res humains qui apr\u00e8s nous vivez # Usual IT example text.basic.latin=Hello World 1.1 ant/src/etc/testcases/filters/input/escapeunicode.test Index: escapeunicode.test === #hebrew shalom olam (hello world) text.hebrew=שלום עולם #goethe gingko biloba text.german.1=Spürst du nicht an meinen Liedern, text.german.2=Daß ich eins und doppelt bin ? # Francois Villon Ballade des Pendus text.french=Frères humains qui après nous vivez # Usual IT example text.basic.latin=Hello World 1.1 ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java Index: EscapeUnicode.java === /* * The Apache Software License, Version 1.1 * * Copyright (c) 2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * *
cvs commit: ant/docs/manual/OptionalTasks scp.html sshexec.html
bodewig 2003/03/14 07:10:27 Modified:.WHATSNEW docs/manual/OptionalTasks scp.html sshexec.html Log: A little housekeeping Revision ChangesPath 1.364 +2 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- WHATSNEW 13 Mar 2003 09:01:53 - 1.363 +++ WHATSNEW 14 Mar 2003 15:10:23 - 1.364 @@ -161,6 +161,8 @@ command over SSH. They require jsch, a BSD licensed SSH library that can be found at http://www.jcraft.com/jsch/index.html +* New filterreader . + Changes from Ant 1.5.2 to Ant 1.5.3 === 1.5 +3 -0 ant/docs/manual/OptionalTasks/scp.html Index: scp.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scp.html 11 Mar 2003 14:31:53 - 1.4 +++ scp.html 14 Mar 2003 15:10:26 - 1.5 @@ -9,6 +9,9 @@ SCP Description + +since Ant 1.6 + Copies a file or FileSet to or from a remote machine running SSH daemon. FileSet only works for copying files from the local machine to a remote machine. 1.2 +3 -0 ant/docs/manual/OptionalTasks/sshexec.html Index: sshexec.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/sshexec.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sshexec.html 13 Mar 2003 09:01:54 - 1.1 +++ sshexec.html 14 Mar 2003 15:10:27 - 1.2 @@ -9,6 +9,9 @@ SSHEXEC Description + +since Ant 1.6 + Runs a command on a remote machine running SSH daemon.
cvs commit: ant WHATSNEW
bodewig 2003/03/14 07:24:10 Modified:.WHATSNEW Log: 17871 is fixed Revision ChangesPath 1.365 +4 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- WHATSNEW 14 Mar 2003 15:10:23 - 1.364 +++ WHATSNEW 14 Mar 2003 15:24:10 - 1.365 @@ -188,6 +188,10 @@ specify any nested <(zip)fileset>s and the manifest had changed. Bugzilla Report 17780. +* If you used a value starting with \ on Windows for the appxml + attribute of or the webxml attribute of , it would be + ignored. Bugzilla Report 17871. + Changes from Ant 1.5.1 to Ant 1.5.2 =
cvs commit: ant WHATSNEW
bodewig 2003/03/14 07:32:21 Modified:.Tag: ANT_15_BRANCH WHATSNEW Log: 17871 is fixed Revision ChangesPath No revision No revision 1.263.2.126 +4 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.263.2.125 retrieving revision 1.263.2.126 diff -u -r1.263.2.125 -r1.263.2.126 --- WHATSNEW 12 Mar 2003 11:41:05 - 1.263.2.125 +++ WHATSNEW 14 Mar 2003 15:32:21 - 1.263.2.126 @@ -23,6 +23,10 @@ specify any nested <(zip)fileset>s and the manifest had changed. Bugzilla Report 17780. +* If you used a value starting with \ on Windows for the appxml + attribute of or the webxml attribute of , it would be + ignored. Bugzilla Report 17871. + Changes from Ant 1.5.1 to Ant 1.5.2 ===
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/condition Os.java
bodewig 2003/03/14 08:01:04 Modified:.WHATSNEW docs/manual/CoreTasks chmod.html conditions.html pathconvert.html src/main/org/apache/tools/ant/taskdefs Chmod.java Execute.java PathConvert.java src/main/org/apache/tools/ant/taskdefs/condition Os.java Log: Add support for HP's NonStop Server (formerly known by several names, including Tandem). Submitted by: Mirko Zeibig Revision ChangesPath 1.366 +3 -1 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- WHATSNEW 14 Mar 2003 15:24:10 - 1.365 +++ WHATSNEW 14 Mar 2003 16:01:03 - 1.366 @@ -1,4 +1,4 @@ -Changes from Ant 1.5.2 to current CVS version +Changes from Ant 1.5.3 to current CVS version = Changes that could break older environments: @@ -162,6 +162,8 @@ can be found at http://www.jcraft.com/jsch/index.html * New filterreader . + +* Support for HP's NonStop (Tandem) OS has been added. Changes from Ant 1.5.2 to Ant 1.5.3 === 1.10 +3 -2 ant/docs/manual/CoreTasks/chmod.html Index: chmod.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/chmod.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- chmod.html22 Jun 2002 23:38:27 - 1.9 +++ chmod.html14 Mar 2003 16:01:03 - 1.10 @@ -9,7 +9,8 @@ Chmod Description -Changes the permissions of a file or all files inside specified directories. Right now it has effect only under Unix. +Changes the permissions of a file or all files inside specified +directories. Right now it has effect only under Unix or NonStop (Tandem). The permissions are also UNIX style, like the argument for the chmod command. See the section on directory based tasks, on how the inclusion/exclusion of files works, and how to @@ -102,7 +103,7 @@ group on a UNIX system. In addition all files belonging to a FileSet with id other.shared.sources get the same permissions. -Copyright © 2000-2002 Apache Software Foundation. All rights +Copyright © 2000-2003 Apache Software Foundation. All rights Reserved. 1.17 +2 -1 ant/docs/manual/CoreTasks/conditions.html Index: conditions.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/conditions.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- conditions.html 1 Dec 2002 01:30:08 - 1.16 +++ conditions.html 14 Mar 2003 16:01:03 - 1.17 @@ -92,6 +92,7 @@ unix (for all Unix and Unix-like operating systems) netware (for Novell NetWare) os/2 (for OS/2) + tandem (for HP's NonStop - formerly Tandem) win9x for Microsoft Windows 95 and 98 z/os for z/OS and OS/390 os/400 for OS/400 @@ -315,7 +316,7 @@ -Copyright © 2001-2002 Apache Software +Copyright © 2001-2003 Apache Software Foundation. All rights Reserved. 1.11 +2 -2 ant/docs/manual/CoreTasks/pathconvert.html Index: pathconvert.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/pathconvert.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pathconvert.html 9 Jul 2002 21:05:51 - 1.10 +++ pathconvert.html 14 Mar 2003 16:01:03 - 1.11 @@ -31,7 +31,7 @@ targetos The target architecture. Must be one of 'unix', 'windows', -'netware' or 'os/2'. +'netware', 'tandem' or 'os/2'. This is a shorthand mechanism for specifying both pathsep and dirsep according to the specified target architecture. @@ -176,7 +176,7 @@ -Copyright © 2001-2002 Apache Software Foundation. +Copyright © 2001-2003 Apache Software Foundation. All rights Reserved. 1.36 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java Index: Chmod.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Chmod.java7 Mar 2003 11:23:00 - 1.35 +++ Chmod.java14 Mar 2003 16:01:03 - 1.36 @@ -1,7 +1,7 @@ /* * The Apache Software Li
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2003/03/18 05:13:34
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Zip.java
Log:
JDK 1.1
Revision ChangesPath
No revision
No revision
1.78.2.14 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.78.2.13
retrieving revision 1.78.2.14
diff -u -r1.78.2.13 -r1.78.2.14
--- Zip.java 12 Mar 2003 11:29:10 - 1.78.2.13
+++ Zip.java 18 Mar 2003 13:13:34 - 1.78.2.14
@@ -823,11 +823,11 @@
Vector resources = new Vector();
String[] directories = rs.getIncludedDirectories();
for (int j = 0; j < directories.length; j++) {
-resources.add(rs.getResource(directories[j]));
+resources.addElement(rs.getResource(directories[j]));
}
String[] files = rs.getIncludedFiles();
for (int j = 0; j < files.length; j++) {
-resources.add(rs.getResource(files[j]));
+resources.addElement(rs.getResource(files[j]));
}
result[i] = new Resource[resources.size()];
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2003/03/18 05:15:48
Modified:src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
JDK 1.1
Revision ChangesPath
1.102 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Zip.java 12 Mar 2003 11:23:27 - 1.101
+++ Zip.java 18 Mar 2003 13:15:48 - 1.102
@@ -844,11 +844,11 @@
Vector resources = new Vector();
String[] directories = rs.getIncludedDirectories();
for (int j = 0; j < directories.length; j++) {
-resources.add(rs.getResource(directories[j]));
+resources.addElement(rs.getResource(directories[j]));
}
String[] files = rs.getIncludedFiles();
for (int j = 0; j < files.length; j++) {
-resources.add(rs.getResource(files[j]));
+resources.addElement(rs.getResource(files[j]));
}
result[i] = new Resource[resources.size()];
cvs commit: ant/xdocs external.xml projects.xml
bodewig 2003/03/18 08:11:37 Modified:docs external.html projects.html xdocsexternal.xml projects.xml Log: Pointers Submitted by:Jan.Materne Markus Gebhard Steve Neal Revision ChangesPath 1.96 +105 -1ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- external.html 14 Mar 2003 12:03:51 - 1.95 +++ external.html 18 Mar 2003 16:11:36 - 1.96 @@ -1102,7 +1102,7 @@ -There are three different sets of tasks to help build http://java.sun.com/j2me/";>Java 2 Platform, Micro +There are four different sets of tasks to help build http://java.sun.com/j2me/";>Java 2 Platform, Micro Edition (J2ME) applications. This set supports CLDC and the K Virtual Machine (KVM): @@ -1239,6 +1239,56 @@ +Antic is a freely available task for packaging J2ME + applications. It produces both the Jar and Jad files in a + single step. This allows *all* entries to be correclty set in + the jad file, including the size of the jar file that is + produced. This task has been used and tested extensively with + Sun's Wireless Toolkit and also the Nokia SDK and + emulators. + + + + Compatibility: + + + Ant 1.5 + + + + + URL: + + + http://www.smartkey.co.uk/antic.html";>www.smartkey.co.uk + + + + + + Contact: + + + mailto:[EMAIL PROTECTED]">smartkey.co.uk + + + + + License: + + + GNU General Public License + + + @@ -1422,6 +1472,60 @@ BSD-like License + + + + + + + + +Java2Html + + + +Uses the Java2Html library for converting java source files +or snipplets to syntax highlighted html, rtf, tex and +others. + + + + Compatibility: + + + Ant 1.5 and later + + + + + URL: + + + http://www.java2html.de";>http://www.java2html.de + + + + + Contact: + + + mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + + + + + License: + + + GNU General Public License 1.30 +56 -0 ant/docs/projects.html Index: projects.html === RCS file: /home/cvs/ant/docs/projects.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- projects.html 18 Feb 2003 10:40:26 - 1.29 +++ projects.html 18 Mar 2003 16:11:37 - 1.30 @@ -213,6 +213,62 @@ developers, if you encounter any problems with them, please use the contact information. + + + + +AndroMDA + + + +AndroMDA is a code generator tool that follows the Model +Driven Architecture (MDA) paradigm. It takes a UML model from +a CASE-tool and generates classes and deployable components +(J2EE or other) specific for your application +architecture. + + + + Compatibility: + + + 1.4.1 and above + + +
cvs commit: ant/xdocs external.xml
bodewig 2003/03/18 08:15:38 Modified:docs external.html xdocsexternal.xml Log: untabify Revision ChangesPath 1.97 +8 -8 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- external.html 18 Mar 2003 16:11:36 - 1.96 +++ external.html 18 Mar 2003 16:15:37 - 1.97 @@ -1240,12 +1240,12 @@ Antic is a freely available task for packaging J2ME - applications. It produces both the Jar and Jad files in a - single step. This allows *all* entries to be correclty set in - the jad file, including the size of the jar file that is - produced. This task has been used and tested extensively with - Sun's Wireless Toolkit and also the Nokia SDK and - emulators. +applications. It produces both the Jar and Jad files in a +single step. This allows *all* entries to be correclty set in +the jad file, including the size of the jar file that is +produced. This task has been used and tested extensively with +Sun's Wireless Toolkit and also the Nokia SDK and +emulators. Jacson is a configurable and plugable tool (much like Ant - itself) to create filters for text (line based) files without - programming. +itself) to create filters for text (line based) files without +programming. - Antic is a freely available task for packaging J2ME - applications. It produces both the Jar and Jad files in a - single step. This allows *all* entries to be correclty set in - the jad file, including the size of the jar file that is - produced. This task has been used and tested extensively with - Sun's Wireless Toolkit and also the Nokia SDK and - emulators. +Antic is a freely available task for packaging J2ME +applications. It produces both the Jar and Jad files in a +single step. This allows *all* entries to be correclty set in +the jad file, including the size of the jar file that is +produced. This task has been used and tested extensively with +Sun's Wireless Toolkit and also the Nokia SDK and +emulators. - + Compatibility: Ant 1.5 @@ -551,15 +551,15 @@ License: GNU General Public License - + - Jacson is a configurable and plugable tool (much like Ant - itself) to create filters for text (line based) files without - programming. +Jacson is a configurable and plugable tool (much like Ant +itself) to create filters for text (line based) files without +programming.
cvs commit: ant/xdocs external.xml
bodewig 2003/03/18 08:34:55 Modified:docs external.html xdocsexternal.xml Log: Greebo has moved Revision ChangesPath 1.98 +2 -2 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- external.html 18 Mar 2003 16:15:37 - 1.97 +++ external.html 18 Mar 2003 16:34:55 - 1.98 @@ -909,7 +909,7 @@ - http://www.discore.com/oz/new/index.htm";>http://www.discore.com/oz/new/index.htm + http://greebo.sourceforge.net/";>http://greebo.sourceforge.net/ @@ -919,7 +919,7 @@ - mailto:[EMAIL PROTECTED]">Ozben Evren + http://sourceforge.net/mail/?group_id=73733";>project mailing lists 1.75 +2 -2 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- external.xml 18 Mar 2003 16:15:38 - 1.74 +++ external.xml 18 Mar 2003 16:34:55 - 1.75 @@ -362,11 +362,11 @@ URL: -http://www.discore.com/oz/new/index.htm";>http://www.discore.com/oz/new/index.htm +http://greebo.sourceforge.net/";>http://greebo.sourceforge.net/ Contact: -mailto:[EMAIL PROTECTED]">Ozben Evren +http://sourceforge.net/mail/?group_id=73733";>project mailing lists License:
cvs commit: ant/docs/manual conceptstypeslist.html
bodewig 2003/03/19 00:18:50 Modified:docs/manual Tag: ANT_15_BRANCH conceptstypeslist.html Log: provide links to extension(set). PR: 14974 Submitted by: Jesse Glick Revision ChangesPath No revision No revision 1.5.2.3 +2 -0 ant/docs/manual/conceptstypeslist.html Index: conceptstypeslist.html === RCS file: /home/cvs/ant/docs/manual/conceptstypeslist.html,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -r1.5.2.2 -r1.5.2.3 --- conceptstypeslist.html20 Jun 2002 16:45:00 - 1.5.2.2 +++ conceptstypeslist.html19 Mar 2003 08:18:50 - 1.5.2.3 @@ -30,5 +30,7 @@ Optional Types Class Fileset +Extension Package +Set of Extension Packages
cvs commit: ant/docs/manual conceptstypeslist.html
bodewig 2003/03/19 00:20:13 Modified:docs/manual conceptstypeslist.html Log: Merge fix for bug 14974 from 1.5 branch Revision ChangesPath 1.8 +2 -0 ant/docs/manual/conceptstypeslist.html Index: conceptstypeslist.html === RCS file: /home/cvs/ant/docs/manual/conceptstypeslist.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- conceptstypeslist.html22 Jun 2002 23:38:27 - 1.7 +++ conceptstypeslist.html19 Mar 2003 08:20:13 - 1.8 @@ -30,5 +30,7 @@ Optional Types Class Fileset +Extension Package +Set of Extension Packages
cvs commit: ant/docs/manual/CoreTasks javac.html
bodewig 2003/03/19 00:26:20 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH javac.html Log: includeJavaRuntime defaults to false. PR: 18053 Revision ChangesPath No revision No revision 1.33.2.11 +1 -1 ant/docs/manual/CoreTasks/javac.html Index: javac.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/javac.html,v retrieving revision 1.33.2.10 retrieving revision 1.33.2.11 diff -u -r1.33.2.10 -r1.33.2.11 --- javac.html12 Feb 2003 14:27:40 - 1.33.2.10 +++ javac.html19 Mar 2003 08:26:20 - 1.33.2.11 @@ -262,7 +262,7 @@ includeJavaRuntime Whether to include the default run-time libraries from the executing VM in the classpath; - defaults to yes. + defaults to no. No
cvs commit: ant/docs/manual/CoreTasks javac.html
bodewig 2003/03/19 00:26:58 Modified:docs/manual/CoreTasks javac.html Log: Merge fix for bug 18053 from 1.5 branch Revision ChangesPath 1.39 +1 -1 ant/docs/manual/CoreTasks/javac.html Index: javac.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/javac.html,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- javac.html12 Feb 2003 14:26:30 - 1.38 +++ javac.html19 Mar 2003 08:26:58 - 1.39 @@ -262,7 +262,7 @@ includeJavaRuntime Whether to include the default run-time libraries from the executing VM in the classpath; - defaults to yes. + defaults to no. No
cvs commit: ant/docs/manual/CoreTasks copy.html
bodewig 2003/03/19 00:32:06 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH copy.html Log: Merge caution from HEAD Revision ChangesPath No revision No revision 1.10.2.6 +10 -1 ant/docs/manual/CoreTasks/copy.html Index: copy.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v retrieving revision 1.10.2.5 retrieving revision 1.10.2.6 diff -u -r1.10.2.5 -r1.10.2.6 --- copy.html 4 Sep 2002 11:21:12 - 1.10.2.5 +++ copy.html 19 Mar 2003 08:32:06 - 1.10.2.6 @@ -17,6 +17,15 @@ set of files to copy. To use a <fileset>, the todir attribute must be set. + + +Note: If you employ filters in your copy operation, you should +limit the copy to text files. Binary files will be corrupted by the copy operation. +This applies whether the filters are implicitly defined by the +filter task or explicitly provided to the copy +operation as filtersets + + Parameters @@ -186,7 +195,7 @@ the file in the destination directory before you copy it. -Copyright © 2000-2002 Apache Software Foundation. +Copyright © 2000-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/docs/manual/CoreTasks move.html
bodewig 2003/03/19 00:33:10 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH move.html Log: Document some inherited attributes. PR: 17952 Revision ChangesPath No revision No revision 1.6.2.7 +21 -1 ant/docs/manual/CoreTasks/move.html Index: move.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/move.html,v retrieving revision 1.6.2.6 retrieving revision 1.6.2.7 diff -u -r1.6.2.6 -r1.6.2.7 --- move.html 4 Sep 2002 11:21:12 - 1.6.2.6 +++ move.html 19 Mar 2003 08:33:10 - 1.6.2.7 @@ -30,6 +30,13 @@ at least one nested fileset element +preservelastmodified +Give the moved files the same last modified + time as the original source files. + (Note: Ignored on Java 1.1) +No; defaults to false. + + tofile the file to move to With the file attribute, @@ -69,6 +76,19 @@ Defaults to "yes". No + +failonerror + Log a warning message, but do not stop the build, + when the file to move does not exist. + Only meaningful when moving a single file. + + No; defaults to true. + + +verbose + Log the files that are being moved. + No; defaults to false. + Parameters specified as nested elements mapper @@ -121,7 +141,7 @@ </move> -Copyright © 2000-2002 Apache Software Foundation. All rights +Copyright © 2000-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/docs/manual/CoreTasks move.html
bodewig 2003/03/19 00:33:28 Modified:docs/manual/CoreTasks move.html Log: Merge fix for bug 17952 from 1.5 branch Revision ChangesPath 1.10 +21 -1 ant/docs/manual/CoreTasks/move.html Index: move.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/move.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- move.html 4 Sep 2002 11:05:16 - 1.9 +++ move.html 19 Mar 2003 08:33:27 - 1.10 @@ -30,6 +30,13 @@ at least one nested fileset element +preservelastmodified +Give the moved files the same last modified + time as the original source files. + (Note: Ignored on Java 1.1) +No; defaults to false. + + tofile the file to move to With the file attribute, @@ -69,6 +76,19 @@ Defaults to "yes". No + +failonerror + Log a warning message, but do not stop the build, + when the file to move does not exist. + Only meaningful when moving a single file. + + No; defaults to true. + + +verbose + Log the files that are being moved. + No; defaults to false. + Parameters specified as nested elements mapper @@ -121,7 +141,7 @@ </move> -Copyright © 2000-2002 Apache Software Foundation. All rights +Copyright © 2000-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/docs/manual/OptionalTasks replaceregexp.html
bodewig 2003/03/19 00:41:29
Modified:docs/manual/OptionalTasks Tag: ANT_15_BRANCH
replaceregexp.html
Log:
Add another example to replaceregexp's docs.
PR: 17660
Submitted by: Jan Matèrne
Revision ChangesPath
No revision
No revision
1.8.2.4 +21 -1 ant/docs/manual/OptionalTasks/replaceregexp.html
Index: replaceregexp.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/replaceregexp.html,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- replaceregexp.html4 Sep 2002 11:21:14 - 1.8.2.3
+++ replaceregexp.html19 Mar 2003 08:41:29 - 1.8.2.4
@@ -123,8 +123,28 @@
with "NewProperty" in a properties file, preserving the existing
value, in all files ending in .properties in the current
directory
+
+<replaceregexp match="\s+" replace=" " flags="g" byline="true">
+<fileset dir="${html.dir}" includes="**/*.html" />
+</replaceregexp>
+
+replaces all whitespaces (blanks, tabs, etc) by one blank remaining the
+line separator. So with input
+
+
+
+<html><body>
+<<TAB>><h1>T E S T </h1> <<TAB>>
+<<TAB>> </body></html>
+
+would converted to
+
+<html> <body>
+ <h1> T E S T </h1> </body></html>
+
+
-Copyright © 2001-2002 Apache Software Foundation. All
rights
+Copyright © 2001-2003 Apache Software Foundation. All
rights
Reserved.
cvs commit: ant/docs/manual/OptionalTasks replaceregexp.html
bodewig 2003/03/19 00:42:14
Modified:docs/manual/OptionalTasks replaceregexp.html
Log:
Merge fix for bug 17660 from 1.5 branch
Revision ChangesPath
1.14 +20 -0 ant/docs/manual/OptionalTasks/replaceregexp.html
Index: replaceregexp.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/replaceregexp.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- replaceregexp.html31 Jan 2003 12:15:51 - 1.13
+++ replaceregexp.html19 Mar 2003 08:42:14 - 1.14
@@ -128,6 +128,26 @@
with "NewProperty" in a properties file, preserving the existing
value, in all files ending in .properties in the current
directory
+
+<replaceregexp match="\s+" replace=" " flags="g" byline="true">
+<fileset dir="${html.dir}" includes="**/*.html" />
+</replaceregexp>
+
+replaces all whitespaces (blanks, tabs, etc) by one blank remaining the
+line separator. So with input
+
+
+
+<html><body>
+<<TAB>><h1>T E S T </h1> <<TAB>>
+<<TAB>> </body></html>
+
+would converted to
+
+<html> <body>
+ <h1> T E S T </h1> </body></html>
+
+
Copyright © 2001-2003 Apache Software Foundation. All
rights
Reserved.
cvs commit: ant/docs/manual/CoreTasks loadproperties.html
bodewig 2003/03/19 00:53:08 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH loadproperties.html Log: Point to prefixlines filter. PR: 17293 Revision ChangesPath No revision No revision 1.1.2.3 +7 -3 ant/docs/manual/CoreTasks/loadproperties.html Index: loadproperties.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/loadproperties.html,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- loadproperties.html 23 Sep 2002 11:08:43 - 1.1.2.2 +++ loadproperties.html 19 Mar 2003 08:53:08 - 1.1.2.3 @@ -13,9 +13,13 @@ to <property file="..."/> except that it supports nested <filterchain> elements and it cannot be specified outside a target. - +If you want to simulate property's +prefix attribute, please use prefixlines +filter. + Parameters @@ -41,7 +45,7 @@ <loadproperties srcFile="file.properties"> <filterchain> <linecontains> - <contains value="import."/> + <contains value="import."/> </linecontains> </filterchain> </loadproperties> @@ -51,7 +55,7 @@ Ant properties. -Copyright © 2002 Apache Software Foundation. All rights +Copyright © 2002-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/docs/manual/CoreTasks loadproperties.html
bodewig 2003/03/19 00:54:08 Modified:docs/manual/CoreTasks loadproperties.html Log: Merge fix for bug 17293 from 1.5 branch Revision ChangesPath 1.5 +7 -3 ant/docs/manual/CoreTasks/loadproperties.html Index: loadproperties.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/loadproperties.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- loadproperties.html 23 Sep 2002 11:06:53 - 1.4 +++ loadproperties.html 19 Mar 2003 08:54:08 - 1.5 @@ -13,9 +13,13 @@ to <property file="..."/> except that it supports nested <filterchain> elements and it cannot be specified outside a target. - +If you want to simulate property's +prefix attribute, please use prefixlines +filter. + Parameters @@ -46,7 +50,7 @@ <loadproperties srcFile="file.properties"> <filterchain> <linecontains> - <contains value="import."/> + <contains value="import."/> </linecontains> </filterchain> </loadproperties> @@ -56,7 +60,7 @@ Ant properties. -Copyright © 2002 Apache Software Foundation. All rights +Copyright © 2002-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/docs/manual/CoreTasks genkey.html
bodewig 2003/03/19 01:11:11
Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH genkey.html
Log:
Complete sentence with knowledge gained by raeding the source.
PR: 14697
Revision ChangesPath
No revision
No revision
1.6.2.2 +7 -2 ant/docs/manual/CoreTasks/genkey.html
Index: genkey.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/genkey.html,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- genkey.html 3 May 2002 09:40:28 - 1.6.2.1
+++ genkey.html 19 Mar 2003 09:11:10 - 1.6.2.2
@@ -76,7 +76,12 @@
-Alternatively you can specify the distinguished name by creating a
sub-element named dname and populating it with param elements that have a name
and a value. When using the subelement it is automatically encoded properly and
, are replace
+Alternatively you can specify the distinguished name by creating a
+sub-element named dname and populating it with param elements that
+have a name and a value. When using the subelement it is automatically
+encoded properly and commas (",") are replaced
+with "\,".
+
The following two examples are identical:
Examples
@@ -96,7 +101,7 @@
</genkey>
-Copyright © 2000-2001 Apache Software Foundation. All
rights
+Copyright © 2000-2001,2003 Apache Software
Foundation. All rights
Reserved.
cvs commit: ant/docs/manual/CoreTasks genkey.html
bodewig 2003/03/19 01:11:57
Modified:docs/manual/CoreTasks genkey.html
Log:
Merge fix for bug 14697 from 1.5 branch
Revision ChangesPath
1.8 +7 -2 ant/docs/manual/CoreTasks/genkey.html
Index: genkey.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/genkey.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- genkey.html 1 Jun 2002 12:26:33 - 1.7
+++ genkey.html 19 Mar 2003 09:11:57 - 1.8
@@ -76,7 +76,12 @@
-Alternatively you can specify the distinguished name by creating a
sub-element named dname and populating it with param elements that have a name
and a value. When using the subelement it is automatically encoded properly and
, are replace
+Alternatively you can specify the distinguished name by creating a
+sub-element named dname and populating it with param elements that
+have a name and a value. When using the subelement it is automatically
+encoded properly and commas (",") are replaced
+with "\,".
+
The following two examples are identical:
Examples
@@ -96,7 +101,7 @@
</genkey>
-Copyright © 2000-2001 Apache Software Foundation. All
rights
+Copyright © 2000-2001,2003 Apache Software
Foundation. All rights
Reserved.
cvs commit: ant/docs/manual using.html
bodewig 2003/03/19 01:19:51 Modified:docs/manual Tag: ANT_15_BRANCH using.html Log: Add an extra note about properties values being irrelevant for if/unless. PR: 14521 Revision ChangesPath No revision No revision 1.21.2.4 +8 -8 ant/docs/manual/using.html Index: using.html === RCS file: /home/cvs/ant/docs/manual/using.html,v retrieving revision 1.21.2.3 retrieving revision 1.21.2.4 diff -u -r1.21.2.3 -r1.21.2.4 --- using.html9 Aug 2002 08:39:47 - 1.21.2.3 +++ using.html19 Mar 2003 09:19:50 - 1.21.2.4 @@ -85,7 +85,9 @@ (java version, OS, command-line property defines, etc.). To make a target sense this property, you should add the if (or unless) attribute with the name of the property that the target -should react to. For example: +should react to. Note: Ant will only check whether +the property has been set, the value doesn't matter. A property set +to the empty string is still an existing property. For example: <target name="build-module-A" if="module-A-present"/> <target name="build-own-fake-module-A" unless="module-A-present"/> @@ -147,18 +149,16 @@ -A target name can be any alphanumeric string valid in the encoding of the XML +A target name can be any alphanumeric string valid in the encoding of the XML file. The empty string "" is in this set, as is comma "," and space " ". Please avoid using these, as they will not be supported in future Ant versions because of all the confusion they cause. IDE support of unusual target names, -or any target name containing spaces, varies with the IDE. +or any target name containing spaces, varies with the IDE. - - -Targets beginning with a hyphen such as "-restart" +Targets beginning with a hyphen such as "-restart" are valid, and can be used -to name targets that should not be called directly from the command line. +to name targets that should not be called directly from the command line. Tasks A task is a piece of code that can be executed. @@ -529,7 +529,7 @@ structures as well. -Copyright © 2000-2002 Apache Software Foundation. All rights +Copyright © 2000-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/docs/manual using.html
bodewig 2003/03/19 01:20:53 Modified:docs/manual using.html Log: Merge fix for bug 14521 from 1.5 branch Revision ChangesPath 1.28 +8 -8 ant/docs/manual/using.html Index: using.html === RCS file: /home/cvs/ant/docs/manual/using.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- using.html4 Oct 2002 11:59:48 - 1.27 +++ using.html19 Mar 2003 09:20:53 - 1.28 @@ -85,7 +85,9 @@ (java version, OS, command-line property defines, etc.). To make a target sense this property, you should add the if (or unless) attribute with the name of the property that the target -should react to. For example: +should react to. Note: Ant will only check whether +the property has been set, the value doesn't matter. A property set +to the empty string is still an existing property. For example: <target name="build-module-A" if="module-A-present"/> <target name="build-own-fake-module-A" unless="module-A-present"/> @@ -147,18 +149,16 @@ -A target name can be any alphanumeric string valid in the encoding of the XML +A target name can be any alphanumeric string valid in the encoding of the XML file. The empty string "" is in this set, as is comma "," and space " ". Please avoid using these, as they will not be supported in future Ant versions because of all the confusion they cause. IDE support of unusual target names, -or any target name containing spaces, varies with the IDE. +or any target name containing spaces, varies with the IDE. - - -Targets beginning with a hyphen such as "-restart" +Targets beginning with a hyphen such as "-restart" are valid, and can be used -to name targets that should not be called directly from the command line. +to name targets that should not be called directly from the command line. Tasks A task is a piece of code that can be executed. @@ -535,7 +535,7 @@ structures as well. -Copyright © 2000-2002 Apache Software Foundation. All rights +Copyright © 2000-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/src/testcases/org/apache/tools/tar - New directory
bodewig 2003/03/19 02:01:44 ant/src/testcases/org/apache/tools/tar - New directory
cvs commit: ant/src/testcases/org/apache/tools/tar TarEntryTest.java
bodewig 2003/03/19 02:06:41
Added: src/testcases/org/apache/tools/tar TarEntryTest.java
Log:
Demonstrate bug 18105
Revision ChangesPath
1.1 ant/src/testcases/org/apache/tools/tar/TarEntryTest.java
Index: TarEntryTest.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* "This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/)."
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "Ant" and "Apache Software
*Foundation" must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
*nor may "Apache" appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.tools.tar;
import junit.framework.TestCase;
/**
* @since Ant 1.6
*/
public class TarEntryTest extends TestCase {
public TarEntryTest(String name) {
super(name);
}
/**
* demonstrates bug 18105 on OSes with os.name shorter than 7.
*/
public void testFileConstructor() {
new TarEntry(new java.io.File("/foo"));
}
}
cvs commit: ant/src/main/org/apache/tools/tar TarEntry.java
bodewig 2003/03/19 02:09:38
Modified:.WHATSNEW
src/main/org/apache/tools/tar TarEntry.java
Log:
TarEntry's File-constructor didn't work for many OSes.
PR: 18105
At the same time, make the OS check Locale independent.
Revision ChangesPath
1.367 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- WHATSNEW 14 Mar 2003 16:01:03 - 1.366
+++ WHATSNEW 19 Mar 2003 10:09:38 - 1.367
@@ -66,6 +66,10 @@
* output and error streams can now be redirected independently
to either a property or a file (or both)
+* TarEntry's File-arg constructor would fail with a
+ StringIndexOutOfBoundsException on all OSes where os.name is shorter
+ than seven characters. Bugzilla Report 18105.
+
Other changes:
--
* The filesetmanifest attribute of has been reenabled.
1.15 +5 -6 ant/src/main/org/apache/tools/tar/TarEntry.java
Index: TarEntry.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarEntry.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TarEntry.java 10 Feb 2003 14:14:42 - 1.14
+++ TarEntry.java 19 Mar 2003 10:09:38 - 1.15
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,7 @@
import java.io.File;
import java.util.Date;
+import java.util.Locale;
/**
* This class represents an entry in a Tar archive. It consists
@@ -200,16 +201,14 @@
this.file = file;
String name = file.getPath();
-String osname = System.getProperty("os.name");
+String osname = System.getProperty("os.name").toLowerCase(Locale.US);
if (osname != null) {
// Strip off drive letters!
// REVIEW Would a better check be "(File.separator == '\')"?
-String win32Prefix = "Windows";
-String prefix = osname.substring(0, win32Prefix.length());
-if (prefix.equalsIgnoreCase(win32Prefix)) {
+if (osname.startsWith("windows")) {
if (name.length() > 2) {
char ch1 = name.charAt(0);
char ch2 = name.charAt(1);
@@ -220,7 +219,7 @@
name = name.substring(2);
}
}
-} else if (osname.toLowerCase().indexOf("netware") > -1) {
+} else if (osname.indexOf("netware") > -1) {
int colon = name.indexOf(':');
if (colon != -1) {
name = name.substring(colon + 1);
cvs commit: ant/docs/manual/OptionalTasks cab.html
bodewig 2003/03/19 02:39:42
Modified:docs/manual/OptionalTasks Tag: ANT_15_BRANCH cab.html
Log:
Document that supports nested filesets
Revision ChangesPath
No revision
No revision
1.5.2.3 +8 -1 ant/docs/manual/OptionalTasks/cab.html
Index: cab.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/cab.html,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- cab.html 20 Jun 2002 09:40:31 - 1.5.2.2
+++ cab.html 19 Mar 2003 10:39:42 - 1.5.2.3
@@ -91,6 +91,13 @@
No
+Parameters specified as nested elements
+fileset
+
+The cab task supports any number of nested <fileset>
+elements to specify the files to be included in the archive.
+
Examples
<cab cabfile="${dist}/manual.cab"
@@ -122,7 +129,7 @@
excluded. Output from the cabarc tool is displayed in the build
output.
-Copyright © 2000-2002 Apache Software Foundation. All
rights
+Copyright © 2000-2003 Apache Software Foundation. All
rights
Reserved.
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional Cab.java
bodewig 2003/03/19 02:48:01
Modified:.WHATSNEW
docs/manual/OptionalTasks cab.html
src/main/org/apache/tools/ant/taskdefs/optional Cab.java
Log:
Make 's basedir optional.
PR: 18046
Revision ChangesPath
1.368 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- WHATSNEW 19 Mar 2003 10:09:38 - 1.367
+++ WHATSNEW 19 Mar 2003 10:48:01 - 1.368
@@ -169,6 +169,9 @@
* Support for HP's NonStop (Tandem) OS has been added.
+* 's basedir attribute is now optional if you specify nested
+ filesets. Bugzilla Report 18046.
+
Changes from Ant 1.5.2 to Ant 1.5.3
===
1.8 +22 -2 ant/docs/manual/OptionalTasks/cab.html
Index: cab.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/cab.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cab.html 22 Jun 2002 23:38:28 - 1.7
+++ cab.html 19 Mar 2003 10:48:01 - 1.8
@@ -39,7 +39,7 @@
basedir
the directory to start archiving files from.
-Yes
+No
verbose
@@ -91,6 +91,13 @@
No
+Parameters specified as nested elements
+fileset
+
+The cab task supports any number of nested <fileset>
+elements to specify the files to be included in the archive.
+
Examples
<cab cabfile="${dist}/manual.cab"
@@ -121,8 +128,21 @@
directory api are archived, and files with the name todo.html are
excluded. Output from the cabarc tool is displayed in the build
output.
+
+
+<cab cabfile="${dist}/manual.cab"
+ verbose="yes">
+ <fileset
+ dir="htdocs/manual"
+ includes="api/**/*.html"
+ excludes="**/todo.html"
+ />
+</cab>
+
+is equivalent to the example above.
+
-Copyright © 2000-2002 Apache Software Foundation. All
rights
+Copyright © 2000-2003 Apache Software Foundation. All
rights
Reserved.
1.25 +20 -15
ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
Index: Cab.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Cab.java 10 Feb 2003 14:13:45 - 1.24
+++ Cab.java 19 Mar 2003 10:48:01 - 1.25
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -143,14 +143,17 @@
* for side-effects to me...
*/
protected void checkConfiguration() throws BuildException {
-if (baseDir == null) {
-throw new BuildException("basedir attribute must be set!",
getLocation());
+if (baseDir == null && filesets.size() == 0) {
+throw new BuildException("basedir attribute or at least one "
+ + "nested filest is required!",
+ getLocation());
}
-if (!baseDir.exists()) {
+if (baseDir != null && !baseDir.exists()) {
throw new BuildException("basedir does not exist!",
getLocation());
}
if (cabFile == null) {
-throw new BuildException("cabfile attribute must be set!" ,
getLocation());
+throw new BuildException("cabfile attribute must be set!",
+ getLocation());
}
}
@@ -175,7 +178,7 @@
boolean upToDate = true;
for (int i = 0; i < files.size() && upToDate; i++) {
String file = files.elementAt(i).toString();
-if (new File(baseDir, file).lastModified() >
+if (fileUtils.resolveFile(baseDir, file).lastModified() >
cabFile.lastModified()) {
upToDate = false;
}
@@ -220,16 +223,16 @@
protected Vector getFileList() throws BuildException {
Vector files = new Vector();
-if (filesets.size() == 0) {
+if (baseDir != null) {
// get files from old methods - includes and nested include
appendFiles
cvs commit: ant/xdocs projects.xml
bodewig 2003/03/20 00:00:14 Modified:docs projects.html xdocsprojects.xml Log: AntDoc has moved Revision ChangesPath 1.31 +2 -2 ant/docs/projects.html Index: projects.html === RCS file: /home/cvs/ant/docs/projects.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- projects.html 18 Mar 2003 16:11:37 - 1.30 +++ projects.html 20 Mar 2003 08:00:11 - 1.31 @@ -357,7 +357,7 @@ - http://mapage.noos.fr/antdoc";>http://mapage.noos.fr/antdoc + http://antdoc.free.fr/";>http://antdoc.free.fr/ @@ -377,7 +377,7 @@ - At the moment, no license is being attached to the tool. + The Apache Software License 1.9 +2 -2 ant/xdocs/projects.xml Index: projects.xml === RCS file: /home/cvs/ant/xdocs/projects.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- projects.xml 18 Mar 2003 16:11:37 - 1.8 +++ projects.xml 20 Mar 2003 08:00:14 - 1.9 @@ -88,7 +88,7 @@ URL: -http://mapage.noos.fr/antdoc";>http://mapage.noos.fr/antdoc +http://antdoc.free.fr/";>http://antdoc.free.fr/ Contact: @@ -96,7 +96,7 @@ License: -At the moment, no license is being attached to the tool. +The Apache Software License
cvs commit: ant/xdocs external.xml projects.xml
bodewig 2003/03/20 00:09:32 Modified:docs Tag: ANT_15_BRANCH external.html projects.html xdocsTag: ANT_15_BRANCH external.xml projects.xml Log: sync with HEAD Revision ChangesPath No revision No revision 1.48.2.31 +167 -6ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.48.2.30 retrieving revision 1.48.2.31 diff -u -r1.48.2.30 -r1.48.2.31 --- external.html 7 Mar 2003 12:36:18 - 1.48.2.30 +++ external.html 20 Mar 2003 08:09:27 - 1.48.2.31 @@ -410,7 +410,7 @@ - Ant 1.2 to 1.4.1 + Ant 1.4.1 and later @@ -909,7 +909,7 @@ - http://www.discore.com/oz/new/index.htm";>http://www.discore.com/oz/new/index.htm + http://greebo.sourceforge.net/";>http://greebo.sourceforge.net/ @@ -919,7 +919,7 @@ - mailto:[EMAIL PROTECTED]">Ozben Evren + http://sourceforge.net/mail/?group_id=73733";>project mailing lists @@ -1102,7 +1102,7 @@ -There are three different sets of tasks to help build http://java.sun.com/j2me/";>Java 2 Platform, Micro +There are four different sets of tasks to help build http://java.sun.com/j2me/";>Java 2 Platform, Micro Edition (J2ME) applications. This set supports CLDC and the K Virtual Machine (KVM): @@ -1239,6 +1239,56 @@ +Antic is a freely available task for packaging J2ME +applications. It produces both the Jar and Jad files in a +single step. This allows *all* entries to be correclty set in +the jad file, including the size of the jar file that is +produced. This task has been used and tested extensively with +Sun's Wireless Toolkit and also the Nokia SDK and +emulators. + + + + Compatibility: + + + Ant 1.5 + + + + + URL: + + + http://www.smartkey.co.uk/antic.html";>www.smartkey.co.uk + + + + + + Contact: + + + mailto:[EMAIL PROTECTED]">smartkey.co.uk + + + + + License: + + + GNU General Public License + + + @@ -1249,8 +1299,8 @@ Jacson is a configurable and plugable tool (much like Ant - itself) to create filters for text (line based) files without - programming. +itself) to create filters for text (line based) files without +programming. + + + + +Java2Html + + + +Uses the Java2Html library for converting java source files +or snipplets to syntax highlighted html, rtf, tex and +others. + + + + Compatibility: + + + Ant 1.5 and later + + + + + URL: + + + http://www.java2html.de";>http://www.java2html.de + + + + + Contact: + + + mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + + + + + License: + + + GNU General Public License + + + +
cvs commit: ant/docs/manual developlist.html
bodewig 2003/03/20 00:33:23 Modified:docs/manual developlist.html Log: Typo Revision ChangesPath 1.4 +1 -1 ant/docs/manual/developlist.html Index: developlist.html === RCS file: /home/cvs/ant/docs/manual/developlist.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- developlist.html 1 Jun 2002 12:26:32 - 1.3 +++ developlist.html 20 Mar 2003 08:33:21 - 1.4 @@ -13,7 +13,7 @@ Developing with Ant Writing Your Own Task -Tasks Designed for Extensiton +Tasks Designed for Extension Build Events Source-code Integration InputHandler
cvs commit: ant/docs/manual developlist.html
bodewig 2003/03/20 00:33:37 Modified:docs/manual Tag: ANT_15_BRANCH developlist.html Log: Typo Revision ChangesPath No revision No revision 1.2.2.3 +1 -1 ant/docs/manual/developlist.html Index: developlist.html === RCS file: /home/cvs/ant/docs/manual/developlist.html,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- developlist.html 30 May 2002 23:59:55 - 1.2.2.2 +++ developlist.html 20 Mar 2003 08:33:37 - 1.2.2.3 @@ -13,7 +13,7 @@ Developing with Ant Writing Your Own Task -Tasks Designed for Extensiton +Tasks Designed for Extension Build Events Source-code Integration InputHandler
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jvc.java
bodewig 2003/03/20 01:10:54
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Jvc.java
Log:
Don't include Sun's runtime when compiling with jvc unless the user
explicitly asks for it.
PR: 18055
Revision ChangesPath
1.369 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- WHATSNEW 19 Mar 2003 10:48:01 - 1.368
+++ WHATSNEW 20 Mar 2003 09:10:53 - 1.369
@@ -201,6 +201,9 @@
attribute of or the webxml attribute of , it would be
ignored. Bugzilla Report 17871.
+* Ant will no longer implicitly add Sun's rt.jar in when you
+ use jvc and don't specify a bootclasspath. Bugzilla Report 18055.
+
Changes from Ant 1.5.1 to Ant 1.5.2
=
1.14 +1 -10
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
Index: Jvc.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Jvc.java 7 Mar 2003 11:23:04 - 1.13
+++ Jvc.java 20 Mar 2003 09:10:54 - 1.14
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -93,15 +93,6 @@
// so we'll emulate it for compatibility and convenience.
classpath.addExtdirs(extdirs);
-if (bootclasspath == null || bootclasspath.size() == 0) {
-// no bootclasspath, therefore, get one from the java runtime
-includeJavaRuntime = true;
-} else {
-// there is a bootclasspath stated. By default, the
-// includeJavaRuntime is false. If the user has stated a
-// bootclasspath and said to include the java runtime, it's on
-// their head!
-}
classpath.append(getCompileClasspath());
// jvc has no option for source-path so we
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jvc.java
bodewig 2003/03/20 01:11:28
Modified:.Tag: ANT_15_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_15_BRANCH Jvc.java
Log:
Merge fix for 18055 from HEAD
Revision ChangesPath
No revision
No revision
1.263.2.127 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.263.2.126
retrieving revision 1.263.2.127
diff -u -r1.263.2.126 -r1.263.2.127
--- WHATSNEW 14 Mar 2003 15:32:21 - 1.263.2.126
+++ WHATSNEW 20 Mar 2003 09:11:27 - 1.263.2.127
@@ -27,6 +27,9 @@
attribute of or the webxml attribute of , it would be
ignored. Bugzilla Report 17871.
+* Ant will no longer implicitly add Sun's rt.jar in when you
+ use jvc and don't specify a bootclasspath. Bugzilla Report 18055.
+
Changes from Ant 1.5.1 to Ant 1.5.2
===
No revision
No revision
1.9.2.3 +2 -11
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
Index: Jvc.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- Jvc.java 10 Feb 2003 14:24:54 - 1.9.2.2
+++ Jvc.java 20 Mar 2003 09:11:28 - 1.9.2.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
* @author James Davidson mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]
* @author Robin Green
* mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]
- * @author mailto:[EMAIL PROTECTED]">Stefan Bodewig
+ * @author Stefan Bodewig
* @author mailto:[EMAIL PROTECTED]">J D Glanville
* @since Ant 1.3
*/
@@ -93,15 +93,6 @@
// so we'll emulate it for compatibility and convenience.
classpath.addExtdirs(extdirs);
-if (bootclasspath == null || bootclasspath.size() == 0) {
-// no bootclasspath, therefore, get one from the java runtime
-includeJavaRuntime = true;
-} else {
-// there is a bootclasspath stated. By default, the
-// includeJavaRuntime is false. If the user has stated a
-// bootclasspath and said to include the java runtime, it's on
-// their head!
-}
classpath.append(getCompileClasspath());
// jvc has no option for source-path so we
cvs commit: ant/docs/manual/CoreTasks pathconvert.html
bodewig 2003/03/20 01:14:29 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH pathconvert.html Log: Typo Revision ChangesPath No revision No revision 1.9.2.2 +1 -1 ant/docs/manual/CoreTasks/pathconvert.html Index: pathconvert.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/pathconvert.html,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -r1.9.2.1 -r1.9.2.2 --- pathconvert.html 27 Jun 2002 18:35:48 - 1.9.2.1 +++ pathconvert.html 20 Mar 2003 09:14:28 - 1.9.2.2 @@ -67,7 +67,7 @@ What to convert, given as a reference to a <path>, <fileset>, -<dirset>, or <fileset> +<dirset>, or <filelist> defined elsewhere No; if omitted, a nested <path> element must be supplied.
cvs commit: ant/docs/manual/CoreTasks pathconvert.html
bodewig 2003/03/20 01:14:41 Modified:docs/manual/CoreTasks pathconvert.html Log: Typo Revision ChangesPath 1.12 +1 -1 ant/docs/manual/CoreTasks/pathconvert.html Index: pathconvert.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/pathconvert.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pathconvert.html 14 Mar 2003 16:01:03 - 1.11 +++ pathconvert.html 20 Mar 2003 09:14:41 - 1.12 @@ -67,7 +67,7 @@ What to convert, given as a reference to a <path>, <fileset>, -<dirset>, or <fileset> +<dirset>, or <filelist> defined elsewhere No; if omitted, a nested <path> element must be supplied.
cvs commit: ant KEYS
bodewig 2003/03/21 07:49:14 Modified:.KEYS Log: Some cleanups, changes and additions: (1) I *do* use my gpg key for mail (and welcome others to do the same). (2) import instructions for GnuPG. (3) I've met some nice people at the CeBIT 2003. (4) One copy of Magesh's key should be enough ;-) Revision ChangesPath 1.11 +95 -98ant/KEYS Index: KEYS === RCS file: /home/cvs/ant/KEYS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- KEYS 12 Mar 2003 17:14:35 - 1.10 +++ KEYS 21 Mar 2003 15:49:14 - 1.11 @@ -1,8 +1,7 @@ This file contains the PGP keys of various developers. -Please don't use them for email unless you have to. Their main -purpose is code signing. Users: pgp < KEYS + gpg --import KEYS Developers: pgp -kxa and append it to this file. (pgpk -ll && pgpk -xa ) >> this file. @@ -34,14 +33,17 @@ -END PGP PUBLIC KEY BLOCK- - - pub 1024D/51898504 2001-05-29 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 51898504 2001-05-29 Conor MacNeill <[EMAIL PROTECTED]> +sig 5F6B8B72 2002-01-11 Stefan Bodewig <[EMAIL PROTECTED]> uidConor MacNeill <[EMAIL PROTECTED]> +sig 3 51898504 2001-05-29 Conor MacNeill <[EMAIL PROTECTED]> +sig 5F6B8B72 2002-01-11 Stefan Bodewig <[EMAIL PROTECTED]> +sub 1024g/D1ECBA5D 2001-05-29 +sig 51898504 2001-05-29 Conor MacNeill <[EMAIL PROTECTED]> -BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v1.0.6 (MingW32) -Comment: For info see http://www.gnupg.org +Version: GnuPG v1.2.0 (GNU/Linux) mQGiBDsTqygRBACiZckNdclTlQFonLaIKBFGhMy0KKByw0x8XA4iwdbCXuF6xNIc HIFHajJ74AHchQ4d8xtomBy6b8yvFgWVeaZensvn69BlLeqGdyeJRzfPt6TgRnzZ @@ -54,10 +56,13 @@ yJ5CLqYda64h/UA2kmmR2dfopmvDogYEMz/HU5voozxe7BEI7bQhQ29ub3IgTWFj TmVpbGwgPGNvbm9yQGFwYWNoZS5vcmc+iFcEExECABcFAjsTqygFCwcKAwQDFQMC AxYCAQIXgAAKCRCBBGRPUYmFBDgIAKCZztXqKhK6kXOnoGy7opCNmWU0lwCgsPDa -4m+ruW3ch0rfbqtR75S52R+0LUNvbm9yIE1hY05laWxsIDxjb25vckBjb3J0ZXhl -YnVzaW5lc3MuY29tLmF1PohXBBMRAgAXBQI7E6xMBQsHCgMEAxUDAgMWAgECF4AA -CgkQgQRkT1GJhQTY0ACgmZmKheHzjPJs5hybpyvnvEiPYqYAn2+ryxdtz8XyOMEx -GRmHNlhG7svsuQENBDsTqy0QBACfsCxJ6iCtgX8zjlVtMsMfDqu72x5sYatWKn8c +4m+ruW3ch0rfbqtR75S52R+IRgQQEQIABgUCPD6eTgAKCRCiEVrhX2uLcqCcAKCr +1Wylqju9YjBi5Twej9ze69JFBQCeOaMgo6yjnkcV3PnVInLlaMwPr5q0LUNvbm9y +IE1hY05laWxsIDxjb25vckBjb3J0ZXhlYnVzaW5lc3MuY29tLmF1PohXBBMRAgAX +BQI7E6xMBQsHCgMEAxUDAgMWAgECF4AACgkQgQRkT1GJhQTY0ACgmZmKheHzjPJs +5hybpyvnvEiPYqYAn2+ryxdtz8XyOMExGRmHNlhG7svsiEYEEBECAAYFAjw+nlUA +CgkQohFa4V9ri3JYYACg1WN+NCptfKVP1mbrIa+0ajztsiIAnAn+m70iwRRFZCxr +jcULoY5SjyTLuQENBDsTqy0QBACfsCxJ6iCtgX8zjlVtMsMfDqu72x5sYatWKn8c u+4Oj5mi0x6azZIhwCa+K3ihLVOyG1mCRnzztGTIxWYRhq3TESIVOfgm+NgLGrmA XUTFyCT+21TExLCpuVZKmUHsWXLxDtfQ1diPeQpiQ8+Fvb/4jLGFjFIrQ2VjtFQn kumkSwADBgP9H0bF4hdMuVEcSJ9imxSoJshcOOA3Vd2+YiCTZhBygWM49wY5jNos @@ -65,19 +70,31 @@ nTCZ4TuB5CtzrKTlWLmPCPpFsGqe4KjMeKg/mqGqjPKl97xgStK9N9GIRgQYEQIA BgUCOxOrLQAKCRCBBGRPUYmFBMM6AJsF3FFyZGEmbt9aGG1W/u0oI9mcLgCfQyJ+ aalbspazea4J9zgi59SSwOM= -=Icm2 +=cBdR -END PGP PUBLIC KEY BLOCK- -pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -sig 3 5F6B8B72 2003-03-07 Stefan Bodewig <[EMAIL PROTECTED]> -uid Stefan Bodewig <[EMAIL PROTECTED]> -sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> sig 51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 F88341D9 2003-03-17 Lars Eilebrecht <[EMAIL PROTECTED]> +sig 3 2261D073 2003-03-17 Astrid Keáler (Kess) <[EMAIL PROTECTED]> +sig 21D0A71B 2003-03-17 Dirk-Willem van Gulik <[EMAIL PROTECTED]> +sig 75A67692 2003-03-18 Erik Abele <[EMAIL PROTECTED]> uidStefan Bodewig <[EMAIL PROTECTED]> -sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> sig 51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 F88341D9 2003-03-17 Lars Eilebrecht <[EMAIL PROTECTED]> +sig 3 2261D073 2003-03-17 Astrid Keáler (Kess) <[EMAIL PROTECTED]> +sig 21D0A71B 2003-03-17 Dirk-Willem van Gulik <[EMAIL PROTECTED]> +sig 75A67692 2003-03-18 Erik Abele <[EMAIL PROTECTED]> +uidStefan Bodewig <[EMAIL
cvs commit: ant KEYS
bodewig 2003/03/21 07:49:32 Modified:.Tag: ANT_15_BRANCH KEYS Log: sync Revision ChangesPath No revision No revision 1.6.2.5 +94 -98ant/KEYS Index: KEYS === RCS file: /home/cvs/ant/KEYS,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -u -r1.6.2.4 -r1.6.2.5 --- KEYS 12 Mar 2003 17:15:03 - 1.6.2.4 +++ KEYS 21 Mar 2003 15:49:32 - 1.6.2.5 @@ -1,8 +1,7 @@ This file contains the PGP keys of various developers. -Please don't use them for email unless you have to. Their main -purpose is code signing. Users: pgp < KEYS + gpg --import KEYS Developers: pgp -kxa and append it to this file. (pgpk -ll && pgpk -xa ) >> this file. @@ -34,14 +33,17 @@ -END PGP PUBLIC KEY BLOCK- - - pub 1024D/51898504 2001-05-29 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 51898504 2001-05-29 Conor MacNeill <[EMAIL PROTECTED]> +sig 5F6B8B72 2002-01-11 Stefan Bodewig <[EMAIL PROTECTED]> uidConor MacNeill <[EMAIL PROTECTED]> +sig 3 51898504 2001-05-29 Conor MacNeill <[EMAIL PROTECTED]> +sig 5F6B8B72 2002-01-11 Stefan Bodewig <[EMAIL PROTECTED]> +sub 1024g/D1ECBA5D 2001-05-29 +sig 51898504 2001-05-29 Conor MacNeill <[EMAIL PROTECTED]> -BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v1.0.6 (MingW32) -Comment: For info see http://www.gnupg.org +Version: GnuPG v1.2.0 (GNU/Linux) mQGiBDsTqygRBACiZckNdclTlQFonLaIKBFGhMy0KKByw0x8XA4iwdbCXuF6xNIc HIFHajJ74AHchQ4d8xtomBy6b8yvFgWVeaZensvn69BlLeqGdyeJRzfPt6TgRnzZ @@ -54,10 +56,13 @@ yJ5CLqYda64h/UA2kmmR2dfopmvDogYEMz/HU5voozxe7BEI7bQhQ29ub3IgTWFj TmVpbGwgPGNvbm9yQGFwYWNoZS5vcmc+iFcEExECABcFAjsTqygFCwcKAwQDFQMC AxYCAQIXgAAKCRCBBGRPUYmFBDgIAKCZztXqKhK6kXOnoGy7opCNmWU0lwCgsPDa -4m+ruW3ch0rfbqtR75S52R+0LUNvbm9yIE1hY05laWxsIDxjb25vckBjb3J0ZXhl -YnVzaW5lc3MuY29tLmF1PohXBBMRAgAXBQI7E6xMBQsHCgMEAxUDAgMWAgECF4AA -CgkQgQRkT1GJhQTY0ACgmZmKheHzjPJs5hybpyvnvEiPYqYAn2+ryxdtz8XyOMEx -GRmHNlhG7svsuQENBDsTqy0QBACfsCxJ6iCtgX8zjlVtMsMfDqu72x5sYatWKn8c +4m+ruW3ch0rfbqtR75S52R+IRgQQEQIABgUCPD6eTgAKCRCiEVrhX2uLcqCcAKCr +1Wylqju9YjBi5Twej9ze69JFBQCeOaMgo6yjnkcV3PnVInLlaMwPr5q0LUNvbm9y +IE1hY05laWxsIDxjb25vckBjb3J0ZXhlYnVzaW5lc3MuY29tLmF1PohXBBMRAgAX +BQI7E6xMBQsHCgMEAxUDAgMWAgECF4AACgkQgQRkT1GJhQTY0ACgmZmKheHzjPJs +5hybpyvnvEiPYqYAn2+ryxdtz8XyOMExGRmHNlhG7svsiEYEEBECAAYFAjw+nlUA +CgkQohFa4V9ri3JYYACg1WN+NCptfKVP1mbrIa+0ajztsiIAnAn+m70iwRRFZCxr +jcULoY5SjyTLuQENBDsTqy0QBACfsCxJ6iCtgX8zjlVtMsMfDqu72x5sYatWKn8c u+4Oj5mi0x6azZIhwCa+K3ihLVOyG1mCRnzztGTIxWYRhq3TESIVOfgm+NgLGrmA XUTFyCT+21TExLCpuVZKmUHsWXLxDtfQ1diPeQpiQ8+Fvb/4jLGFjFIrQ2VjtFQn kumkSwADBgP9H0bF4hdMuVEcSJ9imxSoJshcOOA3Vd2+YiCTZhBygWM49wY5jNos @@ -65,19 +70,31 @@ nTCZ4TuB5CtzrKTlWLmPCPpFsGqe4KjMeKg/mqGqjPKl97xgStK9N9GIRgQYEQIA BgUCOxOrLQAKCRCBBGRPUYmFBMM6AJsF3FFyZGEmbt9aGG1W/u0oI9mcLgCfQyJ+ aalbspazea4J9zgi59SSwOM= -=Icm2 +=cBdR -END PGP PUBLIC KEY BLOCK- -pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> -sig 3 5F6B8B72 2003-03-07 Stefan Bodewig <[EMAIL PROTECTED]> -uidStefan Bodewig <[EMAIL PROTECTED]> -sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> sig 51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 F88341D9 2003-03-17 Lars Eilebrecht <[EMAIL PROTECTED]> +sig 3 2261D073 2003-03-17 Astrid Keáler (Kess) <[EMAIL PROTECTED]> +sig 21D0A71B 2003-03-17 Dirk-Willem van Gulik <[EMAIL PROTECTED]> +sig 75A67692 2003-03-18 Erik Abele <[EMAIL PROTECTED]> uidStefan Bodewig <[EMAIL PROTECTED]> -sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <[EMAIL PROTECTED]> sig 51898504 2002-01-11 Conor MacNeill <[EMAIL PROTECTED]> +sig 3 F88341D9 2003-03-17 Lars Eilebrecht <[EMAIL PROTECTED]> +sig 3 2261D073 2003-03-17 Astrid Keáler (Kess) <[EMAIL PROTECTED]> +sig 21D0A71B 2003-03-17 Dirk-Willem van Gulik <[EMAIL PROTECTED]> +sig 75A67692 2003-03-18 Erik Abele <[EMAIL PROTECTED]> +uidStefan Bodewig <[EMAIL PROTECTED]> +sig 3 5F6B8B72 2003-03-07 Stefan Bodewig <[EMAIL PROTECTED]> +sig 3 F88341D9 2003-03-17 Lars Eilebrecht <[EMAIL
cvs commit: ant/docs/manual/CoreTasks manifest.html
bodewig 2003/03/24 00:05:43 Modified:docs/manual/CoreTasks manifest.html Log: 2003 Revision ChangesPath 1.8 +1 -1 ant/docs/manual/CoreTasks/manifest.html Index: manifest.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/manifest.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- manifest.html 22 Mar 2003 09:39:46 - 1.7 +++ manifest.html 24 Mar 2003 08:05:42 - 1.8 @@ -133,7 +133,7 @@ -Copyright © 2001-2002 Apache Software Foundation. All rights +Copyright © 2001-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/docs/manual/CoreTasks manifest.html
bodewig 2003/03/24 00:06:47 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH manifest.html Log: 2003 Revision ChangesPath No revision No revision 1.4.2.4 +1 -1 ant/docs/manual/CoreTasks/manifest.html Index: manifest.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/manifest.html,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- manifest.html 22 Mar 2003 09:53:15 - 1.4.2.3 +++ manifest.html 24 Mar 2003 08:06:47 - 1.4.2.4 @@ -133,7 +133,7 @@ -Copyright © 2001-2002 Apache Software Foundation. All rights +Copyright © 2001-2003 Apache Software Foundation. All rights Reserved.
cvs commit: ant/xdocs external.xml
bodewig 2003/03/25 00:43:34 Modified:docs external.html xdocsexternal.xml Log: Add pointers to JBuilder 8 Enterprise and Gel. Submitted by: Paul King Revision ChangesPath 1.99 +108 -0ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- external.html 18 Mar 2003 16:34:55 - 1.98 +++ external.html 25 Mar 2003 08:43:34 - 1.99 @@ -3361,6 +3361,59 @@ + + + + +Gel + + + +Java IDE with support for Ant. Gel is a native Microsoft +Windows software. + + + + Compatibility: + + + Ant 1.4 and above + + + + + URL: + + + http://www.gexperts.com/gel.html";>http://www.gexperts.com/gel.html + + + + + Contact: + + + http://groups.yahoo.com/group/gelide/";>Project Mailing List + + + + + License: + + + Freeware + + + + @@ -3449,6 +3502,61 @@ mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + + + + + License: + + + Commercial + + + + + + + + +JBuilder 8 Enterprise + + + +JBuilder 8 Enterprise and "Performance Bundle" +come with built-in Ant support. JBuilder 8 Personal and SE +don't support Ant directly, but an +OpenTool is available for them. + + + + Compatibility: + + + Bundles Ant 1.5.1 + + + + + URL: + + + http://www.borland.com/jbuilder/index.html";>http://www.borland.com/jbuilder/index.html + + + + + Contact: + + + mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] 1.76 +52 -0 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- external.xml 18 Mar 2003 16:34:55 - 1.75 +++ external.xml 25 Mar 2003 08:43:34 - 1.76 @@ -1601,6 +1601,31 @@ + + +Java IDE with support for Ant. Gel is a native Microsoft +Windows software. + + + +Compatibility: +Ant 1.4 and above + + +URL: +http://www.gexperts.com/gel.html";>http://www.gexperts.com/gel.html + + +Contact: +http://groups.yahoo.com/group/gelide/";>Project Mailing List + + +License: +Freeware + + + + @@ -1645,6 +1670,33 @@ Contact: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + + +License: +Commercial + + + + + + +JBuilder 8 Enterprise and "Performance Bundle" +come with built-in Ant support. JBuilder 8 Personal and SE +don't support Ant directly, but an +OpenTool is available for them. + + + +Compatibility: +Bundles Ant 1.5.1 + + +URL: +http://www.borland.com/jbuilder/index.html";>http://www.borland.co
cvs commit: ant/xdocs external.xml
bodewig 2003/03/25 00:44:34 Modified:docs Tag: ANT_15_BRANCH external.html xdocsTag: ANT_15_BRANCH external.xml Log: Merge with HEAD Revision ChangesPath No revision No revision 1.48.2.32 +108 -0ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.48.2.31 retrieving revision 1.48.2.32 diff -u -r1.48.2.31 -r1.48.2.32 --- external.html 20 Mar 2003 08:09:27 - 1.48.2.31 +++ external.html 25 Mar 2003 08:44:33 - 1.48.2.32 @@ -3361,6 +3361,59 @@ + + + + +Gel + + + +Java IDE with support for Ant. Gel is a native Microsoft +Windows software. + + + + Compatibility: + + + Ant 1.4 and above + + + + + URL: + + + http://www.gexperts.com/gel.html";>http://www.gexperts.com/gel.html + + + + + Contact: + + + http://groups.yahoo.com/group/gelide/";>Project Mailing List + + + + + License: + + + Freeware + + + + @@ -3449,6 +3502,61 @@ mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + + + + + License: + + + Commercial + + + + + + + + +JBuilder 8 Enterprise + + + +JBuilder 8 Enterprise and "Performance Bundle" +come with built-in Ant support. JBuilder 8 Personal and SE +don't support Ant directly, but an +OpenTool is available for them. + + + + Compatibility: + + + Bundles Ant 1.5.1 + + + + + URL: + + + http://www.borland.com/jbuilder/index.html";>http://www.borland.com/jbuilder/index.html + + + + + Contact: + + + mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] No revision No revision 1.35.2.31 +52 -0 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.35.2.30 retrieving revision 1.35.2.31 diff -u -r1.35.2.30 -r1.35.2.31 --- external.xml 20 Mar 2003 08:09:29 - 1.35.2.30 +++ external.xml 25 Mar 2003 08:44:34 - 1.35.2.31 @@ -1601,6 +1601,31 @@ + + +Java IDE with support for Ant. Gel is a native Microsoft +Windows software. + + + +Compatibility: +Ant 1.4 and above + + +URL: +http://www.gexperts.com/gel.html";>http://www.gexperts.com/gel.html + + +Contact: +http://groups.yahoo.com/group/gelide/";>Project Mailing List + + +License: +Freeware + + + + @@ -1645,6 +1670,33 @@ Contact: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + + +License: +Commercial + + + + + + +JBuilder 8 Enterprise and "Performance Bundle" +come with built-in Ant support. JBuilder 8 Personal and SE +don't support Ant directly, but an +OpenTool is available for them. + + + +
cvs commit: ant/xdocs external.xml
bodewig 2003/03/25 01:04:52 Modified:docs external.html xdocsexternal.xml Log: Fix some URLs Revision ChangesPath 1.100 +13 -13ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- external.html 25 Mar 2003 08:43:34 - 1.99 +++ external.html 25 Mar 2003 09:04:51 - 1.100 @@ -230,7 +230,7 @@ -http://aspectj.org";>AspectJ is an +http://www.eclipse.org/aspectj/";>AspectJ is an aspect-oriented extension to Java. This task compiles a source tree using the AspectJ compiler -- AJC. @@ -251,7 +251,7 @@ - http://aspectj.org/dl";>http://aspectj.org/dl + http://www.eclipse.org/aspectj/";>http://www.eclipse.org/aspectj/ @@ -261,7 +261,7 @@ - mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + http://www.eclipse.org/aspectj/";>project mailing lists @@ -362,7 +362,7 @@ - http://aft.sourceforge.net";>http://aft.sourceforge.net + http://aft.sourceforge.net/";>http://aft.sourceforge.net/ @@ -586,7 +586,7 @@ - http://www.thecortex.net/clover";>http://www.thecortex.net/clover + http://www.thecortex.net/clover/";>http://www.thecortex.net/clover/ @@ -799,7 +799,7 @@ - http://ant-doxygen.sourceforge.net";>http://ant-doxygen.sourceforge.net + http://ant-doxygen.sourceforge.net/";>http://ant-doxygen.sourceforge.net/ @@ -1264,7 +1264,7 @@ - http://www.smartkey.co.uk/antic.html";>www.smartkey.co.uk + http://www.smartkey.co.uk/antic.html";>http://www.smartkey.co.uk/antic.html @@ -1320,7 +1320,7 @@ - http://jacson.sourceforge.net";>http://jacson.sourceforge.net + http://jacson.sourceforge.net/";>http://jacson.sourceforge.net/ @@ -1373,7 +1373,7 @@ - http://jalopy.sourceforge.net";>http://jalopy.sourceforge.net + http://jalopy.sourceforge.net/";>http://jalopy.sourceforge.net/ @@ -1505,7 +1505,7 @@ - http://www.java2html.de";>http://www.java2html.de + http://www.java2html.de/";>http://www.java2html.de/ @@ -2958,7 +2958,7 @@ - http://www.yworks.com/products/yguard";>http://www.yworks.com/products/yguard + http://www.yworks.com/en/products_yguard_about.htm";>http://www.yworks.com/en/products_yguard_about.htm @@ -3232,7 +3232,7 @@ - http://www.dieter-bogdoll.de/java/AntRunner/";>http://www.dieter-bogdoll.de/java/AntRunner/ + http://antrunner.sourceforge.net/";>http://antrunner.sourceforge.net/ @@ -3336,7 +3336,7 @@ - http://www.eclipse.org";>http://www.eclipse.org + http://www.eclipse.org/";>http://www.eclipse.org/ 1.77 +13 -13ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- external.xml 25 Mar 2003 08:43:34 - 1.76 +++ external.xml 25 Mar 2003 09:04:52 - 1.77 @@ -25,7 +25,7 @@ -http://aspectj.org";>AspectJ is an +http://www.eclipse.org/aspectj/";>AspectJ is an aspect-oriented extension to Java. This task compiles a source tree using the AspectJ compiler -- AJC. @@ -36,11 +36,11 @@ URL
cvs commit: ant/xdocs external.xml
bodewig 2003/03/25 01:05:40 Modified:docs Tag: ANT_15_BRANCH external.html xdocsTag: ANT_15_BRANCH external.xml Log: Fix some URLs Revision ChangesPath No revision No revision 1.48.2.33 +13 -13ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.48.2.32 retrieving revision 1.48.2.33 diff -u -r1.48.2.32 -r1.48.2.33 --- external.html 25 Mar 2003 08:44:33 - 1.48.2.32 +++ external.html 25 Mar 2003 09:05:39 - 1.48.2.33 @@ -230,7 +230,7 @@ -http://aspectj.org";>AspectJ is an +http://www.eclipse.org/aspectj/";>AspectJ is an aspect-oriented extension to Java. This task compiles a source tree using the AspectJ compiler -- AJC. @@ -251,7 +251,7 @@ - http://aspectj.org/dl";>http://aspectj.org/dl + http://www.eclipse.org/aspectj/";>http://www.eclipse.org/aspectj/ @@ -261,7 +261,7 @@ - mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] + http://www.eclipse.org/aspectj/";>project mailing lists @@ -362,7 +362,7 @@ - http://aft.sourceforge.net";>http://aft.sourceforge.net + http://aft.sourceforge.net/";>http://aft.sourceforge.net/ @@ -586,7 +586,7 @@ - http://www.thecortex.net/clover";>http://www.thecortex.net/clover + http://www.thecortex.net/clover/";>http://www.thecortex.net/clover/ @@ -799,7 +799,7 @@ - http://ant-doxygen.sourceforge.net";>http://ant-doxygen.sourceforge.net + http://ant-doxygen.sourceforge.net/";>http://ant-doxygen.sourceforge.net/ @@ -1264,7 +1264,7 @@ - http://www.smartkey.co.uk/antic.html";>www.smartkey.co.uk + http://www.smartkey.co.uk/antic.html";>http://www.smartkey.co.uk/antic.html @@ -1320,7 +1320,7 @@ - http://jacson.sourceforge.net";>http://jacson.sourceforge.net + http://jacson.sourceforge.net/";>http://jacson.sourceforge.net/ @@ -1373,7 +1373,7 @@ - http://jalopy.sourceforge.net";>http://jalopy.sourceforge.net + http://jalopy.sourceforge.net/";>http://jalopy.sourceforge.net/ @@ -1505,7 +1505,7 @@ - http://www.java2html.de";>http://www.java2html.de + http://www.java2html.de/";>http://www.java2html.de/ @@ -2958,7 +2958,7 @@ - http://www.yworks.com/products/yguard";>http://www.yworks.com/products/yguard + http://www.yworks.com/en/products_yguard_about.htm";>http://www.yworks.com/en/products_yguard_about.htm @@ -3232,7 +3232,7 @@ - http://www.dieter-bogdoll.de/java/AntRunner/";>http://www.dieter-bogdoll.de/java/AntRunner/ + http://antrunner.sourceforge.net/";>http://antrunner.sourceforge.net/ @@ -3336,7 +3336,7 @@ - http://www.eclipse.org";>http://www.eclipse.org + http://www.eclipse.org/";>http://www.eclipse.org/ No revision No revision 1.35.2.32 +13 -13ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.35.2.31 retrieving revision 1.35.2.32 diff -u -r1.35.2.31 -r1.35.2.32 --- external.xml 25 Mar 2003 08:44:34 - 1.35.2.31 +++ external.xml 25 Mar 2003 09:05:39 - 1.35.2.32 @@ -25,7 +25,7 @@ -http://aspectj.org";>AspectJ i
cvs commit: ant/xdocs external.xml
bodewig 2003/03/25 01:14:30 Modified:docs external.html xdocsexternal.xml Log: update info on AntFarm Revision ChangesPath 1.101 +2 -2 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- external.html 25 Mar 2003 09:04:51 - 1.100 +++ external.html 25 Mar 2003 09:14:30 - 1.101 @@ -3118,7 +3118,7 @@ - bundles Ant 1.3 + bundles Ant 1.5 @@ -3128,7 +3128,7 @@ - http://plugins.jedit.org/plugins/AntFarm";>http://plugins.jedit.org/plugins/AntFarm + http://plugins.jedit.org/plugins/?AntFarm";>http://plugins.jedit.org/plugins/?AntFarm 1.78 +2 -2 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- external.xml 25 Mar 2003 09:04:52 - 1.77 +++ external.xml 25 Mar 2003 09:14:30 - 1.78 @@ -1488,11 +1488,11 @@ Compatibility: -bundles Ant 1.3 +bundles Ant 1.5 URL: -http://plugins.jedit.org/plugins/AntFarm";>http://plugins.jedit.org/plugins/AntFarm +http://plugins.jedit.org/plugins/?AntFarm";>http://plugins.jedit.org/plugins/?AntFarm Contact:
cvs commit: ant/xdocs external.xml
bodewig 2003/03/25 01:15:05 Modified:docs Tag: ANT_15_BRANCH external.html xdocsTag: ANT_15_BRANCH external.xml Log: update info on AntFarm Revision ChangesPath No revision No revision 1.48.2.34 +2 -2 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.48.2.33 retrieving revision 1.48.2.34 diff -u -r1.48.2.33 -r1.48.2.34 --- external.html 25 Mar 2003 09:05:39 - 1.48.2.33 +++ external.html 25 Mar 2003 09:15:02 - 1.48.2.34 @@ -3118,7 +3118,7 @@ - bundles Ant 1.3 + bundles Ant 1.5 @@ -3128,7 +3128,7 @@ - http://plugins.jedit.org/plugins/AntFarm";>http://plugins.jedit.org/plugins/AntFarm + http://plugins.jedit.org/plugins/?AntFarm";>http://plugins.jedit.org/plugins/?AntFarm No revision No revision 1.35.2.33 +2 -2 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.35.2.32 retrieving revision 1.35.2.33 diff -u -r1.35.2.32 -r1.35.2.33 --- external.xml 25 Mar 2003 09:05:39 - 1.35.2.32 +++ external.xml 25 Mar 2003 09:15:04 - 1.35.2.33 @@ -1488,11 +1488,11 @@ Compatibility: -bundles Ant 1.3 +bundles Ant 1.5 URL: -http://plugins.jedit.org/plugins/AntFarm";>http://plugins.jedit.org/plugins/AntFarm +http://plugins.jedit.org/plugins/?AntFarm";>http://plugins.jedit.org/plugins/?AntFarm Contact:
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Sync.java defaults.properties
bodewig 2003/03/25 01:31:00 Modified:.WHATSNEW src/main/org/apache/tools/ant/taskdefs defaults.properties Added: src/main/org/apache/tools/ant/taskdefs Sync.java Log: New task . PR: 12632 Submitted by: Dominique Devienne Dan Armbrust Revision ChangesPath 1.370 +2 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- WHATSNEW 20 Mar 2003 09:10:53 - 1.369 +++ WHATSNEW 25 Mar 2003 09:30:59 - 1.370 @@ -172,6 +172,8 @@ * 's basedir attribute is now optional if you specify nested filesets. Bugzilla Report 18046. +* New task that synchronizes two directory trees. + Changes from Ant 1.5.2 to Ant 1.5.3 === 1.143 +1 -0 ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties Index: defaults.properties === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- defaults.properties 14 Mar 2003 00:42:04 - 1.142 +++ defaults.properties 25 Mar 2003 09:30:59 - 1.143 @@ -74,6 +74,7 @@ import=org.apache.tools.ant.taskdefs.ImportTask whichresource=org.apache.tools.ant.taskdefs.WhichResource subant=org.apache.tools.ant.taskdefs.SubAnt +sync=org.apache.tools.ant.taskdefs.Sync # optional tasks image=org.apache.tools.ant.taskdefs.optional.image.Image 1.1 ant/src/main/org/apache/tools/ant/taskdefs/Sync.java Index: Sync.java === /* * The Apache Software License, Version 1.1 * * Copyright (c) 2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. The end-user documentation included with the redistribution, if *any, must include the following acknowlegement: * "This product includes software developed by the *Apache Software Foundation (http://www.apache.org/)." *Alternately, this acknowlegement may appear in the software itself, *if and wherever such third-party acknowlegements normally appear. * * 4. The names "Ant" and "Apache Software *Foundation" must not be used to endorse or promote products derived *from this software without prior written permission. For written *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" *nor may "Apache" appear in their names without prior written *permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ /* * This code is based on code Copyright (c) 2002, Landmark Graphics * Corp that has been kindly donated to the Apache Software * Foundation. */ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.Hashtable; import org.apache.tools.ant.BuildException;
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/unix Symlink.java
bodewig 2003/03/26 07:50:28 Modified:src/main/org/apache/tools/ant/taskdefs/optional/unix Symlink.java Log: Fix javadocs. PR: 17143 Submitted by: Gus Heck Revision ChangesPath 1.4 +7 -7 ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java Index: Symlink.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Symlink.java 10 Feb 2003 14:14:28 - 1.3 +++ Symlink.java 26 Mar 2003 15:50:28 - 1.4 @@ -141,12 +141,12 @@ * absolute paths. On non-unix systems this may cause false positives. * Furthermore, any operating system on which the command * ln -s link resource is not a valid command on the comandline - * will not be able to use action="single" or action="multi" action="record" - * should still work. Finally, the lack of support for symlinks in Java - * means that all links are recorded as links to the - * canonical resource name. Therefore the link: - * link --> subdir/dir/../foo.bar will be recorded as - * link=subdir/foo.bar and restored as + * will not be able to use action= "delete", action="single" or + * action="recreate", but action="record" should still work. Finally, the + * lack of support for symlinks in Java means that all links are recorded + * as links to the canonical resource name. Therefore + * the link: link --> subdir/dir/../foo.bar will be recorded + * as link=subdir/foo.bar and restored as * link --> subdir/foo.bar * * @version $Revision$
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam TreeBasedTask.java
bodewig 2003/03/27 00:02:15
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/starteam
TreeBasedTask.java
Log:
Make starteam checkout handle deleted labels correctly.
PR: 17646
Submitted by: Brian Brooks
Reviewed by: Steve Cohen
Revision ChangesPath
1.371 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- WHATSNEW 25 Mar 2003 09:30:59 - 1.370
+++ WHATSNEW 27 Mar 2003 08:02:15 - 1.371
@@ -70,6 +70,8 @@
StringIndexOutOfBoundsException on all OSes where os.name is shorter
than seven characters. Bugzilla Report 18105.
+* starteam checkout can now handle deleted labels. Bugzilla Report 17646.
+
Other changes:
--
* The filesetmanifest attribute of has been reenabled.
1.16 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
Index: TreeBasedTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TreeBasedTask.java11 Feb 2003 11:57:27 - 1.15
+++ TreeBasedTask.java27 Mar 2003 08:02:15 - 1.16
@@ -566,7 +566,7 @@
for (int i = 0; i < allLabels.length; i++) {
Label stLabel = allLabels[i];
log("checking label " + stLabel.getName(), Project.MSG_DEBUG);
-if (stLabel.getName().equals(this.label)) {
+if (stLabel != null && !stLabel.isDeleted() &&
stLabel.getName().equals(this.label)) {
if (!stLabel.isRevisionLabel() && !stLabel.isViewLabel()) {
throw new BuildException("Unexpected label type.");
}
cvs commit: ant/src/script ant
bodewig 2003/03/27 00:24:21 Modified:.WHATSNEW src/script ant Log: Make wrapper script work if ant is a relative symlink and ANT_HOME isn't set. PR: 17721 Submitted by: Martin Frost Revision ChangesPath 1.372 +3 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.371 retrieving revision 1.372 diff -u -r1.371 -r1.372 --- WHATSNEW 27 Mar 2003 08:02:15 - 1.371 +++ WHATSNEW 27 Mar 2003 08:24:21 - 1.372 @@ -72,6 +72,9 @@ * starteam checkout can now handle deleted labels. Bugzilla Report 17646. +* The Unix wrapper script failed if you invoked it as a relative + symlink and ANT_HOME has not been set. Bugzilla Report 17721. + Other changes: -- * The filesetmanifest attribute of has been reenabled. 1.35 +1 -1 ant/src/script/ant Index: ant === RCS file: /home/cvs/ant/src/script/ant,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ant 7 Mar 2003 08:42:26 - 1.34 +++ ant 27 Mar 2003 08:24:21 - 1.35 @@ -51,7 +51,7 @@ while [ -h "$PRG" ] ; do ls=`ls -ld "$PRG"` link=`expr "$ls" : '.*-> \(.*\)$'` -if expr "$link" : '.*/.*' > /dev/null; then +if expr "$link" : '/.*' > /dev/null; then PRG="$link" else PRG=`dirname "$PRG"`"/$link"
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs ZipTest.java
bodewig 2003/03/27 01:43:49
Modified:src/etc/testcases/taskdefs zip.xml
src/testcases/org/apache/tools/ant/taskdefs ZipTest.java
Log:
Demonstrate bug 18403
Revision ChangesPath
1.11 +7 -0 ant/src/etc/testcases/taskdefs/zip.xml
Index: zip.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/zip.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zip.xml 5 Feb 2003 10:43:07 - 1.10
+++ zip.xml 27 Mar 2003 09:43:48 - 1.11
@@ -95,6 +95,13 @@
update="true" />
+
+
+
+
+
+
+
1.13 +10 -0
ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
Index: ZipTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ZipTest.java 10 Feb 2003 14:14:45 - 1.12
+++ ZipTest.java 27 Mar 2003 09:43:49 - 1.13
@@ -57,6 +57,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.Enumeration;
@@ -133,5 +134,14 @@
public void testUpdateIsNecessary() {
expectLogContaining("testUpdateIsNecessary", "Updating");
+}
+
+// Bugzilla Report 18403
+public void testPrefixAddsDir() throws IOException {
+executeTarget("testPrefixAddsDir");
+File archive = getProject().resolveFile("test3.zip");
+ZipFile zf = new ZipFile(archive);
+ZipEntry ze = zf.getEntry("test/");
+assertNotNull("test/ has been added", ze);
}
}
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2003/03/27 02:02:04
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
prefix attribute of would not generate directory entries
for the prefix itself.
PR: 18403
Revision ChangesPath
1.373 +8 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- WHATSNEW 27 Mar 2003 08:24:21 - 1.372
+++ WHATSNEW 27 Mar 2003 10:02:02 - 1.373
@@ -211,6 +211,14 @@
* Ant will no longer implicitly add Sun's rt.jar in when you
use jvc and don't specify a bootclasspath. Bugzilla Report 18055.
+* The prefix attribute of would not generate directory
+ entries for the prefix itself. Bugzilla Report 18403.
+
+Other Changes:
+--
+* Added ability to specify manifest encoding for the and
+ tasks
+
Changes from Ant 1.5.1 to Ant 1.5.2
=
1.103 +5 -4 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- Zip.java 18 Mar 2003 13:15:48 - 1.102
+++ Zip.java 27 Mar 2003 10:02:04 - 1.103
@@ -558,10 +558,11 @@
+ " file.");
}
-if (prefix.length() > 0
-&& !prefix.endsWith("/")
-&& !prefix.endsWith("\\")) {
-prefix += "/";
+if (prefix.length() > 0) {
+if (!prefix.endsWith("/") && !prefix.endsWith("\\")) {
+prefix += "/";
+}
+addParentDirs(null, prefix, zOut, "", dirMode);
}
ZipFile zf = null;
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2003/03/27 02:07:20
Modified:.Tag: ANT_15_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Zip.java
Log:
Merge fix for 18403 from HEAD
Revision ChangesPath
No revision
No revision
1.263.2.129 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.263.2.128
retrieving revision 1.263.2.129
diff -u -r1.263.2.128 -r1.263.2.129
--- WHATSNEW 22 Mar 2003 10:23:50 - 1.263.2.128
+++ WHATSNEW 27 Mar 2003 10:07:19 - 1.263.2.129
@@ -30,6 +30,9 @@
* Ant will no longer implicitly add Sun's rt.jar in when you
use jvc and don't specify a bootclasspath. Bugzilla Report 18055.
+* The prefix attribute of would not generate directory
+ entries for the prefix itself. Bugzilla Report 18403.
+
Other Changes:
--
* Added ability to specify manifest encoding for the and
No revision
No revision
1.78.2.15 +6 -5 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.78.2.14
retrieving revision 1.78.2.15
diff -u -r1.78.2.14 -r1.78.2.15
--- Zip.java 18 Mar 2003 13:13:34 - 1.78.2.14
+++ Zip.java 27 Mar 2003 10:07:19 - 1.78.2.15
@@ -93,7 +93,7 @@
*
* @author James Davidson mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]
* @author Jon S. Stevens mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]
- * @author mailto:[EMAIL PROTECTED]">Stefan Bodewig
+ * @author Stefan Bodewig
* @author mailto:[EMAIL PROTECTED]">Antoine Levy-Lambert
*
* @since Ant 1.1
@@ -537,10 +537,11 @@
+ " file.");
}
-if (prefix.length() > 0
-&& !prefix.endsWith("/")
-&& !prefix.endsWith("\\")) {
-prefix += "/";
+if (prefix.length() > 0) {
+if (!prefix.endsWith("/") && !prefix.endsWith("\\")) {
+prefix += "/";
+}
+addParentDirs(null, prefix, zOut, "", dirMode);
}
ZipFile zf = null;
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ExecuteOn.java
bodewig 2003/03/27 05:14:31
Modified:.WHATSNEW
docs/manual/CoreTasks apply.html
src/main/org/apache/tools/ant/taskdefs ExecuteOn.java
Log:
Add a forwardslash attribute to
Submitted by: Zdenek Wagner
Revision ChangesPath
1.374 +5 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- WHATSNEW 27 Mar 2003 10:02:02 - 1.373
+++ WHATSNEW 27 Mar 2003 13:14:31 - 1.374
@@ -179,6 +179,11 @@
* New task that synchronizes two directory trees.
+* has new forwardslash attribute that can force filenames to
+ use forward slashes (/) as file separators even on platforms with a
+ different separator. This is useful if you want to run certain
+ ported Unix tools.
+
Changes from Ant 1.5.2 to Ant 1.5.3
===
1.19 +9 -1 ant/docs/manual/CoreTasks/apply.html
Index: apply.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/apply.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apply.html26 Sep 2002 13:55:28 - 1.18
+++ apply.html27 Mar 2003 13:14:31 - 1.19
@@ -58,6 +58,14 @@
No, default is false
+forwardslash
+whether the absolute file names should be passed
+ with forward slashes even if the operating system requires other
+ file separator. The option is ignored if the system file separator
+ is a forward slash.
+No, default is false
+
+
os
list of Operating Systems on which the command may be
executed.
@@ -220,7 +228,7 @@
.o, replacing TARGETFILE with the absolute filename of
the .o and SOURCEFILE with the absolute name of the
.c file.
-Copyright © 2000-2002 Apache Software Foundation.
All rights
+Copyright © 2000-2003 Apache Software Foundation.
All rights
Reserved.
1.38 +18 -1 ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
Index: ExecuteOn.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ExecuteOn.java7 Mar 2003 11:23:01 - 1.37
+++ ExecuteOn.java27 Mar 2003 13:14:31 - 1.38
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -83,6 +83,7 @@
protected Vector filesets = new Vector();
private boolean relative = false;
private boolean parallel = false;
+private boolean forwardSlash = false;
protected String type = "file";
protected Commandline.Marker srcFilePos = null;
private boolean skipEmpty = false;
@@ -145,6 +146,14 @@
}
/**
+ * The source and target file names on Windows and OS/2 must use
+ * forward slash as file separator.
+ */
+public void setForwardslash(boolean forwardSlash) {
+this.forwardSlash = forwardSlash;
+}
+
+/**
* Marker that indicates where the name of the source file should
* be put on the command line.
*/
@@ -284,6 +293,7 @@
* @param baseDir filenames are relative to this dir
*/
protected String[] getCommandline(String[] srcFiles, File[] baseDirs) {
+final char fileSeparator = File.separatorChar;
Vector targets = new Vector();
if (targetFilePos != null) {
Hashtable addedFiles = new Hashtable();
@@ -297,6 +307,9 @@
} else {
name = subTargets[j];
}
+if (forwardSlash && fileSeparator != '/') {
+name = name.replace(fileSeparator, '/');
+}
if (!addedFiles.contains(name)) {
targets.addElement(name);
addedFiles.put(name, name);
@@ -379,6 +392,10 @@
(new File(baseDirs[i], srcFiles[i])).getAbsolutePath();
} else {
result[srcIndex + i] = srcFiles[i];
+}
+if (forwardSlash && fileSeparator != '/') {
+result[srcIndex + i] =
+
cvs commit: ant/xdocs external.xml
bodewig 2003/03/27 05:16:16 Modified:docs external.html xdocsexternal.xml Log: Provide some intra-page navigation links. Revision ChangesPath 1.102 +3 -2 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- external.html 25 Mar 2003 09:14:30 - 1.101 +++ external.html 27 Mar 2003 13:16:14 - 1.102 @@ -209,8 +209,9 @@ External Tools and Tasks -This page lists external resources for Apache Ant: tasks, IDE - integration tools, loggers, you name it. If you've written +This page lists external resources for Apache Ant: tasks, Compiler Implementations, + IDE integration + tools, loggers, you name it. If you've written something that should be included, please post all relevant information to one of the mailing lists. For details, see the FAQ. 1.79 +5 -2 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- external.xml 25 Mar 2003 09:14:30 - 1.78 +++ external.xml 27 Mar 2003 13:16:16 - 1.79 @@ -10,8 +10,11 @@ - This page lists external resources for Apache Ant: tasks, IDE - integration tools, loggers, you name it. If you've written + This page lists external resources for Apache Ant: tasks, Compiler Implementations, + IDE integration + tools, loggers, you name it. If you've written something that should be included, please post all relevant information to one of the mailing lists. For details, see the FAQ.
cvs commit: ant/xdocs external.xml
bodewig 2003/03/27 05:19:54 Modified:docs Tag: ANT_15_BRANCH external.html xdocsTag: ANT_15_BRANCH external.xml Log: sync with HEAD Revision ChangesPath No revision No revision 1.48.2.35 +3 -2 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.48.2.34 retrieving revision 1.48.2.35 diff -u -r1.48.2.34 -r1.48.2.35 --- external.html 25 Mar 2003 09:15:02 - 1.48.2.34 +++ external.html 27 Mar 2003 13:19:53 - 1.48.2.35 @@ -209,8 +209,9 @@ External Tools and Tasks -This page lists external resources for Apache Ant: tasks, IDE - integration tools, loggers, you name it. If you've written +This page lists external resources for Apache Ant: tasks, Compiler Implementations, + IDE integration + tools, loggers, you name it. If you've written something that should be included, please post all relevant information to one of the mailing lists. For details, see the FAQ. No revision No revision 1.35.2.34 +5 -2 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.35.2.33 retrieving revision 1.35.2.34 diff -u -r1.35.2.33 -r1.35.2.34 --- external.xml 25 Mar 2003 09:15:04 - 1.35.2.33 +++ external.xml 27 Mar 2003 13:19:54 - 1.35.2.34 @@ -10,8 +10,11 @@ - This page lists external resources for Apache Ant: tasks, IDE - integration tools, loggers, you name it. If you've written + This page lists external resources for Apache Ant: tasks, Compiler Implementations, + IDE integration + tools, loggers, you name it. If you've written something that should be included, please post all relevant information to one of the mailing lists. For details, see the FAQ.
cvs commit: ant/docs/manual/CoreTasks apply.html
bodewig 2003/03/27 05:22:33 Modified:docs/manual/CoreTasks apply.html Log: Not only the absolute paths Revision ChangesPath 1.20 +1 -1 ant/docs/manual/CoreTasks/apply.html Index: apply.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/apply.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apply.html27 Mar 2003 13:14:31 - 1.19 +++ apply.html27 Mar 2003 13:22:33 - 1.20 @@ -59,7 +59,7 @@ forwardslash -whether the absolute file names should be passed +whether the file names should be passed with forward slashes even if the operating system requires other file separator. The option is ignored if the system file separator is a forward slash.
