cvs commit: ant build.xml
mbenson 2005/08/05 15:57:54
Modified:.build.xml
Log:
Suppress CVS ChangeLogParser test unless tests and Ant share classloader.
Not sure why, but apparently needed even after a clean and rebuild.
Revision ChangesPath
1.477 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -r1.476 -r1.477
--- build.xml 25 Jul 2005 22:00:45 - 1.476
+++ build.xml 5 Aug 2005 22:57:54 - 1.477
@@ -1718,6 +1718,8 @@
unless=tests.and.ant.share.classloader/
exclude name=${taskdefs.package}/cvslib/ChangeLogWriterTest.java
unless=tests.and.ant.share.classloader/
+ exclude name=${taskdefs.package}/cvslib/ChangeLogParserTest.java
+unless=tests.and.ant.share.classloader/
exclude name=${optional.package}/sos/SOSTest.java
unless=tests.and.ant.share.classloader/
exclude name=${optional.package}/vss/MSVSSTest.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
AW: cvs commit: ant build.xml
Could you use one statement to create both directories?
Would be faster than two sshexec statements (connect, make 1st dir,
disconnect,
connect, make 2nd dir, disconnect).
Jan
-Ursprüngliche Nachricht-
Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Gesendet: Dienstag, 26. Juli 2005 00:01
An: [EMAIL PROTECTED]
Betreff: cvs commit: ant build.xml
stevel 2005/07/25 15:00:45
Modified:.build.xml
Log:
mkdir -p doesnt fail if the dir already exists, so we do not
need to ignore the errors.
Revision ChangesPath
1.476 +0 -2 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- build.xml25 Jul 2005 16:52:01 - 1.475
+++ build.xml25 Jul 2005 22:00:45 - 1.476
@@ -1356,12 +1356,10 @@
sshexec username=${apache.user} host=${ssh.host}
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
- failonerror=false
command=mkdir -p ${ssh.dist.directory} /
sshexec username=${apache.user} host=${ssh.host}
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
- failonerror=false
command=mkdir -p ${ssh.jars.directory}/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED] For
additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
stevel 2005/07/25 09:39:06
Modified:.build.xml
Log:
Enhanced upload process.
1. you can override the machine and dest dirs
2. we create the dest dirs, if not found (ignoring errors if they exist)
3. the init-upload target prints out what is about to happen, to help prepare
for a private redistribution
Revision ChangesPath
1.474 +46 -4 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -r1.473 -r1.474
--- build.xml 23 May 2005 20:39:00 - 1.473
+++ build.xml 25 Jul 2005 16:39:06 - 1.474
@@ -1029,6 +1029,7 @@
mkdir dir=${dist.etc}/
copy todir=${dist.lib} file=${lib.dir}/README/
+copy todir=${dist.lib} file=${lib.dir}/libraries.properties/
copy todir=${dist.docs}
fileset dir=${docs.dir} excludes=${unfiltered.files}
@@ -1056,6 +1057,7 @@
include name=WHATSNEW/
include name=KEYS/
include name=welcome.html/
+include name=fetch.xml/
/fileset
/copy
@@ -1123,6 +1125,7 @@
include name=*.jar/
include name=*.zip/
include name=README/
+include name=libraries.properties/
/fileset
/copy
@@ -1154,6 +1157,7 @@
include name=bootstrap.bat/
include name=bootstrap.sh/
include name=build.xml/
+include name=fetch.xml/
include name=welcome.html/
/fileset
/copy
@@ -1326,17 +1330,55 @@
Upload the distribution to cvs.apache.org for final releases
===
--
- target name=upload description=upload distribution
+
+ target name=init-upload
fail unless=apache.user message=set a property apache.user with your
apache user/
fail unless=ssh.passphrase message=set a property with your ssh
passphrase/
fail unless=ssh.keyfile message=set a property with your ssh
keyfile/
-fail unless=ssh.knownhosts message=set a property with your ssh
knownhosts/
-scp todir=[EMAIL PROTECTED]:/www/www.apache.org/dist/ant
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
+property name=ssh.knownhosts location=${user.home}/.ssh/known_hosts
/
+property name=ssh.host value=cvs.apache.org/
+property name=ssh.verbose value=false/
+property name=ssh.base.directory value=/www/www.apache.org/dist/
+property name=ssh.dist.directory value=${ssh.base.directory}/ant/
+property name=ssh.jars.directory
value=${ssh.base.directory}/java-repository/ant/jars/
+echo
+ Uploading Ant version ${version}
+ to host ${ssh.host} as ${apache.user}
+ distribution to ${ssh.dist.directory}
+ JAR files to ${ssh.jars.directory}
+ Known hosts = ${ssh.knownhosts}
+/echo
+ /target
+
+ !-- create the directories if absent--
+ target name=ssh-mkdirs
+depends=init-upload
+sshexec username=${apache.user} host=${ssh.host}
+ keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
+ knownhosts=${ssh.knownhosts}
+ failonerror=false
+ command=mkdir ${ssh.dist.directory} /
+sshexec username=${apache.user} host=${ssh.host}
+ keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
+ knownhosts=${ssh.knownhosts}
+ failonerror=false
+ command=mkdir ${ssh.jars.directory}/
+ /target
+
+ target name=upload description=-- uploads the distribution
+ depends=init-upload,ssh-mkdirs
+scp todir=[EMAIL PROTECTED]:${ssh.dist.directory}
+ keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
+ knownhosts=${ssh.knownhosts}
+ verbose=${ssh.verbose}
fileset dir=${dist.base}
include name=**/*${version}*/
/fileset
/scp
-scp todir=[EMAIL
PROTECTED]:/www/www.apache.org/dist/java-repository/ant/jars
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
+scp todir=[EMAIL PROTECTED]:${ssh.jars.directory}
+ keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
+ knownhosts=${ssh.knownhosts}
+ verbose=${ssh.verbose}
fileset dir=java-repository/ant/jars
include name=*${version}*/
/fileset
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
stevel 2005/07/25 09:52:01
Modified:.build.xml
Log:
no, I need the parent dirs too
Revision ChangesPath
1.475 +3 -3 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -r1.474 -r1.475
--- build.xml 25 Jul 2005 16:39:06 - 1.474
+++ build.xml 25 Jul 2005 16:52:01 - 1.475
@@ -941,7 +941,7 @@
!-- Creates jar of test utility classes --
target name=test-jar
depends=compile-tests
-description=-- creates the Apache Ant Test Utilties jar
+description=-- creates the Apache Ant Test Utilities jar
fail unless=junit.present
We cannot build the test jar unless JUnit is present,
@@ -1357,12 +1357,12 @@
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
failonerror=false
- command=mkdir ${ssh.dist.directory} /
+ command=mkdir -p ${ssh.dist.directory} /
sshexec username=${apache.user} host=${ssh.host}
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
failonerror=false
- command=mkdir ${ssh.jars.directory}/
+ command=mkdir -p ${ssh.jars.directory}/
/target
target name=upload description=-- uploads the distribution
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
stevel 2005/07/25 15:00:45
Modified:.build.xml
Log:
mkdir -p doesnt fail if the dir already exists, so we do not need to ignore
the errors.
Revision ChangesPath
1.476 +0 -2 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- build.xml 25 Jul 2005 16:52:01 - 1.475
+++ build.xml 25 Jul 2005 22:00:45 - 1.476
@@ -1356,12 +1356,10 @@
sshexec username=${apache.user} host=${ssh.host}
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
- failonerror=false
command=mkdir -p ${ssh.dist.directory} /
sshexec username=${apache.user} host=${ssh.host}
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
- failonerror=false
command=mkdir -p ${ssh.jars.directory}/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
mbenson 2005/05/23 13:39:01
Modified:.build.xml
Log:
Oops, must build in the contents of src/resources
Revision ChangesPath
1.473 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -r1.472 -r1.473
--- build.xml 20 May 2005 22:15:19 - 1.472
+++ build.xml 23 May 2005 20:39:00 - 1.473
@@ -75,6 +75,7 @@
property name=tests.dir value=src/testcases/
property name=tests.etc.dir value=src/etc/testcases/
property name=manifest value=src/etc/manifest/
+ property name=resource.dir value=${src.dir}/resources/
!--
===
@@ -715,6 +716,7 @@
include name=**/*.properties/
include name=**/*.dtd/
/fileset
+ fileset dir=${resource.dir} /
/copy
copy todir=${build.classes}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml ReleaseInstructions
antoine 2005/05/19 06:50:10
Modified:.build.xml ReleaseInstructions
Log:
Add information concerning the new java-repository
Revision ChangesPath
1.471 +6 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- build.xml 19 May 2005 12:45:12 - 1.470
+++ build.xml 19 May 2005 13:50:09 - 1.471
@@ -1331,7 +1331,12 @@
fail unless=ssh.knownhosts message=set a property with your ssh
knownhosts/
scp todir=[EMAIL PROTECTED]:/www/www.apache.org/dist/ant
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
fileset dir=${dist.base}
-include name=**/*/
+include name=**/*${version}*/
+ /fileset
+ /scp
+scp todir=[EMAIL
PROTECTED]:/www/www.apache.org/dist/java-repository/ant/jars
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
+ fileset dir=java-repository/ant/jars
+include name=*${version}*/
/fileset
/scp
/target
1.28 +10 -2 ant/ReleaseInstructions
Index: ReleaseInstructions
===
RCS file: /home/cvs/ant/ReleaseInstructions,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ReleaseInstructions 19 May 2005 12:45:12 - 1.27
+++ ReleaseInstructions 19 May 2005 13:50:10 - 1.28
@@ -165,7 +165,15 @@
you'll have to do some house-keeping for the old release:
* upload the new release files to
- /www/www.apache.org/dist/ant/[source|binaries].
+
+ from distribution
+ to /www/www.apache.org/dist/ant/[source|binaries].
+
+ and
+
+ from java-repository/ant/jars
+ to /www/www.apache.org/dist/java-repository/ant/jars
+
this can be done using the target upload of the build.xml
* remove the symbolic links from /www/www.apache.org/dist/ant.
@@ -188,7 +196,7 @@
19. Clean up.
* remove the remaining files of the previous release from
- /www/www.apache.org/dist/ant/[source|binary].
+ /www/www.apache.org/dist/ant/[source|binaries].
This includes the old release notes.
20. Now and perhaps during previous betas any changes on the branch must
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml ReleaseInstructions
antoine 2005/05/19 06:51:08
Modified:.Tag: ANT_16_BRANCH build.xml ReleaseInstructions
Log:
Merge from HEAD
Revision ChangesPath
No revision
No revision
1.392.2.45 +6 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.44
retrieving revision 1.392.2.45
diff -u -r1.392.2.44 -r1.392.2.45
--- build.xml 19 May 2005 12:22:09 - 1.392.2.44
+++ build.xml 19 May 2005 13:51:08 - 1.392.2.45
@@ -1269,7 +1269,12 @@
fail unless=ssh.knownhosts message=set a property with your ssh
knownhosts/
scp todir=[EMAIL PROTECTED]:/www/www.apache.org/dist/ant
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
fileset dir=${dist.base}
-include name=**/*/
+include name=**/*${version}*/
+ /fileset
+ /scp
+scp todir=[EMAIL
PROTECTED]:/www/www.apache.org/dist/java-repository/ant/jars
keyfile=${ssh.keyfile} passphrase=${ssh.passphrase}
knownhosts=${ssh.knownhosts}
+ fileset dir=java-repository/ant/jars
+include name=*${version}*/
/fileset
/scp
/target
1.17.2.9 +10 -2 ant/ReleaseInstructions
Index: ReleaseInstructions
===
RCS file: /home/cvs/ant/ReleaseInstructions,v
retrieving revision 1.17.2.8
retrieving revision 1.17.2.9
diff -u -r1.17.2.8 -r1.17.2.9
--- ReleaseInstructions 19 May 2005 12:22:09 - 1.17.2.8
+++ ReleaseInstructions 19 May 2005 13:51:08 - 1.17.2.9
@@ -165,7 +165,15 @@
you'll have to do some house-keeping for the old release:
* upload the new release files to
- /www/www.apache.org/dist/ant/[source|binaries].
+
+ from distribution
+ to /www/www.apache.org/dist/ant/[source|binaries].
+
+ and
+
+ from java-repository/ant/jars
+ to /www/www.apache.org/dist/java-repository/ant/jars
+
this can be done using the target upload of the build.xml
* remove the symbolic links from /www/www.apache.org/dist/ant.
@@ -188,7 +196,7 @@
19. Clean up.
* remove the remaining files of the previous release from
- /www/www.apache.org/dist/ant/[source|binary].
+ /www/www.apache.org/dist/ant/[source|binaries].
This includes the old release notes.
20. Now and perhaps during previous betas any changes on the branch must
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
antoine 2005/05/16 22:03:02
Modified:.build.xml
Log:
build the distribution with subdirectories source and binaries like
the directories on the Apache web site
Revision ChangesPath
1.468 +22 -20ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- build.xml 10 May 2005 13:57:48 - 1.467
+++ build.xml 17 May 2005 05:03:02 - 1.468
@@ -123,6 +123,8 @@
--
property name=dist.name value=apache-${name}-${version}/
property name=dist.base value=distribution/
+ property name=dist.base.source value=${dist.base}/source/
+ property name=dist.base.binaries value=${dist.base}/binaries/
property name=dist.dir value=dist/
property name=dist.bin value=${dist.dir}/bin/
property name=dist.lib value=${dist.dir}/lib/
@@ -1192,14 +1194,14 @@
delete dir=${dist.name}/
delete dir=${java-repository.dir}/
mkdir dir=${dist.base}/
-mkdir dir=${dist.base}/src/
-mkdir dir=${dist.base}/bin/
+mkdir dir=${dist.base.source}/
+mkdir dir=${dist.base.binaries}/
mkdir dir=${java-repository.dir}/
antcall inheritAll=false target=internal_dist
param name=dist.dir value=${dist.name}/
/antcall
-zip destfile=${dist.base}/bin/${dist.name}-bin.zip
+zip destfile=${dist.base.binaries}/${dist.name}-bin.zip
zipfileset dir=${dist.name}/.. filemode=755
include name=${dist.name}/bin/ant/
include name=${dist.name}/bin/antRun/
@@ -1215,7 +1217,7 @@
/fileset
/zip
tar longfile=gnu
- destfile=${dist.base}/bin/${dist.name}-bin.tar
+ destfile=${dist.base.binaries}/${dist.name}-bin.tar
tarfileset dir=${dist.name}/.. mode=755 username=ant
group=ant
include name=${dist.name}/bin/ant/
include name=${dist.name}/bin/antRun/
@@ -1230,11 +1232,11 @@
exclude name=${dist.name}/bin/*.py/
/tarfileset
/tar
-gzip destfile=${dist.base}/bin/${dist.name}-bin.tar.gz
- src=${dist.base}/bin/${dist.name}-bin.tar/
-bzip2 destfile=${dist.base}/bin/${dist.name}-bin.tar.bz2
- src=${dist.base}/bin/${dist.name}-bin.tar/
-delete file=${dist.base}/bin/${dist.name}-bin.tar/
+gzip destfile=${dist.base.binaries}/${dist.name}-bin.tar.gz
+ src=${dist.base.binaries}/${dist.name}-bin.tar/
+bzip2 destfile=${dist.base.binaries}/${dist.name}-bin.tar.bz2
+ src=${dist.base.binaries}/${dist.name}-bin.tar/
+delete file=${dist.base.binaries}/${dist.name}-bin.tar/
copy todir=${java-repository.dir}
fileset dir=${dist.name}/lib
@@ -1251,14 +1253,14 @@
delete dir=${dist.name}/
checksum fileext=.md5
- fileset dir=${dist.base}/bin/
+ fileset dir=${dist.base.binaries}/
include name=**/*/
exclude name=**/*.asc/
exclude name=**/*.md5/
/fileset
/checksum
checksum fileext=.sha1 algorithm=SHA
- fileset dir=${dist.base}/bin/
+ fileset dir=${dist.base.binaries}/
include name=**/*/
exclude name=**/*.asc/
exclude name=**/*.md5/
@@ -1268,7 +1270,7 @@
antcall inheritAll=false target=src-dist
param name=src.dist.dir value=${dist.name}/
/antcall
-zip destfile=${dist.base}/src/${dist.name}-src.zip
+zip destfile=${dist.base.source}/${dist.name}-src.zip
zipfileset dir=${dist.name}/.. filemode=755
include name=${dist.name}/bootstrap.sh/
include name=${dist.name}/build.sh/
@@ -1280,7 +1282,7 @@
/fileset
/zip
tar longfile=gnu
- destfile=${dist.base}/src/${dist.name}-src.tar
+ destfile=${dist.base.source}/${dist.name}-src.tar
tarfileset dir=${dist.name}/.. mode=755 username=ant
group=ant
include name=${dist.name}/bootstrap.sh/
include name=${dist.name}/build.sh/
@@ -1291,21 +1293,21 @@
exclude name=${dist.name}/build.sh/
/tarfileset
/tar
-gzip destfile=${dist.base}/src/${dist.name}-src.tar.gz
- src=${dist.base}/src/${dist.name}-src.tar/
-bzip2 destfile=${dist.base}/src/${dist.name}-src.tar.bz2
- src=${dist.base}/src/${dist.name}-src.tar/
-delete file=${dist.base}/src/${dist.name}-src.tar/
+gzip destfile=${dist.base.source}/${dist.name}-src.tar.gz
+ src=${dist.base.source}/${dist.name}-src.tar/
+bzip2 destfile=${dist.base.source}/${dist.name}-src.tar.bz2
+ src=${dist.base.source}/${dist.name}-src.tar/
+delete file=${dist.base.source}/${dist.name}-src.tar/
delete dir=${dist.name}/
checksum fileext=.md5
- fileset dir=${dist.base}/src/
+ fileset
cvs commit: ant build.xml
antoine 2005/05/16 22:16:17
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
Merge
Revision ChangesPath
No revision
No revision
1.392.2.43 +22 -20ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.42
retrieving revision 1.392.2.43
diff -u -r1.392.2.42 -r1.392.2.43
--- build.xml 10 May 2005 13:58:53 - 1.392.2.42
+++ build.xml 17 May 2005 05:16:16 - 1.392.2.43
@@ -119,6 +119,8 @@
--
property name=dist.name value=apache-${name}-${version}/
property name=dist.base value=distribution/
+ property name=dist.base.source value=${dist.base}/source/
+ property name=dist.base.binaries value=${dist.base}/binaries/
property name=dist.dir value=dist/
property name=dist.bin value=${dist.dir}/bin/
property name=dist.lib value=${dist.dir}/lib/
@@ -1131,14 +1133,14 @@
delete dir=${dist.name}/
delete dir=${java-repository.dir}/
mkdir dir=${dist.base}/
-mkdir dir=${dist.base}/src/
-mkdir dir=${dist.base}/bin/
+mkdir dir=${dist.base.source}/
+mkdir dir=${dist.base.binaries}/
mkdir dir=${java-repository.dir}/
antcall inheritAll=false target=internal_dist
param name=dist.dir value=${dist.name}/
/antcall
-zip destfile=${dist.base}/bin/${dist.name}-bin.zip
+zip destfile=${dist.base.binaries}/${dist.name}-bin.zip
zipfileset dir=${dist.name}/.. filemode=755
include name=${dist.name}/bin/ant/
include name=${dist.name}/bin/antRun/
@@ -1154,7 +1156,7 @@
/fileset
/zip
tar longfile=gnu
- destfile=${dist.base}/bin/${dist.name}-bin.tar
+ destfile=${dist.base.binaries}/${dist.name}-bin.tar
tarfileset dir=${dist.name}/.. mode=755 username=ant
group=ant
include name=${dist.name}/bin/ant/
include name=${dist.name}/bin/antRun/
@@ -1169,11 +1171,11 @@
exclude name=${dist.name}/bin/*.py/
/tarfileset
/tar
-gzip destfile=${dist.base}/bin/${dist.name}-bin.tar.gz
- src=${dist.base}/bin/${dist.name}-bin.tar/
-bzip2 destfile=${dist.base}/bin/${dist.name}-bin.tar.bz2
- src=${dist.base}/bin/${dist.name}-bin.tar/
-delete file=${dist.base}/bin/${dist.name}-bin.tar/
+gzip destfile=${dist.base.binaries}/${dist.name}-bin.tar.gz
+ src=${dist.base.binaries}/${dist.name}-bin.tar/
+bzip2 destfile=${dist.base.binaries}/${dist.name}-bin.tar.bz2
+ src=${dist.base.binaries}/${dist.name}-bin.tar/
+delete file=${dist.base.binaries}/${dist.name}-bin.tar/
copy todir=${java-repository.dir}
fileset dir=${dist.name}/lib
@@ -1190,14 +1192,14 @@
delete dir=${dist.name}/
checksum fileext=.md5
- fileset dir=${dist.base}/bin/
+ fileset dir=${dist.base.binaries}/
include name=**/*/
exclude name=**/*.asc/
exclude name=**/*.md5/
/fileset
/checksum
checksum fileext=.sha1 algorithm=SHA
- fileset dir=${dist.base}/bin/
+ fileset dir=${dist.base.binaries}/
include name=**/*/
exclude name=**/*.asc/
exclude name=**/*.md5/
@@ -1207,7 +1209,7 @@
antcall inheritAll=false target=src-dist
param name=src.dist.dir value=${dist.name}/
/antcall
-zip destfile=${dist.base}/src/${dist.name}-src.zip
+zip destfile=${dist.base.source}/${dist.name}-src.zip
zipfileset dir=${dist.name}/.. filemode=755
include name=${dist.name}/bootstrap.sh/
include name=${dist.name}/build.sh/
@@ -1219,7 +1221,7 @@
/fileset
/zip
tar longfile=gnu
- destfile=${dist.base}/src/${dist.name}-src.tar
+ destfile=${dist.base.source}/${dist.name}-src.tar
tarfileset dir=${dist.name}/.. mode=755 username=ant
group=ant
include name=${dist.name}/bootstrap.sh/
include name=${dist.name}/build.sh/
@@ -1230,21 +1232,21 @@
exclude name=${dist.name}/build.sh/
/tarfileset
/tar
-gzip destfile=${dist.base}/src/${dist.name}-src.tar.gz
- src=${dist.base}/src/${dist.name}-src.tar/
-bzip2 destfile=${dist.base}/src/${dist.name}-src.tar.bz2
- src=${dist.base}/src/${dist.name}-src.tar/
-delete file=${dist.base}/src/${dist.name}-src.tar/
+gzip destfile=${dist.base.source}/${dist.name}-src.tar.gz
+ src=${dist.base.source}/${dist.name}-src.tar/
+bzip2 destfile=${dist.base.source}/${dist.name}-src.tar.bz2
+ src=${dist.base.source}/${dist.name}-src.tar/
+delete file=${dist.base.source}/${dist.name}-src.tar/
delete dir=${dist.name}/
checksum fileext=.md5
- fileset
cvs commit: ant build.xml
bodewig 2005/05/17 03:47:57
Modified:.build.xml
Log:
Exclude AbstractScriptComponent.java as well
Revision ChangesPath
1.469 +1 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- build.xml 17 May 2005 05:03:02 - 1.468
+++ build.xml 17 May 2005 10:47:57 - 1.469
@@ -248,7 +248,7 @@
or
filename name=${optional.package}/Script*/
filename name=${optional.package}/script/**/*/
- filename name=${optional.type.package}/Script*/
+ filename name=${optional.type.package}/*Script*/
filename name=${util.package}/Script*/
/or
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2005/05/10 06:57:48
Modified:.build.xml
Log:
Add SHA1 checksums, prepare stuff for
http://www.apache.org/dist/java-repository/
Revision ChangesPath
1.467 +32 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- build.xml 24 Mar 2005 08:29:42 - 1.466
+++ build.xml 10 May 2005 13:57:48 - 1.467
@@ -135,6 +135,8 @@
property name=src.dist.docs value=${src.dist.dir}/docs/
property name=src.dist.lib value=${src.dist.dir}/lib/
+ property name=java-repository.dir value=java-repository/ant/jars/
+
!--
===
Set up selectors to be used by javac, junit and jar to exclude
@@ -1188,9 +1190,11 @@
target name=main_distribution
description=-- creates the zip and tar distributions
delete dir=${dist.name}/
+delete dir=${java-repository.dir}/
mkdir dir=${dist.base}/
mkdir dir=${dist.base}/src/
mkdir dir=${dist.base}/bin/
+mkdir dir=${java-repository.dir}/
antcall inheritAll=false target=internal_dist
param name=dist.dir value=${dist.name}/
@@ -1231,6 +1235,20 @@
bzip2 destfile=${dist.base}/bin/${dist.name}-bin.tar.bz2
src=${dist.base}/bin/${dist.name}-bin.tar/
delete file=${dist.base}/bin/${dist.name}-bin.tar/
+
+copy todir=${java-repository.dir}
+ fileset dir=${dist.name}/lib
+include name=ant*.jar/
+ /fileset
+ mapper type=glob from=*.jar to=*-${version}.jar/
+/copy
+checksum fileext=.md5
+ fileset dir=${java-repository.dir} includes=*${version}.jar/
+/checksum
+checksum fileext=.sha1 algorithm=SHA
+ fileset dir=${java-repository.dir} includes=*${version}.jar/
+/checksum
+
delete dir=${dist.name}/
checksum fileext=.md5
fileset dir=${dist.base}/bin/
@@ -1239,6 +1257,13 @@
exclude name=**/*.md5/
/fileset
/checksum
+checksum fileext=.sha1 algorithm=SHA
+ fileset dir=${dist.base}/bin/
+include name=**/*/
+exclude name=**/*.asc/
+exclude name=**/*.md5/
+ /fileset
+/checksum
antcall inheritAll=false target=src-dist
param name=src.dist.dir value=${dist.name}/
@@ -1279,6 +1304,13 @@
exclude name=**/*.md5/
/fileset
/checksum
+checksum fileext=.sha1 algorithm=SHA
+ fileset dir=${dist.base}/src/
+include name=**/*/
+exclude name=**/*.asc/
+exclude name=**/*.md5/
+ /fileset
+/checksum
/target
target name=distribution depends=main_distribution
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2005/05/10 06:58:53
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
merge
Revision ChangesPath
No revision
No revision
1.392.2.42 +32 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.41
retrieving revision 1.392.2.42
diff -u -r1.392.2.41 -r1.392.2.42
--- build.xml 28 Apr 2005 13:12:30 - 1.392.2.41
+++ build.xml 10 May 2005 13:58:53 - 1.392.2.42
@@ -131,6 +131,8 @@
property name=src.dist.docs value=${src.dist.dir}/docs/
property name=src.dist.lib value=${src.dist.dir}/lib/
+ property name=java-repository.dir value=java-repository/ant/jars/
+
!--
===
Set up selectors to be used by javac, junit and jar to exclude
@@ -1127,9 +1129,11 @@
target name=main_distribution
description=-- creates the zip and tar distributions
delete dir=${dist.name}/
+delete dir=${java-repository.dir}/
mkdir dir=${dist.base}/
mkdir dir=${dist.base}/src/
mkdir dir=${dist.base}/bin/
+mkdir dir=${java-repository.dir}/
antcall inheritAll=false target=internal_dist
param name=dist.dir value=${dist.name}/
@@ -1170,6 +1174,20 @@
bzip2 destfile=${dist.base}/bin/${dist.name}-bin.tar.bz2
src=${dist.base}/bin/${dist.name}-bin.tar/
delete file=${dist.base}/bin/${dist.name}-bin.tar/
+
+copy todir=${java-repository.dir}
+ fileset dir=${dist.name}/lib
+include name=ant*.jar/
+ /fileset
+ mapper type=glob from=*.jar to=*-${version}.jar/
+/copy
+checksum fileext=.md5
+ fileset dir=${java-repository.dir} includes=*${version}.jar/
+/checksum
+checksum fileext=.sha1 algorithm=SHA
+ fileset dir=${java-repository.dir} includes=*${version}.jar/
+/checksum
+
delete dir=${dist.name}/
checksum fileext=.md5
fileset dir=${dist.base}/bin/
@@ -1178,6 +1196,13 @@
exclude name=**/*.md5/
/fileset
/checksum
+checksum fileext=.sha1 algorithm=SHA
+ fileset dir=${dist.base}/bin/
+include name=**/*/
+exclude name=**/*.asc/
+exclude name=**/*.md5/
+ /fileset
+/checksum
antcall inheritAll=false target=src-dist
param name=src.dist.dir value=${dist.name}/
@@ -1218,6 +1243,13 @@
exclude name=**/*.md5/
/fileset
/checksum
+checksum fileext=.sha1 algorithm=SHA
+ fileset dir=${dist.base}/src/
+include name=**/*/
+exclude name=**/*.asc/
+exclude name=**/*.md5/
+ /fileset
+/checksum
/target
target name=distribution depends=main_distribution
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
AW: cvs commit: ant build.xml
Betreff: cvs commit: ant build.xml
bodewig 2005/05/10 06:57:48
Modified:.build.xml
Log:
Add SHA1 checksums, prepare stuff for
http://www.apache.org/dist/java-repository/
+copy todir=${java-repository.dir}
+ fileset dir=${dist.name}/lib
+include name=ant*.jar/
+ /fileset
+ mapper type=glob from=*.jar to=*-${version}.jar/
+/copy
Wouldnt it be better to have the version in front of the name to get all
files together?
ant-1.6.3.jar
ant-1.6.4.jar
ant-jsch-1.6.3.jar
ant-jsch-1.6.4.jar
ant-optional-1.6.3.jar
ant-optional-1.6.4.jar
1.6.3-ant.jar
1.6.3-ant-jsch.jar
1.6.3-ant-optional.jar
1.6.4-ant.jar
1.6.4-ant-jsch.jar
1.6.4-ant-optional.jar
better would another directory ...
1.6.3\ant.jar, ...
1.6.4\ant.jar, ...
Just my 2ct
Jan
Re: cvs commit: ant build.xml
On Tue, 10 May 2005, Jan Materne [EMAIL PROTECTED] wrote: Wouldnt it be better to have the version in front of the name to get all files together? ant-1.6.3.jar ant-1.6.4.jar ant-jsch-1.6.3.jar ant-jsch-1.6.4.jar ant-optional-1.6.3.jar ant-optional-1.6.4.jar 1.6.3-ant.jar 1.6.3-ant-jsch.jar 1.6.3-ant-optional.jar 1.6.4-ant.jar 1.6.4-ant-jsch.jar 1.6.4-ant-optional.jar better would another directory ... 1.6.3\ant.jar, ... 1.6.4\ant.jar, ... Go to [EMAIL PROTECTED] and join the discussion. Chances are good that this has been discussed already (no idea, I'm not subscribed). The structure my patch creates is the structure the existing repo expects. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: cvs commit: ant build.xml
The structure my patch creates is the structure the existing repo expects. Oki-doki. Facts overtrump. Jan
cvs commit: ant build.xml
mbenson 2005/03/23 09:44:06
Modified:.build.xml
Log:
Heard no objections; add includetests property to narrow the batchtest.
Revision ChangesPath
1.465 +3 -2 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- build.xml 23 Mar 2005 14:09:05 - 1.464
+++ build.xml 23 Mar 2005 17:44:06 - 1.465
@@ -1487,6 +1487,8 @@
/or
/condition
+property name=includetests value=**/*Test* /
+
junit printsummary=${junit.summary}
haltonfailure=${test.haltonfailure}
filtertrace=${junit.filtertrace}
fork=${junit.fork} forkmode=${junit.forkmode}
@@ -1506,8 +1508,7 @@
formatter type=brief usefile=false/
batchtest
-fileset dir=${tests.dir}
- include name=**/*Test*/
+fileset dir=${tests.dir} includes=${includetests}
!-- abstract classes, not testcases --
exclude name=${taskdefs.package}/TaskdefsTest.java/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
mbenson 2005/03/11 11:34:00
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
Merge DirectoryScanner improvements;
disable ClasspathUtilsTest if tests.and.ant.share.classloader
PR: 33118
Revision ChangesPath
No revision
No revision
1.392.2.39 +8 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.38
retrieving revision 1.392.2.39
diff -u -r1.392.2.38 -r1.392.2.39
--- build.xml 18 Feb 2005 13:46:03 - 1.392.2.38
+++ build.xml 11 Mar 2005 19:34:00 - 1.392.2.39
@@ -1541,6 +1541,8 @@
!-- These tests only passes if testcases and Ant classes have
been loaded by the same classloader - will throw
IllegalAccessExceptions otherwise. --
+ exclude name=${ant.package}/DirectoryScannerTest.java
+ unless=tests.and.ant.share.classloader/
exclude name=${ant.package}/taskdefs/SQLExecTest.java
unless=tests.and.ant.share.classloader/
exclude name=${optional.package}/sos/SOSTest.java
@@ -1567,6 +1569,11 @@
!-- test needs special setup --
exclude name=${optional.package}/ssh/ScpTest.java/
+
+ !-- test fails if build/classes and ant.jar are using the same
+ classloader --
+ exclude name=${ant.package}/util/ClasspathUtilsTest.java
+if=tests.and.ant.share.classloader/
/fileset
/batchtest
/junit
@@ -1613,4 +1620,4 @@
description=-- creates a minimum distribution in ./dist
depends=dist-lite/
-/project
\ No newline at end of file
+/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2005/03/09 01:25:53
Modified:.build.xml
Log:
ClasspathUtilsTest fails for junit.fork=true as well
Revision ChangesPath
1.461 +3 -6 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- build.xml 7 Mar 2005 17:02:46 - 1.460
+++ build.xml 9 Mar 2005 09:25:52 - 1.461
@@ -597,10 +597,6 @@
classname=com.jcraft.jsch.Session
classpathref=classpath/
-condition property=running.in.gump
- isset property=gump.merge/
-/condition
-
condition property=build.compiler value=classic
not
isset property=jdk1.3+/
@@ -1643,9 +1639,10 @@
!-- test needs special setup --
exclude name=${optional.package}/ssh/ScpTest.java/
- !-- test fails in Gump --
+ !-- test fails if build/classes and ant.jar are using the same
+ classloader --
exclude name=${ant.package}/util/ClasspathUtilsTest.java
- if=running.in.gump/
+ if=tests.and.ant.share.classloader/
/fileset
/batchtest
/junit
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
stevel 2005/03/09 14:56:39
Modified:.build.xml
Added: src/etc/testcases/taskdefs apt.xml
src/etc/testcases/taskdefs/apt AptExample.java
Distributed.java DistributedAnnotationFactory.java
DistributedAnnotationProcessor.java
src/testcases/org/apache/tools/ant/taskdefs AptTest.java
Log:
Apt testing. We can say this works now :)
I do worry that the example Java1.5 code looks just like STL C++.
We also need to compare factorypath with classpath behaviour. But we can demo
that you can add new factories
Revision ChangesPath
1.1 ant/src/etc/testcases/taskdefs/apt.xml
Index: apt.xml
===
?xml version=1.0?
project basedir=.
!-- apt tests --
property name=build.dir location=aptbuild/classes /
property name=classes.dir location=${build.dir}/classes /
property name=classes2.dir location=${build.dir}/classes2 /
property name=preprocess.dir location=${build.dir}/source /
property name=src location=apt /
property name=AptExample.class location=${classes.dir}/AptExample.class
/
macrodef name=assertCompiled
attribute name=file /
sequential
fail message=not found: @{file}
condition
not
available file=@{file} /
/not
/condition
/fail
/sequential
/macrodef
presetdef name=assertAptExampleCompiled
assertCompiled file=${AptExample.class}/
/presetdef
target name=clean
delete dir=${build.dir}/
/target
target name=init
mkdir dir=${classes.dir}/
mkdir dir=${classes2.dir}/
mkdir dir=${preprocess.dir}/
/target
target name=testApt depends=init
apt srcdir=${src}
destdir=${classes.dir}
debug=on
compile=true
preprocessdir=${preprocess.dir}
/apt
assertAptExampleCompiled /
/target
target name=testAptFork depends=init
apt srcdir=${src}
destdir=${classes.dir}
debug=on
compile=true
fork=true
preprocessdir=${preprocess.dir}
/apt
assertAptExampleCompiled /
/target
target name=testListAnnotationTypes depends=init
apt srcdir=${src}
destdir=${classes.dir}
debug=on
compile=true
preprocessdir=${preprocess.dir}
compilerarg value=-XListAnnotationTypes /
compilerarg value=-Xlint:deprecation /
/apt
assertAptExampleCompiled /
/target
!-- use the factory we compiled. To avoid trouble
we deliver into a version in a new classpath, otherwise
the dependency logic will not run Apt--
target name=testAptNewFactory depends=testApt
apt srcdir=${src}
destdir=${classes2.dir}
debug=on
compile=true
factory=DistributedAnnotationFactory
preprocessdir=${preprocess.dir}
factorypath path=${classes.dir} /
option name=build.dir value=${build.dir} /
/apt
assertAptExampleCompiled /
/target
target name=testAptNewFactoryFork depends=testApt
apt srcdir=${src}
destdir=${classes2.dir}
debug=on
compile=true
factory=DistributedAnnotationFactory
preprocessdir=${preprocess.dir}
factorypath path=${classes.dir} /
option name=build.dir value=${build.dir} /
/apt
assertAptExampleCompiled /
/target
/project
1.1 ant/src/etc/testcases/taskdefs/apt/AptExample.java
Index: AptExample.java
===
/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
*/
@Distributed(
protocol=CORBA,
distribution=Distributed.DistributionTypes.FEDERATED
)
public class AptExample {
}
1.1 ant/src/etc/testcases/taskdefs/apt/Distributed.java
Index: Distributed.java
===
/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
cvs commit: ant build.xml
stevel 2005/03/07 05:42:52
Modified:.build.xml
Log:
Excluding XSD tests on systems without an adequate parser.
Revision ChangesPath
1.459 +21 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -r1.458 -r1.459
--- build.xml 23 Feb 2005 20:11:00 - 1.458
+++ build.xml 7 Mar 2005 13:42:52 - 1.459
@@ -343,6 +343,14 @@
exclude unless=run.failing.tests
name=${optional.package}/WsdlToDotnetTest.java/
/patternset
+ !--tests that need an XML Schema-supporting parser to work--
+ selector id=needs.xmlschema
+or
+ filename name=${optional.package}/SchemaValidateTest.*/
+ filename name=${optional.package}/XmlValidateTest.*/
+/or
+ /selector
+
!--
===
Set up a patternsets that matches the parts of our JUnit testsuite
@@ -599,6 +607,18 @@
/not
/condition
property name=build.compiler value=modern/
+
+!--check for XSD support in the parser--
+condition property=xmlschema.present
+ or
+parsersupports
+ feature=http://apache.org/xml/features/validation/schema/
+parsersupports
+ feature=http://java.sun.com/xml/jaxp/properties/schemaSource/
+ /or
+/condition
+
+
/target
@@ -681,6 +701,7 @@
selector refid=needs.jdepend unless=jdepend.present/
selector refid=needs.swing unless=swing.present/
selector refid=needs.jsch unless=jsch.present/
+selector refid=needs.xmlschema unless=xmlschema.present/
/or
/not
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
mbenson 2005/03/07 09:02:46
Modified:.build.xml
Log:
Move DirectoryScanner.getScannedDirs() to package-private access;
add DirectoryScannerTest to tests.and.ant.share.classloader tests.
Revision ChangesPath
1.460 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- build.xml 7 Mar 2005 13:42:52 - 1.459
+++ build.xml 7 Mar 2005 17:02:46 - 1.460
@@ -1612,6 +1612,8 @@
!-- These tests only passes if testcases and Ant classes have
been loaded by the same classloader - will throw
IllegalAccessExceptions otherwise. --
+ exclude name=${ant.package}/DirectoryScannerTest.java
+ unless=tests.and.ant.share.classloader/
exclude name=${ant.package}/taskdefs/SQLExecTest.java
unless=tests.and.ant.share.classloader/
exclude
name=${ant.package}/taskdefs/cvslib/ChangeLogWriterTest.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2005/02/23 12:00:49
Modified:.build.xml
Log:
Kaffe suddenly supports java.lang.Readable, but not InetAddress.isReachable
Revision ChangesPath
1.457 +9 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -r1.456 -r1.457
--- build.xml 18 Feb 2005 13:38:46 - 1.456
+++ build.xml 23 Feb 2005 20:00:48 - 1.457
@@ -158,6 +158,14 @@
/or
/selector
+ !-- Kaffe has some JDK 1.5 features including java.lang.Readable,
+ but not all of them --
+ selector id=not.in.kaffe
+or
+ filename
name=${ant.package}/taskdefs/optional/condition/IsPingable*/
+/or
+ /selector
+
selector id=needs.sun.uue
filename name=${ant.package}/taskdefs/email/UUMailer*/
/selector
@@ -639,6 +647,7 @@
selector refid=needs.jdk1.3+ unless=jdk1.3+/
selector refid=needs.jdk1.4+ unless=jdk1.4+/
selector refid=needs.jdk1.5+ unless=jdk1.5+/
+selector refid=not.in.kaffe unless=kaffe/
selector refid=needs.sun.uue unless=sunuue.present/
selector refid=needs.sun.b64 unless=base64.present/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2005/02/23 12:11:01 Modified:.build.xml Log: fix logic Revision ChangesPath 1.458 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.457 retrieving revision 1.458 diff -u -r1.457 -r1.458 --- build.xml 23 Feb 2005 20:00:48 - 1.457 +++ build.xml 23 Feb 2005 20:11:00 - 1.458 @@ -647,7 +647,7 @@ selector refid=needs.jdk1.3+ unless=jdk1.3+/ selector refid=needs.jdk1.4+ unless=jdk1.4+/ selector refid=needs.jdk1.5+ unless=jdk1.5+/ -selector refid=not.in.kaffe unless=kaffe/ +selector refid=not.in.kaffe if=kaffe/ selector refid=needs.sun.uue unless=sunuue.present/ selector refid=needs.sun.b64 unless=base64.present/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2005/02/18 05:46:03
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
merge
Revision ChangesPath
No revision
No revision
1.392.2.38 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.37
retrieving revision 1.392.2.38
diff -u -r1.392.2.37 -r1.392.2.38
--- build.xml 4 Feb 2005 08:13:45 - 1.392.2.37
+++ build.xml 18 Feb 2005 13:46:03 - 1.392.2.38
@@ -979,6 +979,7 @@
copy todir=${dist.dir}
fileset dir=.
include name=README/
+include name=INSTALL/
include name=LICENSE/
include name=LICENSE.xerces/
include name=LICENSE.dom/
@@ -1072,6 +1073,7 @@
copy todir=${src.dist.dir}
fileset dir=.
include name=README/
+include name=INSTALL/
include name=LICENSE/
include name=LICENSE.xerces/
include name=LICENSE.dom/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
mbenson 2005/02/16 09:40:07
Modified:.build.xml
Log:
Disable clone test until we know why it fails on Linux.
Revision ChangesPath
1.454 +2 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- build.xml 4 Feb 2005 08:08:58 - 1.453
+++ build.xml 16 Feb 2005 17:40:07 - 1.454
@@ -333,6 +333,7 @@
exclude unless=run.failing.tests
name=${optional.package}/jdepend/JDependTest.java/
exclude unless=run.failing.tests
name=${optional.package}/DotnetTest.java/
exclude unless=run.failing.tests
name=${optional.package}/WsdlToDotnetTest.java/
+exclude unless=run.failing.tests
name=${ant.package}/taskdefs/CloneTest.java/
/patternset
!--
@@ -1661,4 +1662,4 @@
description=-- creates a minimum distribution in ./dist
depends=dist-lite/
-/project
\ No newline at end of file
+/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2005/01/28 12:11:48
Modified:.build.xml
Log:
The new interface can't compile on Kaffe yet
Revision ChangesPath
1.450 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- build.xml 17 Jan 2005 21:57:29 - 1.449
+++ build.xml 28 Jan 2005 20:11:48 - 1.450
@@ -164,6 +164,7 @@
or
filename name=${optional.package}/Native2Ascii*/
filename name=${optional.package}/Javah*/
+ filename name=${optional.package}/native2ascii/*/
/or
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
Alexey N. Solofnenko wrote: Awesome! Can you write also scriptmapper? With current ant cvs one can use a filtermapper to use a scriptfilter: filtermapper scriptfilter language=beanshell self.setToken(self.getToken().toUpperCase()); /scriptfilter /filtermapper Peter - Alexey. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
Peter Reilly wrote: Alexey N. Solofnenko wrote: Awesome! Can you write also scriptmapper? With current ant cvs one can use a filtermapper to use a scriptfilter: filtermapper scriptfilter language=beanshell self.setToken(self.getToken().toUpperCase()); /scriptfilter /filtermapper We could think of adding scriptcondition ; something that lets you write arbitrary tests in a condition. That could be very useful in some places, I think. As an aside, I wasnt overwhelmed with the consistency of scripting-in-java stuff out there. -You must use rhino =1.5R5 for JavaScript; 1.5R6 and 1.6 are not compatible with BSH. -Jython is effectively dead (no updates since 2003; author now works in Redmond) -Groovy is in the tar pit of JCP standardisation, so may undergo indeterminate changes in the near future I went with javascript, but should maybe have gone with beanshell or or groovy. -steve - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
On Mon, 17 Jan 2005, Steve Loughran [EMAIL PROTECTED] wrote: -You must use rhino =1.5R5 for JavaScript; 1.5R6 and 1.6 are not compatible with BSH. Do you mean BSF? Gump caught a few of the problems, I vaguely recall Rhino adpted back to BSF, but I could be wrong. CVS HEAD of Apache BSF should work with newer Rhinos. BSF badly needs a release IMHO, but it probably needs committers in the first place. -Jython is effectively dead (no updates since 2003; author now works in Redmond) Is that the guy who did IronPython? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
Stefan Bodewig wrote: On Mon, 17 Jan 2005, Steve Loughran [EMAIL PROTECTED] wrote: -You must use rhino =1.5R5 for JavaScript; 1.5R6 and 1.6 are not compatible with BSH. Do you mean BSF? yes Gump caught a few of the problems, I vaguely recall Rhino adpted back to BSF, but I could be wrong. CVS HEAD of Apache BSF should work with newer Rhinos. BSF badly needs a release IMHO, but it probably needs committers in the first place. -Jython is effectively dead (no updates since 2003; author now works in Redmond) Is that the guy who did IronPython? yes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
stevel 2005/01/17 13:57:29
Modified:.build.xml
Log:
Fixing the exclusion path.
Revision ChangesPath
1.449 +2 -2 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- build.xml 16 Jan 2005 23:37:51 - 1.448
+++ build.xml 17 Jan 2005 21:57:29 - 1.449
@@ -1537,9 +1537,9 @@
unless=bsf.present/
exclude name=${optional.package}/BeanShellScriptTest.java
unless=beanshell.present/
- exclude name=${optional.type.package}/Script/*.java
+ exclude name=${optional.type.package}/Script*.java
unless=bsf.present/
- exclude name=${optional.type.package}/Script/*.java
+ exclude name=${optional.type.package}/Script*.java
unless=rhino.present/
!-- fail if testcases can be loaded from the system classloader
--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
stevel 2005/01/16 15:37:52
Modified:src/main/org/apache/tools/ant/types/optional
ScriptFilter.java
src/main/org/apache/tools/ant/util ScriptRunner.java
src/main/org/apache/tools/ant/types defaults.properties
src/main/org/apache/tools/ant/taskdefs/optional Script.java
docs/manual/CoreTypes selectors.html
.build.xml
Added: src/testcases/org/apache/tools/ant/types/optional
ScriptSelectorTest.java
src/main/org/apache/tools/ant/types/optional
ScriptSelector.java
src/etc/testcases/types/selectors scriptselector.xml
Log:
Adding scripting support to selectors. No personal need for this right now,
just rounding off what you can now do with mappers via filterchains
Revision ChangesPath
1.1
ant/src/testcases/org/apache/tools/ant/types/optional/ScriptSelectorTest.java
Index: ScriptSelectorTest.java
===
/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.tools.ant.types.optional;
import org.apache.tools.ant.BuildFileTest;
/**
* Test that scripting selection works. Needs scripting support to work
*/
public class ScriptSelectorTest extends BuildFileTest {
public ScriptSelectorTest(String name) {
super(name);
}
public void setUp() {
configureProject(src/etc/testcases/types/selectors/scriptselector.xml);
}
public void testNolanguage() {
expectBuildExceptionContaining(testNolanguage,
Absence of language attribute not detected,
script language must be specified);
}
public void testSelectionSetByDefault() {
executeTarget(testSelectionSetByDefault);
}
public void testSelectionSetWorks() {
executeTarget(testSelectionSetWorks);
}
public void testSelectionClearWorks() {
executeTarget(testSelectionClearWorks);
}
public void testFilenameAttribute() {
executeTarget(testFilenameAttribute);
}
public void testFileAttribute() {
executeTarget(testFileAttribute);
}
public void testBasedirAttribute() {
executeTarget(testBasedirAttribute);
}
}
1.11 +2 -9
ant/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java
Index: ScriptFilter.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ScriptFilter.java 9 Mar 2004 16:48:43 - 1.10
+++ ScriptFilter.java 16 Jan 2005 23:37:51 - 1.11
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -60,14 +60,7 @@
return;
}
initialized = true;
-
-runner.addBeans(getProject().getProperties());
-runner.addBeans(getProject().getUserProperties());
-runner.addBeans(getProject().getTargets());
-runner.addBeans(getProject().getReferences());
-
-runner.addBean(project, getProject());
-runner.addBean(self, this);
+runner.bindToComponent(this);
}
/**
1.1
ant/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java
Index: ScriptSelector.java
===
/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR
Re: cvs commit: ant build.xml
Awesome! Can you write also scriptmapper? - Alexey. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2005/01/13 01:01:58
Modified:.build.xml
Log:
regexp mapper test requires a regexp engine
Revision ChangesPath
1.447 +3 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- build.xml 17 Dec 2004 15:07:42 - 1.446
+++ build.xml 13 Jan 2005 09:01:58 - 1.447
@@ -4,7 +4,7 @@
===
Apache Ant own build file
- Copyright (c) 2000-2004 The Apache Software Foundation. All rights
+ Copyright (c) 2000-2005 The Apache Software Foundation. All rights
reserved.
===
@@ -1522,6 +1522,8 @@
exclude name=${optional.package}/sitraka/*.java
unless=some.regexp.support/
exclude
name=${ant.package}/types/selectors/ContainsRegexpTest.java
+ unless=some.regexp.support/
+ exclude
name=${ant.package}/types/mappers/RegexpPatternMapperTest.java
unless=some.regexp.support/
exclude name=${optional.package}/Rhino*.java
unless=bsf.present/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/12/16 06:06:59
Modified:.build.xml
Log:
SplashScreenTest can't be compiled without SplashTask
Revision ChangesPath
1.445 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- build.xml 13 Dec 2004 10:11:31 - 1.444
+++ build.xml 16 Dec 2004 14:06:59 - 1.445
@@ -174,6 +174,7 @@
selector id=needs.sun.b64
or
filename name=${optional.package}/splash/SplashTask*/
+ filename name=${optional.package}/splash/SplashScreenTest.java/
/or
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/12/13 02:11:31
Modified:.build.xml
Log:
Temporarily skip test that fail in Gump because of a Gump bug
Revision ChangesPath
1.444 +8 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- build.xml 7 Dec 2004 09:10:39 - 1.443
+++ build.xml 13 Dec 2004 10:11:31 - 1.444
@@ -588,6 +588,10 @@
available property=jsch.present
classname=com.jcraft.jsch.Session
classpathref=classpath/
+
+condition property=running.in.gump
+ isset property=gump.merge/
+/condition
/target
@@ -1599,6 +1603,10 @@
!-- test needs special setup --
exclude name=${optional.package}/ssh/ScpTest.java/
+
+ !-- test fails in Gump --
+ exclude name=${ant.package}/util/ClasspathUtilsTest.java
+ if=running.in.gump/
/fileset
/batchtest
/junit
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
Thanks,
I had meant to place a warning on the test that it may fail in gump.
Peter
[EMAIL PROTECTED] wrote:
bodewig 2004/12/13 02:11:31
Modified:.build.xml
Log:
Temporarily skip test that fail in Gump because of a Gump bug
Revision ChangesPath
1.444 +8 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- build.xml 7 Dec 2004 09:10:39 - 1.443
+++ build.xml 13 Dec 2004 10:11:31 - 1.444
@@ -588,6 +588,10 @@
available property=jsch.present
classname=com.jcraft.jsch.Session
classpathref=classpath/
+
+condition property=running.in.gump
+ isset property=gump.merge/
+/condition
/target
@@ -1599,6 +1603,10 @@
!-- test needs special setup --
exclude name=${optional.package}/ssh/ScpTest.java/
+
+ !-- test fails in Gump --
+ exclude name=${ant.package}/util/ClasspathUtilsTest.java
+ if=running.in.gump/
/fileset
/batchtest
/junit
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
jglick 2004/12/07 01:10:39
Modified:src/testcases/org/apache/tools/ant/util FileUtilsTest.java
src/testcases/org/apache/tools/ant/types/selectors
PresentSelectorTest.java BaseSelectorTest.java
src/testcases/org/apache/tools/ant/types XMLCatalogTest.java
PathTest.java FilterSetTest.java
CommandlineJavaTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/junit
JUnitReportTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/i18n
TranslateTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional
ReplaceRegExpTest.java PropertyFileTest.java
JspcTest.java ANTLRTest.java
src/testcases/org/apache/tools/ant/taskdefs
XmlPropertyTest.java TouchTest.java TarTest.java
ManifestTest.java InitializeClassTest.java
ImportTest.java FixCrLfTest.java ExecTaskTest.java
src/testcases/org/apache/tools/ant DirectoryScannerTest.java
BuildFileTest.java
.build.xml
Log:
Trying to make unit tests independent of CWD.
Revision ChangesPath
1.30 +13 -8
ant/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
Index: FileUtilsTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- FileUtilsTest.java8 Aug 2004 21:03:21 - 1.29
+++ FileUtilsTest.java7 Dec 2004 09:10:38 - 1.30
@@ -322,18 +322,18 @@
* Test contentEquals
*/
public void testContentEquals() throws IOException {
-assertTrue(Non existing files, fu.contentEquals(new File(foo),
- new File(bar)));
+assertTrue(Non existing files, fu.contentEquals(new
File(System.getProperty(root), foo),
+ new
File(System.getProperty(root), bar)));
assertTrue(One exists, the other one doesn\'t,
- !fu.contentEquals(new File(foo), new
File(build.xml)));
+ !fu.contentEquals(new File(System.getProperty(root),
foo), new File(System.getProperty(root), build.xml)));
assertTrue(Don\'t compare directories,
- !fu.contentEquals(new File(src), new File(src)));
+ !fu.contentEquals(new File(System.getProperty(root),
src), new File(System.getProperty(root), src)));
assertTrue(File equals itself,
- fu.contentEquals(new File(build.xml),
-new File(build.xml)));
+ fu.contentEquals(new File(System.getProperty(root),
build.xml),
+new File(System.getProperty(root),
build.xml)));
assertTrue(Files are different,
- !fu.contentEquals(new File(build.xml),
- new File(docs.xml)));
+ !fu.contentEquals(new File(System.getProperty(root),
build.xml),
+ new File(System.getProperty(root),
docs.xml)));
}
/**
@@ -409,9 +409,14 @@
assertEquals(file:///SYS:/foo, fu.toURI(sys:\\foo));
}
assertEquals(file:/// + dosRoot + foo, fu.toURI(/foo));
+/* May fail if the directory ${user.dir}/foo/ exists
+ * (and anyway is the tested behavior actually desirable?):
assertEquals(file:./foo, fu.toURI(./foo));
+ */
assertEquals(file:/// + dosRoot + foo, fu.toURI(\\foo));
+/* See above:
assertEquals(file:./foo, fu.toURI(.\\foo));
+ */
assertEquals(file:/// + dosRoot + foo%20bar, fu.toURI(/foo
bar));
assertEquals(file:/// + dosRoot + foo%20bar, fu.toURI(\\foo
bar));
assertEquals(file:/// + dosRoot + foo%23bar,
fu.toURI(/foo#bar));
1.9 +1 -1
ant/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
Index: PresentSelectorTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PresentSelectorTest.java 9 Mar 2004 16:49:07 - 1.8
+++ PresentSelectorTest.java 7 Dec 2004 09:10:38 - 1.9
@@ -108,7 +108,7 @@
assertEquals(, results);
s = (PresentSelector)getInstance();
cvs commit: ant build.xml
bodewig 2004/11/12 02:04:39
Modified:.build.xml
Log:
ChangeLogWriterTest uses package private class ChangeLogWriter - doesn't work
unless both come from the same classloader
Revision ChangesPath
1.442 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- build.xml 3 Nov 2004 10:54:00 - 1.441
+++ build.xml 12 Nov 2004 10:04:39 - 1.442
@@ -1572,6 +1572,8 @@
IllegalAccessExceptions otherwise. --
exclude name=${ant.package}/taskdefs/SQLExecTest.java
unless=tests.and.ant.share.classloader/
+ exclude
name=${ant.package}/taskdefs/cvslib/ChangeLogWriterTest.java
+ unless=tests.and.ant.share.classloader/
exclude name=${optional.package}/sos/SOSTest.java
unless=tests.and.ant.share.classloader/
exclude name=${optional.package}/vss/MSVSSTest.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
stevel 2004/11/03 02:54:00
Modified:.build.xml
Log:
remove httpclient selector. Leave the test in for future use.
Revision ChangesPath
1.441 +0 -8 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- build.xml 2 Nov 2004 23:37:20 - 1.440
+++ build.xml 3 Nov 2004 10:54:00 - 1.441
@@ -328,10 +328,6 @@
filename name=${ant.package}/launch/**/*/
/selector
- selector id=needs.apache-httpclient
- /selector
-
-
patternset id=onlinetests
exclude name=**/GetTest.java if=offline/
exclude name=**/SignJarTest.java if=offline/
@@ -674,8 +670,6 @@
selector refid=needs.jdepend unless=jdepend.present/
selector refid=needs.swing unless=swing.present/
selector refid=needs.jsch unless=jsch.present/
-selector refid=needs.apache-httpclient
- unless=apache-httpclient.present/
/or
/not
/selector
@@ -850,7 +844,6 @@
selector refid=needs.jdepend/
selector refid=needs.swing/
selector refid=needs.jsch/
-selector refid=needs.apache-httpclient/
/or
/not
/and
@@ -895,7 +888,6 @@
optional-jar dep=swing/
optional-jar dep=jsch/
optional-jar dep=jdepend/
-optional-jar dep=apache-httpclient/
jar destfile=${build.lib}/${optional.jars.prefix}-weblogic.jar
basedir=${build.classes}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/10/28 02:38:25
Modified:.build.xml
Log:
More Mono trouble on Brutus
Revision ChangesPath
1.437 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- build.xml 26 Oct 2004 10:21:11 - 1.436
+++ build.xml 28 Oct 2004 09:38:24 - 1.437
@@ -345,6 +345,7 @@
exclude unless=run.failing.tests
name=${optional.package}/BeanShellScriptTest.java/
exclude unless=run.failing.tests
name=${optional.package}/jdepend/JDependTest.java/
exclude unless=run.failing.tests
name=${optional.package}/DotnetTest.java/
+exclude unless=run.failing.tests
name=${optional.package}/WsdlToDotnetTest.java/
/patternset
!--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/10/26 03:21:11 Modified:.build.xml Log: Replace all is dangerous Revision ChangesPath 1.436 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.435 retrieving revision 1.436 diff -u -r1.435 -r1.436 --- build.xml 26 Oct 2004 10:12:20 - 1.435 +++ build.xml 26 Oct 2004 10:21:11 - 1.436 @@ -571,7 +571,7 @@ condition property=apache-httpclient.present and available - classname=org.apache.apache-httpclient.HttpClient + classname=org.apache.commons.httpclient.HttpClient classpathref=classpath/ isset property=commons.logging.present/ /and - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/10/19 07:29:22
Modified:.build.xml
Log:
disable .NET tests until Mono on Brutus works as it should
Revision ChangesPath
1.433 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- build.xml 8 Oct 2004 08:59:47 - 1.432
+++ build.xml 19 Oct 2004 14:29:21 - 1.433
@@ -339,6 +339,7 @@
!-- an unless-attribute on each exclude-element.
--
exclude unless=run.failing.tests
name=${optional.package}/BeanShellScriptTest.java/
exclude unless=run.failing.tests
name=${optional.package}/jdepend/JDependTest.java/
+exclude unless=run.failing.tests
name=${optional.package}/DotnetTest.java/
/patternset
!--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
Seems this change made something not happy on the JDK1.4 that Gump runs
(namely, that below). Does the bootstrap-ant script need to be aware of some
conditional compilation?
-
... Bootstrapping Ant Distribution
... Compiling Ant Classes
src/main/org/apache/tools/ant/taskdefs/condition/IsPingable.java:81: cannot
resolve symbol
symbol : method isReachable (int)
location: class java.net.InetAddress
return address.isReachable(timeout*1000);
^
Note: Some input files use or override a deprecated API.
Note: Recompile with -deprecation for details.
1 error
... Failed compiling Ant classes !
-
regards
Adam
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Thursday, October 07, 2004 4:54 PM
Subject: cvs commit: ant build.xml
stevel 2004/10/07 15:54:32
Modified:.build.xml
Added: src/main/org/apache/tools/ant/taskdefs/condition
IsPingable.java
Log:
First of the Java1.5 extensions. Closest j2se has for detecting offline
state, though I note J2ME and JavaWebStart have offline tests.
Needs tests.
Revision ChangesPath
1.1
ant/src/main/org/apache/tools/ant/taskdefs/condition/IsPingable.java
Index: IsPingable.java
===
/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.tools.ant.taskdefs.condition;
import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.io.IOException;
/**
* Test for a host being reachable using ICMP ping packets.
* Ping packets are very reliable for assessing reachability in a LAN or
WAN,
* but they do not get through any well-configured firewall.
*
* This condition turns unknown host exceptions into false conditions.
This is
* because on a laptop, DNS is one of the first services when the
network goes; you
* are implicitly offline.
* Requires Java1.5+ to work
* @since Ant1.7
*/
public class IsPingable extends ProjectComponent implements Condition {
private String host;
public static final int DEFAULT_TIMEOUT = 30;
private int timeout=DEFAULT_TIMEOUT;
public static final String ERROR_NO_HOSTNAME = No hostname
defined;
public static final String ERROR_BAD_TIMEOUT = Invalid timeout
value;
public static final String ERROR_UNKNOWN_HOST = Unknown host:;
public static final String ERROR_ON_NETWORK = network error to ;
/**
* the host to ping
* @param host
*/
public void setHost(String host) {
this.host = host;
}
/**
* timeout for the reachability test -in seconds
* @param timeout
*/
public void setTimeout(int timeout) {
this.timeout = timeout;
}
/**
* Is this condition true?
*
* @return true if the condition is true
* @throws org.apache.tools.ant.BuildException
* if an error occurs
*/
public boolean eval() throws BuildException {
if(host==null host.length()==0) {
throw new BuildException(ERROR_NO_HOSTNAME);
}
if(timeout0) {
throw new BuildException(ERROR_BAD_TIMEOUT);
}
try {
InetAddress address=InetAddress.getByName(host);
return address.isReachable(timeout*1000);
} catch (UnknownHostException e) {
log(ERROR_UNKNOWN_HOST+host,Project.MSG_VERBOSE);
return false;
} catch (IOException e) {
log(ERROR_ON_NETWORK + host +: +e.toString(),
Project.MSG_VERBOSE);
return false;
}
}
}
1.431 +7 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- build.xml 3 Oct 2004 14:06:52 - 1.430
+++ build.xml 7
cvs commit: ant build.xml
stevel 2004/10/08 01:59:48
Modified:.build.xml
Log:
update selector to go with the move
Revision ChangesPath
1.432 +1 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- build.xml 7 Oct 2004 22:54:32 - 1.431
+++ build.xml 8 Oct 2004 08:59:47 - 1.432
@@ -154,7 +154,7 @@
selector id=needs.jdk1.5+
or
- filename name=${ant.package}/taskdefs/condition/IsPingable*/
+ filename
name=${ant.package}/taskdefs/optional/condition/IsPingable*/
/or
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
stevel 2004/10/07 15:54:32
Modified:.build.xml
Added: src/main/org/apache/tools/ant/taskdefs/condition
IsPingable.java
Log:
First of the Java1.5 extensions. Closest j2se has for detecting offline
state, though I note J2ME and JavaWebStart have offline tests.
Needs tests.
Revision ChangesPath
1.1
ant/src/main/org/apache/tools/ant/taskdefs/condition/IsPingable.java
Index: IsPingable.java
===
/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.tools.ant.taskdefs.condition;
import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.io.IOException;
/**
* Test for a host being reachable using ICMP ping packets.
* Ping packets are very reliable for assessing reachability in a LAN or WAN,
* but they do not get through any well-configured firewall.
*
* This condition turns unknown host exceptions into false conditions. This is
* because on a laptop, DNS is one of the first services when the network
goes; you
* are implicitly offline.
* Requires Java1.5+ to work
* @since Ant1.7
*/
public class IsPingable extends ProjectComponent implements Condition {
private String host;
public static final int DEFAULT_TIMEOUT = 30;
private int timeout=DEFAULT_TIMEOUT;
public static final String ERROR_NO_HOSTNAME = No hostname defined;
public static final String ERROR_BAD_TIMEOUT = Invalid timeout value;
public static final String ERROR_UNKNOWN_HOST = Unknown host:;
public static final String ERROR_ON_NETWORK = network error to ;
/**
* the host to ping
* @param host
*/
public void setHost(String host) {
this.host = host;
}
/**
* timeout for the reachability test -in seconds
* @param timeout
*/
public void setTimeout(int timeout) {
this.timeout = timeout;
}
/**
* Is this condition true?
*
* @return true if the condition is true
* @throws org.apache.tools.ant.BuildException
* if an error occurs
*/
public boolean eval() throws BuildException {
if(host==null host.length()==0) {
throw new BuildException(ERROR_NO_HOSTNAME);
}
if(timeout0) {
throw new BuildException(ERROR_BAD_TIMEOUT);
}
try {
InetAddress address=InetAddress.getByName(host);
return address.isReachable(timeout*1000);
} catch (UnknownHostException e) {
log(ERROR_UNKNOWN_HOST+host,Project.MSG_VERBOSE);
return false;
} catch (IOException e) {
log(ERROR_ON_NETWORK + host +: +e.toString(),
Project.MSG_VERBOSE);
return false;
}
}
}
1.431 +7 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- build.xml 3 Oct 2004 14:06:52 - 1.430
+++ build.xml 7 Oct 2004 22:54:32 - 1.431
@@ -152,6 +152,12 @@
/or
/selector
+ selector id=needs.jdk1.5+
+or
+ filename name=${ant.package}/taskdefs/condition/IsPingable*/
+/or
+ /selector
+
!-- classes that should be present in Sun based JVMs, but not in
Kaffe for example --
selector id=needs.sun.tools
@@ -637,6 +643,7 @@
or
selector refid=needs.jdk1.3+ unless=jdk1.3+/
selector refid=needs.jdk1.4+ unless=jdk1.4+/
+selector refid=needs.jdk1.5+ unless=jdk1.5+/
selector refid=needs.sun.tools unless=sun.tools.present/
selector refid=needs.sun.uue unless=sunuue.present/
selector refid=needs.sun.b64 unless=base64.present/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands,
cvs commit: ant build.xml
stevel 2004/10/03 07:06:52
Modified:.build.xml
Log:
clean machines reveal invalid assumptions
Revision ChangesPath
1.430 +4 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- build.xml 30 Sep 2004 09:38:02 - 1.429
+++ build.xml 3 Oct 2004 14:06:52 - 1.430
@@ -907,6 +907,10 @@
depends=compile-tests
description=-- creates the Apache Ant Test Utilties jar
+fail unless=junit.present
+ We cannot build the test jar unless JUnit is present,
+ as JUnit is needed to compile the test classes.
+/fail
jar destfile=${build.lib}/${name}-testutil.jar
basedir=${build.tests}
patternset refid=useful.tests/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/09/30 02:38:02
Modified:.build.xml
Log:
tests are on system classpath of forked tests
Revision ChangesPath
1.429 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- build.xml 12 Aug 2004 14:16:48 - 1.428
+++ build.xml 30 Sep 2004 09:38:02 - 1.429
@@ -534,6 +534,7 @@
!-- absolute paths in CLASSPATH --
contains string=${java.class.path}
substring=${build.tests.resolved}/
+istrue value=${junit.fork}/
/or
/condition
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
conor 2004/08/12 07:16:48 Modified:.build.xml Log: Add name attribute to project element in Ant's build file PR: 30608 Submitted by: Jesse Glick Revision ChangesPath 1.428 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.427 retrieving revision 1.428 diff -u -w -u -r1.427 -r1.428 --- build.xml 30 Jul 2004 06:34:36 - 1.427 +++ build.xml 12 Aug 2004 14:16:48 - 1.428 @@ -9,7 +9,7 @@ === -- -project default=main basedir=. +project name=apache-ant default=main basedir=. !-- Give user a chance to override without editing this file (and without typing -D each time it compiles it) -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/07/29 23:34:36
Modified:.build.xml
Log:
We can now savely run all .NET tests on Mono
Revision ChangesPath
1.427 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- build.xml 27 Jul 2004 14:24:56 - 1.426
+++ build.xml 30 Jul 2004 06:34:36 - 1.427
@@ -563,6 +563,7 @@
echo level=verbose wsdl.found=${wsdl.found}/echo
condition property=csc.found
or
+available file=mcs filepath=${env.PATH}/
available file=csc filepath=${env.PATH}/
available file=csc.exe filepath=${env.PATH}/
available file=csc.exe filepath=${env.Path}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml WHATSNEW
antoine 2004/07/27 00:02:08
Modified:src/testcases/org/apache/tools/ant AntClassLoaderTest.java
src/main/org/apache/tools/ant/util CollectionUtils.java
src/main/org/apache/tools/ant AntClassLoader.java
.build.xml WHATSNEW
Log:
Impossible to use implicit classpath for taskdef when Ant core loader !=
Java application loader and Path.systemClassPath taken from ${java.class.path}
PR: 30161
Submitted by: Jesse Glick (jglick at netbeans dot org)
Revision ChangesPath
1.8 +65 -2
ant/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java
Index: AntClassLoaderTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AntClassLoaderTest.java 9 Mar 2004 16:48:56 - 1.7
+++ AntClassLoaderTest.java 27 Jul 2004 07:02:06 - 1.8
@@ -16,8 +16,20 @@
*/
package org.apache.tools.ant;
-import org.apache.tools.ant.types.Path;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
import junit.framework.TestCase;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.FileUtils;
/**
* Test case for ant class loader
@@ -70,5 +82,56 @@
fail(loader should not fail even if project finished);
}
}
+
+/** Sample resource present in build/testcases/ */
+private static final String TEST_RESOURCE =
org/apache/tools/ant/IncludeTest.class;
+
+public void testFindResources() throws Exception {
+//System.err.println(loading from: +
AntClassLoader.class.getProtectionDomain().getCodeSource().getLocation());
+// See bug #30161.
+// This path should contain the class files for these testcases:
+String buildTestcases = System.getProperty(build.tests);
+assertNotNull(defined ${build.tests}, buildTestcases);
+assertTrue(have a dir + buildTestcases, new
File(buildTestcases).isDirectory());
+Path path = new Path(p, buildTestcases);
+// A special parent loader which is not the system class loader:
+ClassLoader parent = new ParentLoader();
+// An AntClassLoader which is supposed to delegate to the parent and
then to the disk path:
+ClassLoader acl = new AntClassLoader(parent, p, path, true);
+// The intended result URLs:
+URL urlFromPath = new
URL(FileUtils.newFileUtils().toURI(buildTestcases) + TEST_RESOURCE);
+URL urlFromParent = new URL(http://ant.apache.org/; +
TEST_RESOURCE);
+assertEquals(correct resources (regular delegation order),
+Arrays.asList(new URL[] {urlFromParent, urlFromPath}),
+enum2List(acl.getResources(TEST_RESOURCE)));
+acl = new AntClassLoader(parent, p, path, false);
+assertEquals(correct resources (reverse delegation order),
+Arrays.asList(new URL[] {urlFromPath, urlFromParent}),
+enum2List(acl.getResources(TEST_RESOURCE)));
+}
+
+private static List enum2List(Enumeration e) {
+// JDK 1.4: return Collections.list(e);
+List l = new ArrayList();
+while (e.hasMoreElements()) {
+l.add(e.nextElement());
+}
+return l;
+}
+
+/** Special loader that just knows how to find TEST_RESOURCE. */
+private static final class ParentLoader extends ClassLoader {
+
+public ParentLoader() {}
+
+protected Enumeration findResources(String name) throws IOException {
+if (name.equals(TEST_RESOURCE)) {
+return Collections.enumeration(Collections.singleton(new
URL(http://ant.apache.org/; + name)));
+} else {
+return Collections.enumeration(Collections.EMPTY_SET);
+}
+}
+
+}
+
}
-
1.15 +35 -0
ant/src/main/org/apache/tools/ant/util/CollectionUtils.java
Index: CollectionUtils.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/CollectionUtils.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CollectionUtils.java 9 Mar 2004 16:48:51 - 1.14
+++ CollectionUtils.java 27 Jul 2004 07:02:06 - 1.15
@@ -113,4 +113,39 @@
}
}
+/**
+ * Append one enumeration to another.
+ *
cvs commit: ant build.xml WHATSNEW
antoine 2004/07/27 00:15:11
Modified:src/testcases/org/apache/tools/ant Tag: ANT_16_BRANCH
AntClassLoaderTest.java
src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
CollectionUtils.java
src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
AntClassLoader.java
.Tag: ANT_16_BRANCH build.xml WHATSNEW
Log:
Merge from HEAD
solve problem :
Impossible to use implicit classpath for taskdef when Ant core loader !=
Java application loader and Path.systemClassPath taken from ${java.class.path}
PR: 30161
Submitted by: Jesse Glick (jglick at netbeans dot org)
Revision ChangesPath
No revision
No revision
1.3.2.5 +65 -2
ant/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java
Index: AntClassLoaderTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- AntClassLoaderTest.java 9 Mar 2004 17:02:00 - 1.3.2.4
+++ AntClassLoaderTest.java 27 Jul 2004 07:15:09 - 1.3.2.5
@@ -16,8 +16,20 @@
*/
package org.apache.tools.ant;
-import org.apache.tools.ant.types.Path;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
import junit.framework.TestCase;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.FileUtils;
/**
* Test case for ant class loader
@@ -70,5 +82,56 @@
fail(loader should not fail even if project finished);
}
}
+
+/** Sample resource present in build/testcases/ */
+private static final String TEST_RESOURCE =
org/apache/tools/ant/IncludeTest.class;
+
+public void testFindResources() throws Exception {
+//System.err.println(loading from: +
AntClassLoader.class.getProtectionDomain().getCodeSource().getLocation());
+// See bug #30161.
+// This path should contain the class files for these testcases:
+String buildTestcases = System.getProperty(build.tests);
+assertNotNull(defined ${build.tests}, buildTestcases);
+assertTrue(have a dir + buildTestcases, new
File(buildTestcases).isDirectory());
+Path path = new Path(p, buildTestcases);
+// A special parent loader which is not the system class loader:
+ClassLoader parent = new ParentLoader();
+// An AntClassLoader which is supposed to delegate to the parent and
then to the disk path:
+ClassLoader acl = new AntClassLoader(parent, p, path, true);
+// The intended result URLs:
+URL urlFromPath = new
URL(FileUtils.newFileUtils().toURI(buildTestcases) + TEST_RESOURCE);
+URL urlFromParent = new URL(http://ant.apache.org/; +
TEST_RESOURCE);
+assertEquals(correct resources (regular delegation order),
+Arrays.asList(new URL[] {urlFromParent, urlFromPath}),
+enum2List(acl.getResources(TEST_RESOURCE)));
+acl = new AntClassLoader(parent, p, path, false);
+assertEquals(correct resources (reverse delegation order),
+Arrays.asList(new URL[] {urlFromPath, urlFromParent}),
+enum2List(acl.getResources(TEST_RESOURCE)));
+}
+
+private static List enum2List(Enumeration e) {
+// JDK 1.4: return Collections.list(e);
+List l = new ArrayList();
+while (e.hasMoreElements()) {
+l.add(e.nextElement());
+}
+return l;
+}
+
+/** Special loader that just knows how to find TEST_RESOURCE. */
+private static final class ParentLoader extends ClassLoader {
+
+public ParentLoader() {}
+
+protected Enumeration findResources(String name) throws IOException {
+if (name.equals(TEST_RESOURCE)) {
+return Collections.enumeration(Collections.singleton(new
URL(http://ant.apache.org/; + name)));
+} else {
+return Collections.enumeration(Collections.EMPTY_SET);
+}
+}
+
+}
+
}
-
No revision
No revision
1.10.2.5 +35 -0
ant/src/main/org/apache/tools/ant/util/CollectionUtils.java
Index: CollectionUtils.java
===
RCS file:
cvs commit: ant build.xml
bodewig 2004/07/27 07:24:56
Modified:.build.xml
Log:
new tests fail if the tests themselves live on the system classloader
Revision ChangesPath
1.426 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- build.xml 27 Jul 2004 07:02:07 - 1.425
+++ build.xml 27 Jul 2004 14:24:56 - 1.426
@@ -1516,6 +1516,8 @@
unless=beanshell.present/
!-- fail if testcases can be loaded from the system classloader
--
+ exclude name=${ant.package}/AntClassLoaderDelegationTest.java
+ if=tests.are.on.system.classpath/
exclude name=${optional.package}/junit/JUnitClassLoaderTest.java
if=tests.are.on.system.classpath/
exclude name=${optional.package}/sitraka/XMLReportTest.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/07/27 07:25:10
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
merge
Revision ChangesPath
No revision
No revision
1.392.2.35 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.34
retrieving revision 1.392.2.35
diff -u -r1.392.2.34 -r1.392.2.35
--- build.xml 27 Jul 2004 07:15:10 - 1.392.2.34
+++ build.xml 27 Jul 2004 14:25:09 - 1.392.2.35
@@ -1516,6 +1516,8 @@
unless=beanshell.present/
!-- fail if testcases can be loaded from the system classloader
--
+ exclude name=${ant.package}/AntClassLoaderDelegationTest.java
+ if=tests.are.on.system.classpath/
exclude name=${optional.package}/junit/JUnitClassLoaderTest.java
if=tests.are.on.system.classpath/
exclude name=${optional.package}/sitraka/XMLReportTest.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
mbenson 2004/07/09 15:38:40
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
Merge
Revision ChangesPath
No revision
No revision
1.392.2.32 +6 -3 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.31
retrieving revision 1.392.2.32
diff -u -r1.392.2.31 -r1.392.2.32
--- build.xml 2 Jul 2004 08:42:22 - 1.392.2.31
+++ build.xml 9 Jul 2004 22:38:39 - 1.392.2.32
@@ -146,6 +146,7 @@
selector id=needs.jdk1.4+
or
filename name=${regexp.package}/Jdk14Regexp*/
+ filename name=${ant.package}/types/AssertionsTest.java/
/or
/selector
@@ -1431,9 +1432,9 @@
Run testcase
===
--
- target name=test depends=run-tests description=-- run JUnit tests/
+ target name=test depends=run-tests,run-single-test description=--
run JUnit tests/
- target name=run-tests depends=dump-info,compile-tests,probe-offline
if=junit.present
+ target name=run-tests depends=dump-info,compile-tests,probe-offline
if=junit.present unless=testcase
condition property=run.junitreport
or
@@ -1569,6 +1570,8 @@
unless=tests.and.ant.share.classloader/
exclude name=${ant.package}/taskdefs/ProcessDestroyerTest.java
unless=tests.and.ant.share.classloader/
+ exclude
name=${ant.package}/taskdefs/ProtectedJarMethodsTest.java
+ unless=tests.and.ant.share.classloader/
!-- can only run if cvs is installed on your machine
enable by setting the property have.cvs
@@ -1590,7 +1593,7 @@
target name=run-single-test if=testcase
depends=compile-tests,run-single-test-only
description=-- runs the single unit test defined in the testcase
property/
- target name=run-single-test-only
+ target name=run-single-test-only if=testcase
description=-- runs the single unit test defined in the testcase
property
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml WHATSNEW
bodewig 2004/06/02 05:09:46
Modified:.build.xml WHATSNEW
Log:
Xalan2Executor doesn't need Xalan-J 2
Revision ChangesPath
1.422 +1 -7 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- build.xml 25 May 2004 11:36:40 - 1.421
+++ build.xml 2 Jun 2004 12:09:45 - 1.422
@@ -172,6 +172,7 @@
!-- depends on external libraries --
selector id=needs.trax
or
+ filename name=${optional.package}/junit/Xalan2Executor*/
filename name=${optional.package}/TraXLiaison*/
filename name=${optional.package}/sitraka/**/
filename name=${optional.package}/metamata/MMetrics*/
@@ -187,10 +188,6 @@
/or
/selector
- selector id=needs.xalan2
-filename name=${optional.package}/junit/Xalan2Executor*/
- /selector
-
selector id=needs.xslp
filename name=${optional.package}/XslpLiaison*/
/selector
@@ -642,7 +639,6 @@
selector refid=needs.trax unless=trax.present/
selector refid=needs.xalan1 unless=xalan.present/
-selector refid=needs.xalan2 unless=xalan2.present/
selector refid=needs.xslp unless=xslp.present/
selector refid=needs.apache-resolver
unless=apache.resolver.present/
selector refid=needs.junit unless=junit.present/
@@ -820,7 +816,6 @@
or
selector refid=needs.trax/
selector refid=needs.xalan1/
-selector refid=needs.xalan2/
selector refid=needs.xslp/
selector refid=needs.apache-resolver/
selector refid=needs.junit/
@@ -868,7 +863,6 @@
optional-jar dep=trax/
optional-jar dep=xalan1/
-optional-jar dep=xalan2/
optional-jar dep=xslp/
optional-jar dep=apache-resolver/
optional-jar dep=junit/
1.610 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -r1.609 -r1.610
--- WHATSNEW 31 May 2004 08:21:02 - 1.609
+++ WHATSNEW 2 Jun 2004 12:09:45 - 1.610
@@ -37,6 +37,10 @@
* The import task used the canonical version of a file path. This
has been changed to use the absolute path. Bugzilla 28505.
+* ant-xalan2.jar has been removed since the only class contained in it
+ didn't depend on Xalan-J 2 at all. Its sole dependency has always
+ been TraX and so it has been merged into ant-trax.jar.
+
Fixed bugs:
---
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/05/25 04:37:02 Modified:.Tag: ANT_16_BRANCH build.xml Log: merge Revision ChangesPath No revision No revision 1.392.2.28 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.392.2.27 retrieving revision 1.392.2.28 diff -u -r1.392.2.27 -r1.392.2.28 --- build.xml 20 May 2004 08:34:32 - 1.392.2.27 +++ build.xml 25 May 2004 11:37:02 - 1.392.2.28 @@ -391,7 +391,7 @@ target name=check_for_optional_packages available property=jdk1.3+ classname=java.lang.StrictMath/ available property=jdk1.4+ classname=java.lang.CharSequence/ -available property=jdk1.5+ classname=java.util.concurrent.Callable/ +available property=jdk1.5+ classname=java.lang.Readable/ available property=kaffe classname=kaffe.util.NotImplemented/ available property=bsf.present classname=org.apache.bsf.BSFManager - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/05/20 01:34:13
Modified:.build.xml
Log:
build.xml source=1.2 does not work for javac 1.4.0
use a presetdef depending on the java version
Revision ChangesPath
1.420 +28 -7 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- build.xml 17 May 2004 13:22:11 - 1.419
+++ build.xml 20 May 2004 08:34:13 - 1.420
@@ -364,12 +364,35 @@
!--
===
+ Set up a preset def for javac depending on
+ the java version
+ ===
+ --
+
+ target name=javac.preset depends=javac.preset.1.5+,javac.preset.1.5-/
+ target name=javac.preset.1.5+ depends=check_for_optional_packages
+ if=jdk1.5+
+presetdef name=javac.preset
+ javac source=${javac.source}/
+/presetdef
+ /target
+ target name=javac.preset.1.5- depends=check_for_optional_packages
+ unless=jdk1.5+
+presetdef name=javac.preset
+ javac/
+/presetdef
+ /target
+
+
+ !--
+ ===
Check to see what optional dependencies are available
===
--
target name=check_for_optional_packages
available property=jdk1.3+ classname=java.lang.StrictMath/
available property=jdk1.4+ classname=java.lang.CharSequence/
+available property=jdk1.5+ classname=java.util.concurrent.Callable/
available property=kaffe classname=kaffe.util.NotImplemented/
available property=bsf.present
classname=org.apache.bsf.BSFManager
@@ -594,18 +617,17 @@
===
--
target name=build
- depends=prepare, check_for_optional_packages
+ depends=prepare, check_for_optional_packages, javac.preset
description=-- compiles the source code
mkdir dir=${build.dir}/
mkdir dir=${build.classes}/
mkdir dir=${build.lib}/
-javac srcdir=${java.dir}
+javac.preset srcdir=${java.dir}
destdir=${build.classes}
debug=${debug}
deprecation=${deprecation}
target=${javac.target}
- source=${javac.source}
optimize=${optimize}
classpath refid=classpath/
@@ -652,7 +674,7 @@
/or
/not
/selector
-/javac
+/javac.preset
copy todir=${build.classes}
fileset dir=${java.dir}
@@ -1352,16 +1374,15 @@
target name=compile-tests depends=build if=junit.present
mkdir dir=${build.tests}/
-javac srcdir=${tests.dir}
+javac.preset srcdir=${tests.dir}
destdir=${build.tests}
debug=${debug}
target=${javac.target}
- source=${javac.source}
deprecation=${deprecation}
classpath refid=tests-classpath/
selector refid=conditional-patterns/
-/javac
+/javac.preset
!-- Used by AntlibTest.testAntlibResource: --
jar
jarfile=${build.tests}/org/apache/tools/ant/taskdefs/test2-antlib.jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/05/20 01:34:32
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
sync with head
Revision ChangesPath
No revision
No revision
1.392.2.27 +28 -7 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.26
retrieving revision 1.392.2.27
diff -u -r1.392.2.26 -r1.392.2.27
--- build.xml 17 May 2004 13:22:52 - 1.392.2.26
+++ build.xml 20 May 2004 08:34:32 - 1.392.2.27
@@ -363,12 +363,35 @@
!--
===
+ Set up a preset def for javac depending on
+ the java version
+ ===
+ --
+
+ target name=javac.preset depends=javac.preset.1.5+,javac.preset.1.5-/
+ target name=javac.preset.1.5+ depends=check_for_optional_packages
+ if=jdk1.5+
+presetdef name=javac.preset
+ javac source=${javac.source}/
+/presetdef
+ /target
+ target name=javac.preset.1.5- depends=check_for_optional_packages
+ unless=jdk1.5+
+presetdef name=javac.preset
+ javac/
+/presetdef
+ /target
+
+
+ !--
+ ===
Check to see what optional dependencies are available
===
--
target name=check_for_optional_packages
available property=jdk1.3+ classname=java.lang.StrictMath/
available property=jdk1.4+ classname=java.lang.CharSequence/
+available property=jdk1.5+ classname=java.util.concurrent.Callable/
available property=kaffe classname=kaffe.util.NotImplemented/
available property=bsf.present
classname=org.apache.bsf.BSFManager
@@ -593,18 +616,17 @@
===
--
target name=build
- depends=prepare, check_for_optional_packages
+ depends=prepare, check_for_optional_packages, javac.preset
description=-- compiles the source code
mkdir dir=${build.dir}/
mkdir dir=${build.classes}/
mkdir dir=${build.lib}/
-javac srcdir=${java.dir}
+javac.preset srcdir=${java.dir}
destdir=${build.classes}
debug=${debug}
deprecation=${deprecation}
target=${javac.target}
- source=${javac.source}
optimize=${optimize}
classpath refid=classpath/
@@ -651,7 +673,7 @@
/or
/not
/selector
-/javac
+/javac.preset
copy todir=${build.classes}
fileset dir=${java.dir}
@@ -1351,16 +1373,15 @@
target name=compile-tests depends=build if=junit.present
mkdir dir=${build.tests}/
-javac srcdir=${tests.dir}
+javac.preset srcdir=${tests.dir}
destdir=${build.tests}
debug=${debug}
target=${javac.target}
- source=${javac.source}
deprecation=${deprecation}
classpath refid=tests-classpath/
selector refid=conditional-patterns/
-/javac
+/javac.preset
!-- Used by AntlibTest.testAntlibResource: --
jar
jarfile=${build.tests}/org/apache/tools/ant/taskdefs/test2-antlib.jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/05/17 06:22:12
Modified:.build.xml
Log:
Permit building under JDK 1.5
PR: 28996
Obtained from: Jesse Glick
Revision ChangesPath
1.419 +5 -2 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- build.xml 27 Apr 2004 07:44:46 - 1.418
+++ build.xml 17 May 2004 13:22:11 - 1.419
@@ -48,7 +48,8 @@
property name=chmod.maxparallel value=250/
property name=deprecation value=false/
property name=optimize value=true/
- property name=javac.target value=1.1/
+ property name=javac.target value=1.2/
+ property name=javac.source value=1.2/
property name=junit.fork value=false/
property name=junit.filtertrace value=off/
property name=junit.summary value=no/
@@ -604,6 +605,7 @@
debug=${debug}
deprecation=${deprecation}
target=${javac.target}
+ source=${javac.source}
optimize=${optimize}
classpath refid=classpath/
@@ -1354,6 +1356,7 @@
destdir=${build.tests}
debug=${debug}
target=${javac.target}
+ source=${javac.source}
deprecation=${deprecation}
classpath refid=tests-classpath/
@@ -1610,4 +1613,4 @@
description=-- creates a minimum distribution in ./dist
depends=dist-lite/
-/project
\ No newline at end of file
+/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/05/17 06:22:53
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
sync
Revision ChangesPath
No revision
No revision
1.392.2.26 +5 -2 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.25
retrieving revision 1.392.2.26
diff -u -r1.392.2.25 -r1.392.2.26
--- build.xml 27 Apr 2004 07:45:47 - 1.392.2.25
+++ build.xml 17 May 2004 13:22:52 - 1.392.2.26
@@ -48,7 +48,8 @@
property name=chmod.maxparallel value=250/
property name=deprecation value=false/
property name=optimize value=true/
- property name=javac.target value=1.1/
+ property name=javac.target value=1.2/
+ property name=javac.source value=1.2/
property name=junit.fork value=false/
property name=junit.filtertrace value=off/
property name=junit.summary value=no/
@@ -603,6 +604,7 @@
debug=${debug}
deprecation=${deprecation}
target=${javac.target}
+ source=${javac.source}
optimize=${optimize}
classpath refid=classpath/
@@ -1353,6 +1355,7 @@
destdir=${build.tests}
debug=${debug}
target=${javac.target}
+ source=${javac.source}
deprecation=${deprecation}
classpath refid=tests-classpath/
@@ -1607,4 +1610,4 @@
description=-- creates a minimum distribution in ./dist
depends=dist-lite/
-/project
\ No newline at end of file
+/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2004/03/26 05:08:11
Modified:.build.xml
Log:
Log4J is no longer a Jakarta subproject, don't wait for the others to
graduate as well.
Revision ChangesPath
1.415 +24 -24ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- build.xml 1 Mar 2004 17:24:24 - 1.414
+++ build.xml 26 Mar 2004 13:08:11 - 1.415
@@ -201,11 +201,11 @@
filename name=${optional.package}/junit/**/
/selector
- selector id=needs.jakarta-regexp
+ selector id=needs.apache-regexp
filename name=${regexp.package}/JakartaRegexp*/
/selector
- selector id=needs.jakarta-oro
+ selector id=needs.apache-oro
or
filename name=${regexp.package}/JakartaOro*/
filename name=${optional.package}/perforce/*/
@@ -213,7 +213,7 @@
/or
/selector
- selector id=needs.jakarta-bcel
+ selector id=needs.apache-bcel
or
filename name=${ant.package}/filters/util/JavaClassHelper*/
filename name=${util.package}/depend/bcel/*/
@@ -221,7 +221,7 @@
/or
/selector
- selector id=needs.jakarta-log4j
+ selector id=needs.apache-log4j
filename name=${ant.package}/listener/Log4jListener*/
/selector
@@ -427,10 +427,10 @@
available property=stylebook.present
classname=org.apache.stylebook.Engine
classpathref=classpath/
-available property=jakarta.regexp.present
+available property=apache.regexp.present
classname=org.apache.regexp.RE
classpathref=classpath/
-available property=jakarta.oro.present
+available property=apache.oro.present
classname=org.apache.oro.text.regex.Perl5Matcher
classpathref=classpath/
available property=jmf.present
@@ -480,8 +480,8 @@
condition property=some.regexp.support
or
isset property=jdk1.4+/
-isset property=jakarta.regexp.present/
-isset property=jakarta.oro.present/
+isset property=apache.regexp.present/
+isset property=apache.oro.present/
/or
/condition
@@ -621,11 +621,11 @@
selector refid=needs.xslp unless=xslp.present/
selector refid=needs.apache-resolver
unless=apache.resolver.present/
selector refid=needs.junit unless=junit.present/
-selector refid=needs.jakarta-regexp
- unless=jakarta.regexp.present/
-selector refid=needs.jakarta-oro
unless=jakarta.oro.present/
-selector refid=needs.jakarta-bcel unless=bcel.present/
-selector refid=needs.jakarta-log4j unless=log4j.present/
+selector refid=needs.apache-regexp
+ unless=apache.regexp.present/
+selector refid=needs.apache-oro unless=apache.oro.present/
+selector refid=needs.apache-bcel unless=bcel.present/
+selector refid=needs.apache-log4j unless=log4j.present/
selector refid=needs.commons-logging
unless=commons.logging.present/
selector refid=needs.apache-bsf unless=bsf.present/
@@ -733,10 +733,10 @@
filename name=${optional.type.package}/**/
filename name=${util.package}/depend/**/
filename name=${util.package}/optional/**/
-selector refid=needs.jakarta-log4j/
+selector refid=needs.apache-log4j/
selector refid=needs.commons-logging/
-selector refid=needs.jakarta-regexp/
-selector refid=needs.jakarta-oro/
+selector refid=needs.apache-regexp/
+selector refid=needs.apache-oro/
selector refid=needs.jdk1.4+/
selector refid=needs.javamail/
selector refid=ant.launcher/
@@ -799,10 +799,10 @@
selector refid=needs.xslp/
selector refid=needs.apache-resolver/
selector refid=needs.junit/
-selector refid=needs.jakarta-regexp/
-selector refid=needs.jakarta-oro/
-selector refid=needs.jakarta-bcel/
-selector refid=needs.jakarta-log4j/
+selector refid=needs.apache-regexp/
+selector refid=needs.apache-oro/
+selector refid=needs.apache-bcel/
+selector refid=needs.apache-log4j/
selector refid=needs.commons-logging/
selector refid=needs.apache-bsf/
selector refid=needs.stylebook/
@@ -847,10 +847,10 @@
optional-jar dep=xslp/
optional-jar dep=apache-resolver/
optional-jar dep=junit/
-optional-jar dep=jakarta-regexp/
cvs commit: ant build.xml
bodewig 2004/03/26 05:08:29
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
merge
Revision ChangesPath
No revision
No revision
1.392.2.23 +24 -24ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.22
retrieving revision 1.392.2.23
diff -u -r1.392.2.22 -r1.392.2.23
--- build.xml 1 Mar 2004 17:25:26 - 1.392.2.22
+++ build.xml 26 Mar 2004 13:08:29 - 1.392.2.23
@@ -200,11 +200,11 @@
filename name=${optional.package}/junit/**/
/selector
- selector id=needs.jakarta-regexp
+ selector id=needs.apache-regexp
filename name=${regexp.package}/JakartaRegexp*/
/selector
- selector id=needs.jakarta-oro
+ selector id=needs.apache-oro
or
filename name=${regexp.package}/JakartaOro*/
filename name=${optional.package}/perforce/*/
@@ -212,7 +212,7 @@
/or
/selector
- selector id=needs.jakarta-bcel
+ selector id=needs.apache-bcel
or
filename name=${ant.package}/filters/util/JavaClassHelper*/
filename name=${util.package}/depend/bcel/*/
@@ -220,7 +220,7 @@
/or
/selector
- selector id=needs.jakarta-log4j
+ selector id=needs.apache-log4j
filename name=${ant.package}/listener/Log4jListener*/
/selector
@@ -426,10 +426,10 @@
available property=stylebook.present
classname=org.apache.stylebook.Engine
classpathref=classpath/
-available property=jakarta.regexp.present
+available property=apache.regexp.present
classname=org.apache.regexp.RE
classpathref=classpath/
-available property=jakarta.oro.present
+available property=apache.oro.present
classname=org.apache.oro.text.regex.Perl5Matcher
classpathref=classpath/
available property=jmf.present
@@ -479,8 +479,8 @@
condition property=some.regexp.support
or
isset property=jdk1.4+/
-isset property=jakarta.regexp.present/
-isset property=jakarta.oro.present/
+isset property=apache.regexp.present/
+isset property=apache.oro.present/
/or
/condition
@@ -620,11 +620,11 @@
selector refid=needs.xslp unless=xslp.present/
selector refid=needs.apache-resolver
unless=apache.resolver.present/
selector refid=needs.junit unless=junit.present/
-selector refid=needs.jakarta-regexp
- unless=jakarta.regexp.present/
-selector refid=needs.jakarta-oro
unless=jakarta.oro.present/
-selector refid=needs.jakarta-bcel unless=bcel.present/
-selector refid=needs.jakarta-log4j unless=log4j.present/
+selector refid=needs.apache-regexp
+ unless=apache.regexp.present/
+selector refid=needs.apache-oro unless=apache.oro.present/
+selector refid=needs.apache-bcel unless=bcel.present/
+selector refid=needs.apache-log4j unless=log4j.present/
selector refid=needs.commons-logging
unless=commons.logging.present/
selector refid=needs.apache-bsf unless=bsf.present/
@@ -732,10 +732,10 @@
filename name=${optional.type.package}/**/
filename name=${util.package}/depend/**/
filename name=${util.package}/optional/**/
-selector refid=needs.jakarta-log4j/
+selector refid=needs.apache-log4j/
selector refid=needs.commons-logging/
-selector refid=needs.jakarta-regexp/
-selector refid=needs.jakarta-oro/
+selector refid=needs.apache-regexp/
+selector refid=needs.apache-oro/
selector refid=needs.jdk1.4+/
selector refid=needs.javamail/
selector refid=ant.launcher/
@@ -798,10 +798,10 @@
selector refid=needs.xslp/
selector refid=needs.apache-resolver/
selector refid=needs.junit/
-selector refid=needs.jakarta-regexp/
-selector refid=needs.jakarta-oro/
-selector refid=needs.jakarta-bcel/
-selector refid=needs.jakarta-log4j/
+selector refid=needs.apache-regexp/
+selector refid=needs.apache-oro/
+selector refid=needs.apache-bcel/
+selector refid=needs.apache-log4j/
selector refid=needs.commons-logging/
selector refid=needs.apache-bsf/
selector refid=needs.stylebook/
@@ -846,10 +846,10 @@
optional-jar dep=xslp/
optional-jar dep=apache-resolver/
optional-jar dep=junit/
-
cvs commit: ant build.xml
jhm 2004/03/01 09:24:24
Modified:.build.xml
Log:
Make conform to used encoding.
Revision ChangesPath
1.414 +1 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- build.xml 1 Mar 2004 15:10:37 - 1.413
+++ build.xml 1 Mar 2004 17:24:24 - 1.414
@@ -328,7 +328,7 @@
patternset id=teststhatfail
!-- Property 'run.failing.tests' should force Ant to run these tests.
--
-!-- Because the whole patternset can´t be excluded, you have to add
--
+!-- Because the whole patternset can not be excluded, you have to add
--
!-- an unless-attribute on each exclude-element.
--
exclude unless=run.failing.tests
name=${optional.package}/BeanShellScriptTest.java/
exclude unless=run.failing.tests
name=${optional.package}/jdepend/JDependTest.java/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
jhm 2004/03/01 09:25:26
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
Make conform to used encoding.
Revision ChangesPath
No revision
No revision
1.392.2.22 +1 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.21
retrieving revision 1.392.2.22
diff -u -r1.392.2.21 -r1.392.2.22
--- build.xml 1 Mar 2004 15:13:11 - 1.392.2.21
+++ build.xml 1 Mar 2004 17:25:26 - 1.392.2.22
@@ -327,7 +327,7 @@
patternset id=teststhatfail
!-- Property 'run.failing.tests' should force Ant to run these tests.
--
-!-- Because the whole patternset can´t be excluded, you have to add
--
+!-- Because the whole patternset can not be excluded, you have to add
--
!-- an unless-attribute on each exclude-element.
--
exclude unless=run.failing.tests
name=${optional.package}/BeanShellScriptTest.java/
exclude unless=run.failing.tests
name=${optional.package}/jdepend/JDependTest.java/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: ant build.xml
I do not know whether the problem is difficult to fix, I did not put much my nose in the Project/ProjectHelper2/InstrospectionHelper and tutti quanti core classes. Same for me. It was easy to write the test - but I don´t know to write the fix. I think that Jan just wants to avoid getting every day the nag from gump. We know each other :) I hope that someone will fix it though. 8-) dito Jan
cvs commit: ant build.xml
jhm 2004/02/26 08:35:26
Modified:.build.xml
Log:
Exclude ProjectTest from being executed (hopefully :), because of
testDuplicateTarget.
Revision ChangesPath
1.411 +7 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- build.xml 23 Feb 2004 14:14:36 - 1.410
+++ build.xml 26 Feb 2004 16:35:26 - 1.411
@@ -329,6 +329,13 @@
patternset id=teststhatfail
exclude name=${optional.package}/BeanShellScriptTest.java/
exclude name=${optional.package}/jdepend/JDependTest.java/
+!-- The org.apache.tools.ant.ProjectTest.testDuplicateTargets fails.
+This is a known problem. It was noticed that duplicate targets were
+not detected in ant 1.6.*, so a test was put in. But no code was put in
+to fix the problem!
+see http://marc.theaimsgroup.com/?l=ant-devm=107756336622453w=2
+--
+exclude name=${ant.package}/ProjectTest.java/
/patternset
!--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: ant build.xml
I guess finding the regression is just one aspect of the equation, but I'm
kind of surprised this is simply put on the back burner like that...
Is this a difficult problem to fix? Or people simply don't mind getting on
error on duplicate targets? --DD
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
jhm 2004/02/26 08:35:26
Exclude ProjectTest from being executed (hopefully :), because of
testDuplicateTarget.
+!-- The org.apache.tools.ant.ProjectTest.testDuplicateTargets
fails.
+This is a known problem. It was noticed that duplicate targets were
+not detected in ant 1.6.*, so a test was put in. But no code was
put in
+to fix the problem!
+see http://marc.theaimsgroup.com/?l=ant-devm=107756336622453w=2
+--
+exclude name=${ant.package}/ProjectTest.java/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
Dominique Devienne wrote: I guess finding the regression is just one aspect of the equation, but I'm kind of surprised this is simply put on the back burner like that... Is this a difficult problem to fix? Or people simply don't mind getting on error on duplicate targets? --DD I do not know whether the problem is difficult to fix, I did not put much my nose in the Project/ProjectHelper2/InstrospectionHelper and tutti quanti core classes. I think that Jan just wants to avoid getting every day the nag from gump. I hope that someone will fix it though. 8-) Antoine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: ant build.xml
I did not remove the dependency... There was a change last week (409) to make target test depend on target run-single-test. I assume this was to allow: ant test -Dtestcase= Yep: ant test -- ant run-tests-- use all testcases ant test -Dtestcase=... -- ant run-single-test -- use only the specified testcase So it´s easier to test what you´re working on :) Jan
RE: cvs commit: ant build.xml
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] I did not remove the dependency... There was a change last week (409) to make target test depend on target run-single-test. I assume this was to allow: ant test -Dtestcase= Yep: ant test -- ant run-tests-- use all testcases ant test -Dtestcase=... -- ant run-single-test -- use only the specified testcase So it´s easier to test what you´re working on :) That's what I've been doing for ages in my projects, with a single test target, and a testcases property. You can thus run all tests (use the default testcases value of **/test/*Test.class), or a single test (testcases=com/acme/test/MyTest.class) or an group of related tests (testcases=com/acme/selectors/test/*Test.class). Maybe it doesn't apply to Ant, which the optional dependencies and all, but it works quite well in most projects. --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
[EMAIL PROTECTED] wrote: Hi Peter, I do not understand why you removed the dependency of run-single-test upon compile-tests,run-single-test-only There must be a good reason but I am surprised. Antoine peterreilly2004/02/23 06:14:36 Modified:.build.xml Log: allow ./build.sh test to work Revision ChangesPath 1.410 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.409 retrieving revision 1.410 diff -u -r1.409 -r1.410 --- build.xml 18 Feb 2004 08:11:36 - 1.409 +++ build.xml 23 Feb 2004 14:14:36 - 1.410 @@ -1568,7 +1568,7 @@ target name=run-single-test if=testcase depends=compile-tests,run-single-test-only description=-- runs the single unit test defined in the testcase property/ - target name=run-single-test-only + target name=run-single-test-only if=testcase description=-- runs the single unit test defined in the testcase property - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
Antoine Lévy-Lambert wrote: [EMAIL PROTECTED] wrote: Hi Peter, I do not understand why you removed the dependency of run-single-test upon compile-tests,run-single-test-only There must be a good reason but I am surprised. I did not remove the dependency... There was a change last week (409) to make target test depend on target run-single-test. I assume this was to allow: ant test -Dtestcase= It meant however that if ant test succeeds, it will then attempt to do the run-single-test target, and this fails because testcase is not defined. This was not noticed as the ProjectTest test fails. opps, now I see the confusion, your e-mail reader must have chopped the depend=... part of the change. Peter Antoine peterreilly2004/02/23 06:14:36 Modified:.build.xml Log: allow ./build.sh test to work Revision ChangesPath 1.410 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.409 retrieving revision 1.410 diff -u -r1.409 -r1.410 --- build.xml18 Feb 2004 08:11:36 -1.409 +++ build.xml23 Feb 2004 14:14:36 -1.410 @@ -1568,7 +1568,7 @@ target name=run-single-test if=testcase depends=compile-tests,run-single-test-only description=-- runs the single unit test defined in the testcase property/ - target name=run-single-test-only + target name=run-single-test-only if=testcase description=-- runs the single unit test defined in the testcase property - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
jhm 2004/02/18 00:11:36
Modified:.build.xml
Log:
Let 'testcase'-property choose the right target for running tests.
Revision ChangesPath
1.409 +4 -4 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- build.xml 5 Feb 2004 20:44:02 - 1.408
+++ build.xml 18 Feb 2004 08:11:36 - 1.409
@@ -1355,7 +1355,7 @@
selector refid=conditional-patterns/
/javac
-
+
!-- Used by AntlibTest.testAntlibResource: --
jar
jarfile=${build.tests}/org/apache/tools/ant/taskdefs/test2-antlib.jar
zipfileset dir=${tests.etc.dir}
fullpath=taskdefs/test.antlib.xml
@@ -1409,9 +1409,9 @@
Run testcase
===
--
- target name=test depends=run-tests description=-- run JUnit tests/
+ target name=test depends=run-tests,run-single-test description=--
run JUnit tests/
- target name=run-tests depends=dump-info,compile-tests,probe-offline
if=junit.present
+ target name=run-tests depends=dump-info,compile-tests,probe-offline
if=junit.present unless=testcase
condition property=run.junitreport
or
@@ -1604,4 +1604,4 @@
description=-- creates a minimum distribution in ./dist
depends=dist-lite/
-/project
+/project
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/01/13 04:32:16
Modified:.build.xml
Log:
stop corruption of .zip files in docs
PR: 25698
Obtained from: Jesse Glick
Revision ChangesPath
1.405 +8 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- build.xml 3 Dec 2003 21:58:07 - 1.404
+++ build.xml 13 Jan 2004 12:32:16 - 1.405
@@ -957,8 +957,16 @@
copy todir=${dist.docs}
fileset dir=${docs.dir} excludes=${unfiltered.files}
patternset refid=site.excludes/
+exclude name=**/*.zip/
/fileset
filterchain refid=ant.filters/
+/copy
+
+copy todir=${dist.docs}
+ fileset dir=${docs.dir} excludes=${unfiltered.files}
+include name=**/*.zip/
+patternset refid=site.excludes/
+ /fileset
/copy
copy todir=${dist.docs} filtering=false
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/01/13 04:33:15
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
sync with HEAD
Revision ChangesPath
No revision
No revision
1.392.2.15 +8 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.14
retrieving revision 1.392.2.15
diff -u -r1.392.2.14 -r1.392.2.15
--- build.xml 16 Dec 2003 14:48:10 - 1.392.2.14
+++ build.xml 13 Jan 2004 12:33:15 - 1.392.2.15
@@ -956,8 +956,16 @@
copy todir=${dist.docs}
fileset dir=${docs.dir} excludes=${unfiltered.files}
patternset refid=site.excludes/
+exclude name=**/*.zip/
/fileset
filterchain refid=ant.filters/
+/copy
+
+copy todir=${dist.docs}
+ fileset dir=${docs.dir} excludes=${unfiltered.files}
+include name=**/*.zip/
+patternset refid=site.excludes/
+ /fileset
/copy
copy todir=${dist.docs} filtering=false
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/01/13 04:37:47
Modified:.build.xml
Log:
correct fix for 25698
Revision ChangesPath
1.406 +1 -9 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- build.xml 13 Jan 2004 12:32:16 - 1.405
+++ build.xml 13 Jan 2004 12:37:47 - 1.406
@@ -53,7 +53,7 @@
property name=junit.filtertrace value=off/
property name=junit.summary value=no/
property name=test.haltonfailure value=yes /
- property name=unfiltered.files
value=**/*.gif,**/*.jpg,**/*.ico,**/*.pdf/
+ property name=unfiltered.files
value=**/*.gif,**/*.jpg,**/*.ico,**/*.pdf,**/*.zip/
!--
===
@@ -957,16 +957,8 @@
copy todir=${dist.docs}
fileset dir=${docs.dir} excludes=${unfiltered.files}
patternset refid=site.excludes/
-exclude name=**/*.zip/
/fileset
filterchain refid=ant.filters/
-/copy
-
-copy todir=${dist.docs}
- fileset dir=${docs.dir} excludes=${unfiltered.files}
-include name=**/*.zip/
-patternset refid=site.excludes/
- /fileset
/copy
copy todir=${dist.docs} filtering=false
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/01/13 04:38:23
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
sync with HEAD
Revision ChangesPath
No revision
No revision
1.392.2.16 +1 -9 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.15
retrieving revision 1.392.2.16
diff -u -r1.392.2.15 -r1.392.2.16
--- build.xml 13 Jan 2004 12:33:15 - 1.392.2.15
+++ build.xml 13 Jan 2004 12:38:23 - 1.392.2.16
@@ -53,7 +53,7 @@
property name=junit.filtertrace value=off/
property name=junit.summary value=no/
property name=test.haltonfailure value=yes /
- property name=unfiltered.files
value=**/*.gif,**/*.jpg,**/*.ico,**/*.pdf/
+ property name=unfiltered.files
value=**/*.gif,**/*.jpg,**/*.ico,**/*.pdf,**/*.zip/
!--
===
@@ -956,16 +956,8 @@
copy todir=${dist.docs}
fileset dir=${docs.dir} excludes=${unfiltered.files}
patternset refid=site.excludes/
-exclude name=**/*.zip/
/fileset
filterchain refid=ant.filters/
-/copy
-
-copy todir=${dist.docs}
- fileset dir=${docs.dir} excludes=${unfiltered.files}
-include name=**/*.zip/
-patternset refid=site.excludes/
- /fileset
/copy
copy todir=${dist.docs} filtering=false
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/01/13 04:39:54 Modified:.build.xml Log: Date Revision ChangesPath 1.407 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.406 retrieving revision 1.407 diff -u -r1.406 -r1.407 --- build.xml 13 Jan 2004 12:37:47 - 1.406 +++ build.xml 13 Jan 2004 12:39:53 - 1.407 @@ -4,7 +4,7 @@ === Apache Ant own build file - Copyright (c) 2000-2003 The Apache Software Foundation. All rights + Copyright (c) 2000-2004 The Apache Software Foundation. All rights reserved. === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2004/01/13 04:40:32 Modified:.Tag: ANT_16_BRANCH build.xml Log: Date Revision ChangesPath No revision No revision 1.392.2.17 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.392.2.16 retrieving revision 1.392.2.17 diff -u -r1.392.2.16 -r1.392.2.17 --- build.xml 13 Jan 2004 12:38:23 - 1.392.2.16 +++ build.xml 13 Jan 2004 12:40:32 - 1.392.2.17 @@ -4,7 +4,7 @@ === Apache Ant own build file - Copyright (c) 2000-2003 The Apache Software Foundation. All rights + Copyright (c) 2000-2004 The Apache Software Foundation. All rights reserved. === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
antoine 2003/12/04 14:38:16 Modified:.Tag: ANT_16_BRANCH build.xml Log: ant 1.6 beta3 Revision ChangesPath No revision No revision 1.392.2.13 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.392.2.12 retrieving revision 1.392.2.13 diff -u -r1.392.2.12 -r1.392.2.13 --- build.xml 3 Dec 2003 22:06:41 - 1.392.2.12 +++ build.xml 4 Dec 2003 22:38:16 - 1.392.2.13 @@ -25,7 +25,7 @@ -- property name=Name value=Apache Ant/ property name=name value=ant/ - property name=version value=1.6beta2/ + property name=version value=1.6beta3/ property name=manifest-version value=1.6/ property name=bootstrap.jar value=ant-bootstrap.jar/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2003/12/03 02:27:00
Modified:.build.xml
Log:
exclude jdepend test until dos problem with the test is sorted
Revision ChangesPath
1.402 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- build.xml 24 Oct 2003 10:16:16 - 1.401
+++ build.xml 3 Dec 2003 10:27:00 - 1.402
@@ -328,6 +328,7 @@
patternset id=teststhatfail
exclude name=${optional.package}/BeanShellScriptTest.java/
+exclude name=${optional.package}/jdepend/JDependTest.java/
/patternset
!--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
peterreilly2003/12/03 02:37:36
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
Sync with head
Revision ChangesPath
No revision
No revision
1.392.2.10 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.9
retrieving revision 1.392.2.10
diff -u -r1.392.2.9 -r1.392.2.10
--- build.xml 30 Oct 2003 16:21:31 - 1.392.2.9
+++ build.xml 3 Dec 2003 10:37:36 - 1.392.2.10
@@ -327,6 +327,7 @@
patternset id=teststhatfail
exclude name=${optional.package}/BeanShellScriptTest.java/
+exclude name=${optional.package}/jdepend/JDependTest.java/
/patternset
!--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
antoine 2003/12/03 13:58:07
Modified:.build.xml
Log:
1) make JarTest pass on Windows, these testcases were failing :
testRecreateWithUpdateNewerFile
testRecreateZipfilesetWithUpdateNewerFile,
the problem is the granularity of time stamps on the FAT
see
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/base/filetime_str.asp
for more information
2) prevent XalanLiaisonTest and XslpLiaisonTest from running in batch
when Xerces1 is not available,
3) fix one of the 3 failing testcases (testSimple) from JDependTest
it was failing due to an overdose of \r in the output coming from
BuildFileTest
Revision ChangesPath
1.404 +7 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- build.xml 3 Dec 2003 13:16:01 - 1.403
+++ build.xml 3 Dec 2003 21:58:07 - 1.404
@@ -556,6 +556,9 @@
available property=beanshell.present
classname=bsh.StringUtil
classpathref=classpath/
+available property=xerces1.present
+ classname=org.apache.xerces.framework.XMLParser
+ classpathref=classpath/
available property=jsch.present
classname=com.jcraft.jsch.Session
classpathref=classpath/
@@ -1498,6 +1501,10 @@
!-- needs BSF to work --
exclude name=${optional.package}/XalanLiaisonTest.java
unless=bsf.present/
+ exclude name=${optional.package}/XalanLiaisonTest.java
+ unless=xerces1.present/
+ exclude name=${optional.package}/XslpLiaisonTest.java
+ unless=xerces1.present/
!-- needs resolver.jar to work --
exclude name=${optional.package}/XmlValidateCatalogTest.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
antoine 2003/12/03 14:06:41
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
Merge from HEAD
1) make JarTest pass on Windows, these testcases were failing :
testRecreateWithUpdateNewerFile
testRecreateZipfilesetWithUpdateNewerFile,
the problem is the granularity of time stamps on the FAT
see
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/base/filetime_str.asp
for more information
2) prevent XalanLiaisonTest and XslpLiaisonTest from running in batch
when Xerces1 is not available,
3) fix one of the 3 failing testcases (testSimple) from JDependTest
it was failing due to an overdose of \r in the output coming from
BuildFileTest
Revision ChangesPath
No revision
No revision
1.392.2.12 +7 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.11
retrieving revision 1.392.2.12
diff -u -r1.392.2.11 -r1.392.2.12
--- build.xml 3 Dec 2003 13:22:29 - 1.392.2.11
+++ build.xml 3 Dec 2003 22:06:41 - 1.392.2.12
@@ -555,6 +555,9 @@
available property=beanshell.present
classname=bsh.StringUtil
classpathref=classpath/
+available property=xerces1.present
+ classname=org.apache.xerces.framework.XMLParser
+ classpathref=classpath/
available property=jsch.present
classname=com.jcraft.jsch.Session
classpathref=classpath/
@@ -1497,6 +1500,10 @@
!-- needs BSF to work --
exclude name=${optional.package}/XalanLiaisonTest.java
unless=bsf.present/
+ exclude name=${optional.package}/XalanLiaisonTest.java
+ unless=xerces1.present/
+ exclude name=${optional.package}/XslpLiaisonTest.java
+ unless=xerces1.present/
!-- needs resolver.jar to work --
exclude name=${optional.package}/XmlValidateCatalogTest.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
conor 2003/10/20 16:27:59 Modified:.build.xml Log: Include checkstyle stylesheets Revision ChangesPath 1.399 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.398 retrieving revision 1.399 diff -u -w -u -r1.398 -r1.399 --- build.xml 7 Oct 2003 11:44:34 - 1.398 +++ build.xml 20 Oct 2003 23:27:59 - 1.399 @@ -1001,7 +1001,7 @@ include name=changelog.xsl/ include name=jdepend.xsl/ include name=jdepend-frames.xsl/ -include name=checkstyle-frames.xsl/ +include name=checkstyle/*.xsl/ include name=log.xsl/ include name=tagdiff.xsl/ /fileset - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
conor 2003/10/20 16:30:42 Modified:.Tag: ANT_16_BRANCH build.xml Log: Merge Revision ChangesPath No revision No revision 1.392.2.7 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.392.2.6 retrieving revision 1.392.2.7 diff -u -w -u -r1.392.2.6 -r1.392.2.7 --- build.xml 16 Oct 2003 21:13:29 - 1.392.2.6 +++ build.xml 20 Oct 2003 23:30:42 - 1.392.2.7 @@ -1000,7 +1000,7 @@ include name=changelog.xsl/ include name=jdepend.xsl/ include name=jdepend-frames.xsl/ -include name=checkstyle-frames.xsl/ +include name=checkstyle/*.xsl/ include name=log.xsl/ include name=tagdiff.xsl/ /fileset - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2003/10/07 04:44:34
Modified:.build.xml
Log:
Reintroduce ant-jdepend.jar
Revision ChangesPath
1.398 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- build.xml 2 Oct 2003 07:21:42 - 1.397
+++ build.xml 7 Oct 2003 11:44:34 - 1.398
@@ -848,6 +848,7 @@
optional-jar dep=jai/
optional-jar dep=swing/
optional-jar dep=jsch/
+optional-jar dep=jdepend/
jar destfile=${build.lib}/${optional.jars.prefix}-weblogic.jar
basedir=${build.classes}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2003/10/07 04:44:48
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
Reintroduce ant-jdepend.jar
Revision ChangesPath
No revision
No revision
1.392.2.5 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.4
retrieving revision 1.392.2.5
diff -u -r1.392.2.4 -r1.392.2.5
--- build.xml 2 Oct 2003 07:23:18 - 1.392.2.4
+++ build.xml 7 Oct 2003 11:44:48 - 1.392.2.5
@@ -847,6 +847,7 @@
optional-jar dep=jai/
optional-jar dep=swing/
optional-jar dep=jsch/
+optional-jar dep=jdepend/
jar destfile=${build.lib}/${optional.jars.prefix}-weblogic.jar
basedir=${build.classes}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: ant build.xml
Cool, haven´t looked at that. But nice introduction in macrodef :-)
Jan
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Sent: Tuesday, October 07, 2003 1:45 PM
To: [EMAIL PROTECTED]
Subject: cvs commit: ant build.xml
bodewig 2003/10/07 04:44:34
Modified:.build.xml
Log:
Reintroduce ant-jdepend.jar
Revision ChangesPath
1.398 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- build.xml 2 Oct 2003 07:21:42 - 1.397
+++ build.xml 7 Oct 2003 11:44:34 - 1.398
@@ -848,6 +848,7 @@
optional-jar dep=jai/
optional-jar dep=swing/
optional-jar dep=jsch/
+optional-jar dep=jdepend/
jar
destfile=${build.lib}/${optional.jars.prefix}-weblogic.jar
basedir=${build.classes}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2003/10/02 00:21:42
Modified:.build.xml
Log:
Give a little macrodef demo
Revision ChangesPath
1.397 +63 -175 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- build.xml 2 Oct 2003 06:44:27 - 1.396
+++ build.xml 2 Oct 2003 07:21:42 - 1.397
@@ -193,7 +193,7 @@
filename name=${optional.package}/XslpLiaison*/
/selector
- selector id=needs.apache.resolver
+ selector id=needs.apache-resolver
filename name=${apache.resolver.type.package}/**/
/selector
@@ -201,11 +201,11 @@
filename name=${optional.package}/junit/**/
/selector
- selector id=needs.jakarta.regexp
+ selector id=needs.jakarta-regexp
filename name=${regexp.package}/JakartaRegexp*/
/selector
- selector id=needs.jakarta.oro
+ selector id=needs.jakarta-oro
or
filename name=${regexp.package}/JakartaOro*/
filename name=${optional.package}/perforce/*/
@@ -213,7 +213,7 @@
/or
/selector
- selector id=needs.jakarta.bcel
+ selector id=needs.jakarta-bcel
or
filename name=${ant.package}/filters/util/JavaClassHelper*/
filename name=${util.package}/depend/bcel/*/
@@ -221,15 +221,15 @@
/or
/selector
- selector id=needs.jakarta.log4j
+ selector id=needs.jakarta-log4j
filename name=${ant.package}/listener/Log4jListener*/
/selector
- selector id=needs.commons.logging
+ selector id=needs.commons-logging
filename name=${ant.package}/listener/CommonsLoggingListener*/
/selector
- selector id=needs.bsf
+ selector id=needs.apache-bsf
or
filename name=${optional.package}/Script*/
filename name=${optional.package}/script/**/*/
@@ -271,7 +271,7 @@
/or
/selector
- selector id=needs.commons.net
+ selector id=needs.commons-net
or
filename name=${optional.package}/net/FTP*/
filename name=${optional.package}/net/RExec*/
@@ -612,16 +612,16 @@
selector refid=needs.xalan1 unless=xalan.present/
selector refid=needs.xalan2 unless=xalan2.present/
selector refid=needs.xslp unless=xslp.present/
-selector refid=needs.apache.resolver
unless=apache.resolver.present/
+selector refid=needs.apache-resolver
unless=apache.resolver.present/
selector refid=needs.junit unless=junit.present/
-selector refid=needs.jakarta.regexp
+selector refid=needs.jakarta-regexp
unless=jakarta.regexp.present/
-selector refid=needs.jakarta.oro
unless=jakarta.oro.present/
-selector refid=needs.jakarta.bcel unless=bcel.present/
-selector refid=needs.jakarta.log4j unless=log4j.present/
-selector refid=needs.commons.logging
+selector refid=needs.jakarta-oro
unless=jakarta.oro.present/
+selector refid=needs.jakarta-bcel unless=bcel.present/
+selector refid=needs.jakarta-log4j unless=log4j.present/
+selector refid=needs.commons-logging
unless=commons.logging.present/
-selector refid=needs.bsf unless=bsf.present/
+selector refid=needs.apache-bsf unless=bsf.present/
selector refid=needs.stylebook unless=stylebook.present/
selector refid=needs.javamail unless=javamail.complete/
selector refid=needs.icontract unless=icontract.present/
@@ -630,7 +630,7 @@
selector refid=needs.weblogic.ddcreator
unless=ejb.DDCreator.present/
selector refid=needs.weblogic.server
unless=ejb.wls.present/
-selector refid=needs.commons.net
unless=commons.net.present/
+selector refid=needs.commons-net
unless=commons.net.present/
selector refid=needs.starteam unless=starteam.present/
selector refid=needs.vaj unless=vaj.present/
selector refid=needs.antlr unless=antlr.present/
@@ -725,10 +725,10 @@
filename name=${optional.type.package}/**/
filename name=${util.package}/depend/**/
filename name=${util.package}/optional/**/
-selector refid=needs.jakarta.log4j/
-selector refid=needs.commons.logging/
-selector refid=needs.jakarta.regexp/
-selector refid=needs.jakarta.oro/
+selector refid=needs.jakarta-log4j/
+selector refid=needs.commons-logging/
+selector refid=needs.jakarta-regexp/
+selector refid=needs.jakarta-oro/
selector refid=needs.jdk1.4+/
Re: cvs commit: ant build.xml
On Tue, 23 Sep 2003, Steve Loughran [EMAIL PROTECTED] wrote: sorry, I had patched my build.xml but forgot to commit that change. No problem at all. I still use 1.3 in my default environment so I quickly found the problem. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2003/09/25 07:42:22
Modified:.build.xml
Log:
Good bye optional.jar
Revision ChangesPath
1.395 +1 -8 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- build.xml 23 Sep 2003 13:14:41 - 1.394
+++ build.xml 25 Sep 2003 14:42:21 - 1.395
@@ -761,13 +761,6 @@
/fileset
/jar
-jar destfile=${build.lib}/optional.jar
- basedir=${build.classes}
- manifest=${manifest.tmp}
- selector refid=non-core/
- metainf dir=${build.dir} includes=LICENSE.txt/
-/jar
-
jar destfile=${build.lib}/${bootstrap.jar}
basedir=${build.classes}
manifest=${manifest}
@@ -775,7 +768,7 @@
metainf dir=${build.dir} includes=LICENSE.txt/
manifest
attribute name=Class-Path
- value=ant.jar xml-apis.jar xercesImpl.jar optional.jar
xalan.jar/
+ value=ant.jar xml-apis.jar xercesImpl.jar xalan.jar/
/manifest
/jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2003/09/25 07:42:46
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
Merge from HEAD
Revision ChangesPath
No revision
No revision
1.392.2.2 +1 -8 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.1
retrieving revision 1.392.2.2
diff -u -r1.392.2.1 -r1.392.2.2
--- build.xml 22 Sep 2003 15:02:02 - 1.392.2.1
+++ build.xml 25 Sep 2003 14:42:46 - 1.392.2.2
@@ -760,13 +760,6 @@
/fileset
/jar
-jar destfile=${build.lib}/optional.jar
- basedir=${build.classes}
- manifest=${manifest.tmp}
- selector refid=non-core/
- metainf dir=${build.dir} includes=LICENSE.txt/
-/jar
-
jar destfile=${build.lib}/${bootstrap.jar}
basedir=${build.classes}
manifest=${manifest}
@@ -774,7 +767,7 @@
metainf dir=${build.dir} includes=LICENSE.txt/
manifest
attribute name=Class-Path
- value=ant.jar xml-apis.jar xercesImpl.jar optional.jar
xalan.jar/
+ value=ant.jar xml-apis.jar xercesImpl.jar xalan.jar/
/manifest
/jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
AW: cvs commit: ant build.xml
I was also wondering,why we had both optional.jar and its subcomponents.
Cheers,
Antoine
-Ursprüngliche Nachricht-
Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Gesendet: Donnerstag, 25. September 2003 16:42
An: [EMAIL PROTECTED]
Betreff: cvs commit: ant build.xml
bodewig 2003/09/25 07:42:22
Modified:.build.xml
Log:
Good bye optional.jar
Revision ChangesPath
1.395 +1 -8 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- build.xml 23 Sep 2003 13:14:41 - 1.394
+++ build.xml 25 Sep 2003 14:42:21 - 1.395
@@ -761,13 +761,6 @@
/fileset
/jar
-jar destfile=${build.lib}/optional.jar
- basedir=${build.classes}
- manifest=${manifest.tmp}
- selector refid=non-core/
- metainf dir=${build.dir} includes=LICENSE.txt/
-/jar
-
jar destfile=${build.lib}/${bootstrap.jar}
basedir=${build.classes}
manifest=${manifest}
@@ -775,7 +768,7 @@
metainf dir=${build.dir} includes=LICENSE.txt/
manifest
attribute name=Class-Path
- value=ant.jar xml-apis.jar xercesImpl.jar
optional.jar xalan.jar/
+ value=ant.jar xml-apis.jar xercesImpl.jar
xalan.jar/
/manifest
/jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
On Thu, 25 Sep 2003, Antoine Lévy-Lambert [EMAIL PROTECTED] wrote: I was also wondering,why we had both optional.jar and its subcomponents. When I split up optional.jar, I kept the original just to be sure we had something to fall back to. Having optional.jar and all the smaller pieces would sure cause a lot of confusion. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
[EMAIL PROTECTED] wrote: bodewig 2003/09/23 06:14:41 Modified:.build.xml Log: AssertionsTest needs a javac that supports assert sorry, I had patched my build.xml but forgot to commit that change. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2003/09/23 06:14:41
Modified:.build.xml
Log:
AssertionsTest needs a javac that supports assert
Revision ChangesPath
1.394 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- build.xml 22 Sep 2003 15:05:21 - 1.393
+++ build.xml 23 Sep 2003 13:14:41 - 1.394
@@ -144,6 +144,7 @@
selector id=needs.jdk1.4+
or
filename name=${regexp.package}/Jdk14Regexp*/
+ filename name=${ant.package}/types/AssertionsTest.java/
/or
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
[EMAIL PROTECTED] wrote:
bodewig 2003/09/23 06:14:41
Modified:.build.xml
Log:
AssertionsTest needs a javac that supports assert
Revision ChangesPath
1.394 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- build.xml 22 Sep 2003 15:05:21 - 1.393
+++ build.xml 23 Sep 2003 13:14:41 - 1.394
@@ -144,6 +144,7 @@
selector id=needs.jdk1.4+
or
filename name=${regexp.package}/Jdk14Regexp*/
+ filename name=${ant.package}/types/AssertionsTest.java/
/or
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
