cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-08-05 Thread mbenson
mbenson 2005/08/05 15:39:25 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: minus one LOC Revision ChangesPath 1.102 +1 -2 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java ==

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-05-10 Thread bodewig
bodewig 2005/05/10 00:37:29 Modified:src/main/org/apache/tools/ant Tag: ANT_16_BRANCH DirectoryScanner.java Log: merge Revision ChangesPath No revision No revision 1.64.2.12 +1 -1 ant/src/main/org/apache

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-05-10 Thread bodewig
bodewig 2005/05/10 00:37:04 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: fix NPE reported by Curt Arnold Revision ChangesPath 1.100 +1 -1 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

Re: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-17 Thread Matt Benson
--- [EMAIL PROTECTED] wrote: > bodewig 2005/03/17 06:23:58 > > Modified:src/main/org/apache/tools/ant > DirectoryScanner.java > Log: > DirectoryScanner improvements have been merged I knew I forgot something... ;) Thanks, Matt __

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-17 Thread bodewig
bodewig 2005/03/17 06:23:58 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: DirectoryScanner improvements have been merged Revision ChangesPath 1.98 +17 -17ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-11 Thread mbenson
mbenson 2005/03/11 11:34:00 Modified:src/main/org/apache/tools/ant Tag: ANT_16_BRANCH DirectoryScanner.java Log: Merge DirectoryScanner improvements; disable ClasspathUtilsTest if tests.and.ant.share.classloader PR: 33118 Revision ChangesPath N

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-07 Thread mbenson
mbenson 2005/03/07 09:27:50 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Stop being so optimistic; move isDeeper() to 1.7 Add @return to contentsExcluded javadoc Remove unnecessary File.separator from endsWith comparison in contentsExcluded Revision Cha

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-07 Thread mbenson
mbenson 2005/03/07 09:16:33 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: static final variables: csScanOnly -> CS_SCAN_ONLY, csThenNonCs -> CS_THEN_NON_CS Revision ChangesPath 1.96 +3 -3 ant/src/main/org/apache/tools/ant/DirectoryScann

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-07 Thread mbenson
mbenson 2005/03/07 09:13:06 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Reuse boolean[] instances for case-sensitivity iterations when scanning; reverse logic for better clarity of intent with these arrays. Revision ChangesPath 1.95 +10 -6

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-07 Thread mbenson
mbenson 2005/03/07 09:02:46 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Move DirectoryScanner.getScannedDirs() to package-private access; add DirectoryScannerTest to tests.and.ant.share.classloader tests. Revision ChangesPath 1.94 +1 -1 a

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-03 Thread mbenson
mbenson 2005/03/03 12:42:43 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Eliminate possible NPE; note that previous change addressed bug 33118 at least partially. Revision ChangesPath 1.92 +9 -8 ant/src/main/org/apache/tools/ant/DirectoryS

RE: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-03 Thread Matt Benson
--- Dominique Devienne <[EMAIL PROTECTED]> wrote: > > From: Matt Benson [mailto:[EMAIL PROTECTED] > > --- Antoine Levy-Lambert <[EMAIL PROTECTED]> wrote: [SNIP] > > > Actually if an exclude pattern is like > **/Test/**, > > > every time a directory Test is encountered it > should > > > not be scan

RE: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-03 Thread Dominique Devienne
> From: Matt Benson [mailto:[EMAIL PROTECTED] > --- Antoine Levy-Lambert <[EMAIL PROTECTED]> wrote: > > I had thought about this issue of optimizing pattern > > scanning. > > DirectoryScanner used to be written so that if an > > exclude pattern looks like > > foo/bar/** scanning stops in foo/bar. >

Re: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-02 Thread Matt Benson
--- Antoine Levy-Lambert <[EMAIL PROTECTED]> wrote: > Hello Matt and others, > > I had thought about this issue of optimizing pattern > scanning. > DirectoryScanner used to be written so that if an > exclude pattern looks like > foo/bar/** scanning stops in foo/bar. > Actually if an exclude patte

Re: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-02 Thread Antoine Levy-Lambert
Hello Matt and others, I had thought about this issue of optimizing pattern scanning. DirectoryScanner used to be written so that if an exclude pattern looks like foo/bar/** scanning stops in foo/bar. Actually if an exclude pattern is like **/Test/**, every time a directory Test is encountered it s

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-03-02 Thread mbenson
mbenson 2005/03/02 14:43:54 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Stop scanning directories where we match the directory but know based on the pattern that we will never match any of its contents. Revision ChangesPath 1.91 +19 -5 ant

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-11 Thread mbenson
mbenson 2005/02/11 14:49:56 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Unfinished caching of IllegalStateExceptions for concurrent scan() invocations. Revision ChangesPath 1.90 +6 -3 ant/src/main/org/apache/tools/ant/DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-11 Thread mbenson
mbenson 2005/02/11 14:41:40 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Splitting hairs Revision ChangesPath 1.89 +1 -1 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-11 Thread mbenson
mbenson 2005/02/11 14:39:56 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Beautify imports. Revision ChangesPath 1.88 +6 -6 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java ==

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-11 Thread mbenson
mbenson 2005/02/11 14:37:04 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Merged duplicate code from private methods. Revision ChangesPath 1.87 +19 -69ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-11 Thread mbenson
mbenson 2005/02/11 12:53:47 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: More javadoc Revision ChangesPath 1.86 +15 -0 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java ===

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-11 Thread mbenson
mbenson 2005/02/11 12:27:38 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: LOC Revision ChangesPath 1.85 +84 -118 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-10 Thread mbenson
mbenson 2005/02/10 15:52:00 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Synchronize scanning so that a scan initiated before the end of another scan will block and the two will share results. Likewise for slow scans. Revision ChangesPath 1.84

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-10 Thread mbenson
mbenson 2005/02/10 15:20:06 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: More javadoc Revision ChangesPath 1.83 +10 -10ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java ===

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-07 Thread mbenson
mbenson 2005/02/07 15:17:25 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Javadoc Revision ChangesPath 1.82 +79 -76ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-02-04 Thread mbenson
mbenson 2005/02/04 15:47:09 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Move instance variables Revision ChangesPath 1.81 +14 -14ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-01-27 Thread mbenson
mbenson 2005/01/27 14:31:54 Modified:src/main/org/apache/tools/ant Tag: ANT_16_BRANCH DirectoryScanner.java Log: Year! Revision ChangesPath No revision No revision 1.64.2.9 +1 -1 ant/src/main/org/apache

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-01-27 Thread mbenson
mbenson 2005/01/27 14:31:07 Modified:src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH ZipScanner.java Resource.java src/main/org/apache/tools/ant Tag: ANT_16_BRANCH DirectoryScanner.java Log: Add size to Resource; a

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-01-20 Thread peterreilly
peterreilly2005/01/20 06:35:15 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: trailing whitespace + multi setting Revision ChangesPath 1.79 +7 -6 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java =

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2005-01-07 Thread mbenson
mbenson 2005/01/07 09:14:42 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Various inconsequentials Revision ChangesPath 1.77 +35 -26ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java ===

Re: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2004-12-03 Thread Stefan Bodewig
On Fri, 03 Dec 2004, Stefan Bodewig <[EMAIL PROTECTED]> wrote: > I'll watch the next Gump run closely, both for breaking builds as > well as performance impact. No obvious breaks. The run took 179 minutes, the previous one 184, but I don't think it is related to my change (but rather to CVS and

Re: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2004-12-03 Thread Stefan Bodewig
On 3 Dec 2004, <[EMAIL PROTECTED]> wrote: > Try to speed up DirectoryScanner by using hash lookups instead of > linear searches and pattern matching on non-wildcard patterns. I threatened to do it. I'll watch the next Gump run closely, both for breaking builds as well as performance impact.

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2004-12-03 Thread bodewig
bodewig 2004/12/03 00:04:43 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Try to speed up DirectoryScanner by using hash lookups instead of linear searches and pattern matching on non-wildcard patterns. Suggested by: Dominique Devienne Revision Change

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java IntrospectionHelper.java ProjectHelper.java

2004-05-13 Thread bodewig
bodewig 2004/05/13 00:06:49 Modified:src/main/org/apache/tools/ant DirectoryScanner.java IntrospectionHelper.java ProjectHelper.java Log: cosmetics Revision ChangesPath 1.72 +1 -1 ant/src/main/org/apache/tools/ant/DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-08-21 Thread antoine
antoine 2003/08/21 09:56:12 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Optimize scanning in FTP.FTPDirectoryScanner, using similar algorithms to the ones introduced in DirectoryScanner. There is a gain when - the include patterns look like some/very/long/

Re: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-29 Thread Antoine Levy-Lambert
I had done a big mistake in my attempt to improve DirectoryScanner by not scanning directories matching exclude patterns. I realized this when I ran the ant test suite which took 1 minute instead of the usual 5. This is fixed now. This routine to decide when exclude patterns are enough to stop scan

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-29 Thread antoine
antoine 2003/07/29 12:47:16 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: the method isMorePowerfulThanExcludes was returning false on org/apache/tools/ant/taskdefs in the run-tests target of our buildfile because of the exclude pattern : :-(

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-29 Thread antoine
antoine 2003/07/29 03:49:12 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: do not scan needlessly excluded directories PR: 21941 Revision ChangesPath 1.60 +37 -2 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectorySca

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java AntClassLoader.java

2003-07-25 Thread antoine
antoine 2003/07/25 11:40:54 Modified:src/main/org/apache/tools/ant DirectoryScanner.java AntClassLoader.java Log: checkstyle Revision ChangesPath 1.58 +5 -6 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScan

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-23 Thread bodewig
bodewig 2003/07/23 01:09:01 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Whitespace changes Revision ChangesPath 1.57 +64 -60ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java =

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-23 Thread bodewig
bodewig 2003/07/23 01:07:33 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: One more tweak Revision ChangesPath 1.56 +8 -1 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java =

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-23 Thread bodewig
bodewig 2003/07/23 00:57:07 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Now that we avoid double scanning in scanDir, we don't need to perform parent-tests on the patterns anymore Revision ChangesPath 1.55 +1 -30 ant/src/main/org/apache/too

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-23 Thread bodewig
bodewig 2003/07/23 00:50:25 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Avoid double scanning of directories Revision ChangesPath 1.54 +37 -1 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java ===

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-23 Thread bodewig
bodewig 2003/07/23 00:28:01 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: whitespace changes Revision ChangesPath 1.53 +30 -29ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java =

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-23 Thread bodewig
bodewig 2003/07/23 00:25:59 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: fix new DirectoryScanner tests, still needs to be improved to avoid double-scanning Revision ChangesPath 1.52 +9 -2 ant/src/main/org/apache/tools/ant/DirectoryScanner.

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-23 Thread bodewig
bodewig 2003/07/22 23:59:47 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: fix behavior on case insensitive file systems Revision ChangesPath 1.51 +106 -17 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-16 Thread bodewig
bodewig 2003/07/16 06:57:10 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Fix symlink check Revision ChangesPath 1.47 +39 -0 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java ==

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-07-16 Thread bodewig
bodewig 2003/07/16 04:47:53 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: Fix case-insensitive DirectiryScanner - I hope Revision ChangesPath 1.46 +66 -4 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java

cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java

2003-05-09 Thread bodewig
bodewig 2003/05/09 05:44:52 Modified:src/main/org/apache/tools/ant DirectoryScanner.java Log: retain old array for backwards compatibility. Revision ChangesPath 1.41 +53 -22ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java