cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java
bodewig 2004/05/13 00:01:08
Modified:src/etc/testcases/taskdefs defaultexcludes.xml
src/testcases/org/apache/tools/ant/taskdefs
DefaultExcludesTest.java
Log:
test1 failed unless it was the first test to run.
CVS: --
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision ChangesPath
1.3 +4 -0 ant/src/etc/testcases/taskdefs/defaultexcludes.xml
Index: defaultexcludes.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/defaultexcludes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- defaultexcludes.xml 21 Jul 2003 10:52:19 - 1.2
+++ defaultexcludes.xml 13 May 2004 07:01:07 - 1.3
@@ -2,6 +2,10 @@
project name=echo-test basedir=. default=test1
+ target name=cleanup
+defaultexcludes default=true/
+ /target
+
target name=test1
defaultexcludes echo=true/
/target
1.8 +4 -0
ant/src/testcases/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java
Index: DefaultExcludesTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultExcludesTest.java 9 Mar 2004 16:48:57 - 1.7
+++ DefaultExcludesTest.java 13 May 2004 07:01:07 - 1.8
@@ -32,6 +32,10 @@
configureProject(src/etc/testcases/taskdefs/defaultexcludes.xml);
}
+public void tearDown() {
+project.executeTarget(cleanup);
+}
+
// Output the default excludes
public void test1() {
String[] expected = {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java
bodewig 2004/05/13 00:13:53
Modified:.Tag: ANT_16_BRANCH WHATSNEW
docs/manual/CoreTasks Tag: ANT_16_BRANCH jar.html
src/etc/testcases/filters Tag: ANT_16_BRANCH concat.xml
src/etc/testcases/taskdefs Tag: ANT_16_BRANCH
defaultexcludes.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Jar.java
src/testcases/org/apache/tools/ant/filters Tag:
ANT_16_BRANCH ConcatFilterTest.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH DefaultExcludesTest.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.90 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.89
retrieving revision 1.503.2.90
diff -u -r1.503.2.89 -r1.503.2.90
--- WHATSNEW 28 Apr 2004 11:45:22 - 1.503.2.89
+++ WHATSNEW 13 May 2004 07:13:47 - 1.503.2.90
@@ -122,6 +122,10 @@
run all tests in a single forked JVM reducing the overhead of VM
creation a lot. Bugzilla Report 24697.
+* jar can now optionally create an index for jars different than the
+ one it currently builds as well. See the new indexjars element
+ for details. Bugzilla Report 14255.
+
Changes from Ant 1.6.0 to Ant 1.6.1
===
No revision
No revision
1.28.2.3 +33 -1 ant/docs/manual/CoreTasks/jar.html
Index: jar.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -r1.28.2.2 -r1.28.2.3
--- jar.html 9 Feb 2004 22:12:07 - 1.28.2.2
+++ jar.html 13 May 2004 07:13:50 - 1.28.2.3
@@ -161,7 +161,13 @@
/tr
tr
td valign=topindex/td
-td valign=topwhether to create an A
HREF=http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index;index
list/A to speed up classloading. This is a JDK 1.3+ specific feature.
Defaults to false. /td
+td valign=topwhether to create an A
+
HREF=http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index;index
+list/A to speed up classloading. This is a JDK 1.3+ specific
+feature. Unless you specify additional jars with nested a
+href=#indexjarscodeindexjars/code/a elements, only the
+contents of this jar will be included in the index. Defaults to
+false./td
td valign=top align=centerNo/td
/tr
tr
@@ -196,6 +202,32 @@
If the manifest values have changed the jar will be updated or rebuilt, as
appropriate.
/p
+
+a name=indexjarsh4indexjars/h4/a
+
+pemsince ant 1.6.2/em/p
+
+pThe nested codeindexjars/code element specifies a a
+href=../using.html#pathPATH like structure/a. Its content is
+completely ignored unless you set the index attribute of the task to
+true./p
+
+pThe index created by this task will contain indices for the
+archives contained in this path, the names used for the archioves
+depend on your manifest:/p
+ul
+ liIf the generated jar's manifest contains no Class-Path
+ attribute, the file name without any leading directory path will be
+ used and all parts of the path will get indexed./li
+ liIf the manifest contains a Class-Path attribute, this task will
+ try to guess which part of the Class-Path belongs to a given
+ archive. If it cannot guess a name, the archive will be skipped,
+ otherwise tha name listed inside the Class-PAth attribute will be
+ used./li
+/ul
+
+pThis task will not create any index entries for archives that are
+empty or only contain files inside the META-INF directory./p
h3Examples/h3
pre lt;jar destfile=quot;${dist}/lib/app.jarquot;
basedir=quot;${build}/classesquot;/gt;/pre
No revision
No revision
1.2.2.3 +2 -0 ant/src/etc/testcases/filters/concat.xml
Index: concat.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/filters/concat.xml,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- concat.xml25 Sep 2003 06:19:51 - 1.2.2.2
+++ concat.xml13 May 2004 07:13:51 - 1.2.2.3
@@ -7,6 +7,8 @@
echo file=result/append.txt
message=this-should-be-the-last-line${line.separator}/
copy file=input/head-tail.test tofile=input/concatfilter.test/
fixcrlf srcDir=input includes=concatfilter.test/
+!-- to be consistent on MacOS X. fixcrlf uses CR while line.sep is LF
--
+
Re: cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java DemuxOutputTask.java
On Thu, 17 Jul 2003, Conor MacNeill [EMAIL PROTECTED] wrote: Since messages now typically contains the end-of-line characters, the log processing code will now strip line.separator chars from the end of a message since the output logger will println anyway. The log processing code or just DefaultLogger? I'd think that it should be the BuildListener that reformats messages, if anything. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java DemuxOutputTask.java
On Thu, 17 Jul 2003 09:52 pm, Stefan Bodewig wrote: On Thu, 17 Jul 2003, Conor MacNeill [EMAIL PROTECTED] wrote: Since messages now typically contains the end-of-line characters, the log processing code will now strip line.separator chars from the end of a message since the output logger will println anyway. The log processing code or just DefaultLogger? I'd think that it should be the BuildListener that reformats messages, if anything. As it stands the content going to the listeners is largely the same as pre-change. If the EOL was passed through, all listeners would require changing. I don't think that we could make that change. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java DemuxOutputTask.java
On Thu, 17 Jul 2003, Conor MacNeill [EMAIL PROTECTED] wrote: As it stands the content going to the listeners is largely the same as pre-change. OK, so it has been wrong before and we must keep it to remain backwards compatible. Nothing we could do, I guess. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java DemuxOutputTask.java
Hi Conor, I am +1 on your changes. The Ant output handling now will pass every character through to the generating task without inserting line breaks at buffer full intervals. Also line breaks will not be converted to the platform line separator. So, if a java application running on Windows writes \n and not \r\n, the output stream that gets redirected to an ouput file will not have \n\r. It's not a big deal I think since the generating application should be in control - it may really want to generate a Unix format output. This is like changes which have been done to FileUtils#copyFile(File sourceFile, File destFile, FilterSetCollection filters, Vector filterChains, boolean overwrite, boolean preserveLastModified, String inputEncoding, String outputEncoding, Project project) by Peter Reilly and then a little bit by myself to make sure that line endings are not changed by FilterSets or FilterChains. The class TokenFilter.LineTokenizer (written by Peter Reilly) is the tool which allows to read input line by line including the original line ending. Actually, I wonder whether this class (LineTokenizer) should not be in its own .java file to give it more visibility. Suggestion about the appropriate package ( org.apache.tools.ant.util ?) and name (I think LineTokenizer is very expressive, I would retain this). Since it is new from 1.6, we can refactor this without breaking compat. The optional task translate/ is not yet using this tokenizer, I am planning to change it too. Then we can say that the general Ant philosophy in tasks or types manipulating files or streams is to preserve line endings (except of course fixcrlf/ whose job is to change line endings). Antoine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java
bodewig 2003/05/09 05:10:36 Modified:.WHATSNEW docs/manual coretasklist.html dirtasks.html src/main/org/apache/tools/ant DirectoryScanner.java src/main/org/apache/tools/ant/taskdefs defaults.properties Added: docs/manual/CoreTasks defaultexcludes.html src/etc/testcases/taskdefs defaultexcludes.xml src/main/org/apache/tools/ant/taskdefs DefaultExcludes.java src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java Log: A new task that allows users to modify the list of default excludes. PR: 12700 Submitted by: Gus Heck gus dot heck at olin dot edu Revision ChangesPath 1.410 +3 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.409 retrieving revision 1.410 diff -u -r1.409 -r1.410 --- WHATSNEW 6 May 2003 15:19:15 - 1.409 +++ WHATSNEW 9 May 2003 12:10:35 - 1.410 @@ -302,6 +302,9 @@ in vajload by using special wildcard characters. Also fixes Bugzilla Report 2236. +* Users can now modify the list of default excludes using the new + defaultexcludes task. Bugzilla Report 12700. + Changes from Ant 1.5.2 to Ant 1.5.3 === 1.47 +1 -0 ant/docs/manual/coretasklist.html Index: coretasklist.html === RCS file: /home/cvs/ant/docs/manual/coretasklist.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- coretasklist.html 21 Apr 2003 06:36:46 - 1.46 +++ coretasklist.html 9 May 2003 12:10:35 - 1.47 @@ -36,6 +36,7 @@ a href=CoreTasks/changelog.htmlCvsChangeLog/abr a href=CoreTasks/cvspass.htmlCVSPass/abr a href=CoreTasks/cvstagdiff.htmlCvsTagDiff/abr +a href=CoreTasks/defaultexcludes.htmlDefaultexcludes/abr a href=CoreTasks/delete.htmlDelete/abr a href=CoreTasks/deltree.htmliDeltree/i/abr a href=CoreTasks/dependset.htmlDependset/abr 1.19 +8 -2 ant/docs/manual/dirtasks.html Index: dirtasks.html === RCS file: /home/cvs/ant/docs/manual/dirtasks.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- dirtasks.html 4 Feb 2003 17:29:10 - 1.18 +++ dirtasks.html 9 May 2003 12:10:35 - 1.19 @@ -261,8 +261,14 @@ **/.svn/** **/.DS_Store /pre -pIf you do not want these default excludes applied, you may disable them -with the codedefaultexcludes=quot;noquot;/code attribute./p +pIf you do not want these default excludes applied, you may disable +them with the codedefaultexcludes=quot;noquot;/code +attribute./p + +pThis is the default list, note that you can modify the list of +default excludes by using the a +href=CoreTasks/defaultexcludes.htmldefaultexcludes/a task./p + hr p align=centerCopyright copy; 2000-2003 Apache Software Foundation. All rights Reserved./p 1.1 ant/docs/manual/CoreTasks/defaultexcludes.html Index: defaultexcludes.html === html head meta http-equiv=Content-Language content=en-us titleDefaultExcludes Task/title /head body h2a name=echoDefaultExcludes/a/h2 pemsince Ant 1.6/em/p h3Description/h3 pAlters the default excludes for all subsequent processing in the build, and prints out the current default excludes if desired. h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr td valign=topbAttribute/b/td td valign=topbDescription/b/td td align=center valign=topbRequired/b/td /tr tr td valign=topecho/td td valign=topwhether or not to print out the default excludes.(defaults to false)/td td valign=top align=centeratribute true required if no other argument specified/td /tr tr td valign=topadd/td td valign=topthe pattern to add to the default excludes/td td valign=top align=centerif no other atribute is specified/td /tr tr td valign=topremove/td td valign=topremove the specified pattern from the default excludes/td td valign=top align=centerif no other atribute is specified/td /tr /table h3Examples/h3 pPrint out the default excludes/p pre lt;defaultexcludes echo=quot;truequot;/gt;/pre pPrint out the default excludes and exclude all *.bak files in strongall/strong further processing/p pre lt;defaultexcludes echo=quot;truequot; add=quot;**/*.bakquot;/gt;/pre pSilently allow several fileset based tasks to operate on emacs backup files
