antidote patch: About.java

2003-09-12 Thread Lajos Pajtek
In the About dialog:
- info pane: better placement for the props and classpath
tables
- fix for 'System Locale' if 'user.region' is null
- some common operations extracted to helper methods

/Lajos


__
Do you Yahoo!?
Yahoo! SiteBuilder - Free, easy-to-use web site design software
http://sitebuilder.yahoo.com

ant-antidote-030913-lp.diff.gz
Description: ant-antidote-030913-lp.diff.gz
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

RE: [PATCH] More typos

2003-09-12 Thread Shatzer, Larry
That's no biggie, but you can apply my next patch of typo fixes. :)

I figure I'll break up my big patch piece by piece to make it easier for you
to double check my work, and catch silly mistakes like xerces vs xerxes. ;)
Unless you would rather have it all, I can provide it. (Without this 481
line patch, it would be 8683 lines, of course some of those lines address my
next question, about line endings)

Another side note, nothing was said about my comment about line endings
being broken for some files on windows: (showing up as unix for ascii files)

src/testcases/org/apache/tools/ant/util/UnPackageNameMapperTest.java
src/main/org/apache/tools/ant/util/TimeoutObserver.java
src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
docs/manual/CoreTypes/zipfileset.html
docs/manual/OptionalTasks/jjdoc.html
docs/manual/OptionalTasks/rexec.html

-- Larry

> -Original Message-
> From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED]
> Sent: Friday, September 12, 2003 2:11 PM
> To: Ant Developers List
> Subject: AW: [PATCH] More typos
> 
> 
> Sorry for the error in the commit message. I am afraid I 
> cannot fix it.
> Antoine
> 

Index: src/main/org/apache/tools/ant/DirectoryScanner.java
===
RCS file: 
/home/cvspublic/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.63
diff -u -r1.63 DirectoryScanner.java
--- src/main/org/apache/tools/ant/DirectoryScanner.java 21 Aug 2003 16:56:12 
-  1.63
+++ src/main/org/apache/tools/ant/DirectoryScanner.java 12 Sep 2003 21:32:19 
-
@@ -877,7 +877,7 @@
 }
 } catch (IOException ioe) {
 String msg = "IOException caught while checking "
-+ "for links, couldn't get cannonical path!";
++ "for links, couldn't get canonical path!";
 // will be caught and redirected to Ant's logging system
 System.err.println(msg);
 noLinks.addElement(newfiles[i]);
@@ -1108,7 +1108,7 @@
  * performing a slow scan if one has not already been completed.
  *
  * @return the names of the files which matched at least one of the
- * include patterns and at at least one of the exclude patterns.
+ * include patterns and at least one of the exclude patterns.
  *
  * @see #slowScan
  */
@@ -1385,7 +1385,7 @@
 }
 } catch (IOException ioe) {
 String msg = "IOException caught while checking "
-+ "for links, couldn't get cannonical path!";
++ "for links, couldn't get canonical path!";
 // will be caught and redirected to Ant's logging system
 System.err.println(msg);
 return false;
@@ -1402,8 +1402,8 @@
 private Set scannedDirs = new HashSet();
 
 /**
- * Has the directorty with the given path relative to the base
- * directory allready been scanned?
+ * Has the directory with the given path relative to the base
+ * directory already been scanned?
  *
  * Registers the given directory as scanned as a side effect.
  *
Index: src/main/org/apache/tools/ant/FileScanner.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/FileScanner.java,v
retrieving revision 1.12
diff -u -r1.12 FileScanner.java
--- src/main/org/apache/tools/ant/FileScanner.java  6 Jul 2003 09:57:34 
-   1.12
+++ src/main/org/apache/tools/ant/FileScanner.java  12 Sep 2003 21:32:19 
-
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -91,7 +91,7 @@
  * The names are relative to the base directory.
  *
  * @return the names of the files which matched at least one of the
- * include patterns and at at least one of the exclude patterns.
+ * include patterns and at least one of the exclude patterns.
  *
  */
 String[] getExcludedFiles();
Index: src/main/org/apache/tools/ant/IntrospectionHelper.java
===
RCS file: 
/home/cvspublic/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.64
diff -u -r1.64 IntrospectionHelper.java
--- src/main/org/apache/tools/ant/IntrospectionHelper.java  24 Jul 2003 
14:20:31 -  1.64
+++ src/main/org/apache/tools/ant/IntrospectionHelper.java  12 Sep 2003 
21:32:20 -
@@ -146,7 +146,7 @@
 // distinction between addConfigured and add. It's obvious what the
 // 

AW: [PATCH] More typos

2003-09-12 Thread Antoine Lévy-Lambert
Sorry for the error in the commit message. I am afraid I cannot fix it.
Antoine

-Ursprüngliche Nachricht-
Von: Shatzer, Larry [mailto:[EMAIL PROTECTED]
Gesendet: Freitag, 12. September 2003 23:02
An: 'Ant Developers List'
Betreff: RE: [PATCH] More typos


> -Original Message-
> From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED]
> Sent: Friday, September 12, 2003 1:57 PM
> To: Ant Developers List
> Subject: AW: [PATCH] More typos
>
>
> Patches submitted, thanks
> Just one thing did I cut out :
> the library for parsing xml is called xerces, not Xerxes like
> the Persian
> emperor.
> (for these interested in history more than computing, have a look at
> http://www.herodotuswebsite.co.uk/xerxes.htm)
> Cheers,
> Antoine
>

Ooops! My bad. I hit the wrong button.

Also, it's spirent.com not servent.com (your commit message) ;)

-- Larry

-
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: [PATCH] More typos

2003-09-12 Thread Shatzer, Larry
> -Original Message-
> From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED]
> Sent: Friday, September 12, 2003 1:57 PM
> To: Ant Developers List
> Subject: AW: [PATCH] More typos
> 
> 
> Patches submitted, thanks
> Just one thing did I cut out :
> the library for parsing xml is called xerces, not Xerxes like 
> the Persian
> emperor.
> (for these interested in history more than computing, have a look at
> http://www.herodotuswebsite.co.uk/xerxes.htm)
> Cheers,
> Antoine
> 

Ooops! My bad. I hit the wrong button.

Also, it's spirent.com not servent.com (your commit message) ;)

-- Larry 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



AW: [PATCH] More typos

2003-09-12 Thread Antoine Lévy-Lambert
Patches submitted, thanks
Just one thing did I cut out :
the library for parsing xml is called xerces, not Xerxes like the Persian
emperor.
(for these interested in history more than computing, have a look at
http://www.herodotuswebsite.co.uk/xerxes.htm)
Cheers,
Antoine

-Ursprüngliche Nachricht-
Von: Shatzer, Larry [mailto:[EMAIL PROTECTED]
Gesendet: Freitag, 12. September 2003 17:22
An: '[EMAIL PROTECTED]'
Betreff: [PATCH] More typos


Even more typos/misspellings...

-- Larry




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java Ant.java AntStructure.java Antlib.java AntlibInterface.java Available.java

2003-09-12 Thread antoine
antoine 2003/09/12 13:56:46

  Modified:src/main/org/apache/tools/ant BuildException.java
ExitException.java Main.java Project.java
ProjectHelper.java PropertyHelper.java
RuntimeConfigurable.java Task.java TypeAdapter.java
XmlLogger.java
   src/main/org/apache/tools/ant/filters StripJavaComments.java
TailFilter.java TokenFilter.java
   src/main/org/apache/tools/ant/helper ProjectHelper2.java
ProjectHelperImpl.java
   src/main/org/apache/tools/ant/launch Locator.java
   src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
Ant.java AntStructure.java Antlib.java
AntlibInterface.java Available.java
  Log:
  Typos
  Submitted by: Larry Shatzer (larry dot shatzer at servent dot com)
  
  Revision  ChangesPath
  1.19  +2 -2  ant/src/main/org/apache/tools/ant/BuildException.java
  
  Index: BuildException.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/BuildException.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- BuildException.java   10 Feb 2003 14:13:29 -  1.18
  +++ BuildException.java   12 Sep 2003 20:56:45 -  1.19
  @@ -1,7 +1,7 @@
   /*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -66,7 +66,7 @@
   /** Exception that might have caused this one. */
   private Throwable cause;
   
  -/** Location in the build file where the exception occured */
  +/** Location in the build file where the exception occurred */
   private Location location = Location.UNKNOWN_LOCATION;
   
   /**
  
  
  
  1.10  +1 -1  ant/src/main/org/apache/tools/ant/ExitException.java
  
  Index: ExitException.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ExitException.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ExitException.java27 Aug 2003 14:23:16 -  1.9
  +++ ExitException.java12 Sep 2003 20:56:45 -  1.10
  @@ -78,7 +78,7 @@
   
   /**
* Constructs an exit exception.
  - * @param msg the messge to be displayed.
  + * @param msg the message to be displayed.
* @param status the status code returned via System.exit()
*/
   public ExitException(String msg, int status) {
  
  
  
  1.95  +4 -4  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- Main.java 12 Sep 2003 14:01:39 -  1.94
  +++ Main.java 12 Sep 2003 20:56:45 -  1.95
  @@ -71,7 +71,7 @@
   
   /**
* Command line entry point into Ant. This class is entered via the
  - * cannonical `public static void main` entry point and reads the
  + * canonical `public static void main` entry point and reads the
* command line arguments. It then assembles and executes an Ant
* project.
* 
  @@ -462,7 +462,7 @@
   }
   
   // make sure it's not a directory (this falls into the ultra
  -// paranoid lets check everything catagory
  +// paranoid lets check everything category
   
   if (buildFile.isDirectory()) {
   System.out.println("What? Buildfile: " + buildFile + " is a 
dir!");
  @@ -540,7 +540,7 @@
* Search parent directories for the build file.
* 
* Takes the given target as a suffix to append to each
  - * parent directory in seach of a build file.  Once the
  + * parent directory in search of a build file.  Once the
* root of the file-system has been reached an exception
* is thrown.
*
  @@ -618,7 +618,7 @@
   oldsm = System.getSecurityManager();
   
   //SecurityManager can not be installed here for backwards
  -//compatability reasons (PD). Needs to be loaded prior to
  +//compatibility reasons (PD). Needs to be loaded prior to
   //ant class if we are going to implement it.
   //System.setSecurityManager(new NoExitSecurityManager());
   }
  
  
  
  1.154 +7 -7  ant/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===
  RCS 

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java

2003-09-12 Thread antoine
antoine 2003/09/12 13:32:29

  Modified:.WHATSNEW
   src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
  Log:
  send the filename in the proper remote format in the site command done
  to chmod a file after a put
  PR: 23143
  
  Revision  ChangesPath
  1.498 +3 -0  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.497
  retrieving revision 1.498
  diff -u -r1.497 -r1.498
  --- WHATSNEW  10 Sep 2003 18:20:45 -  1.497
  +++ WHATSNEW  12 Sep 2003 20:32:29 -  1.498
  @@ -219,6 +219,9 @@
   * ftp chmod failed when the remote system was UNIX and local system Windows
 Bugzilla Report 21865.
   
  +* ftp put with chmod failed when the remote system was UNIX and local system 
Windows
  +  Bugzilla Report 23143.
  +
   * ftp did not set the ascii mode explicity, causing problems with ftp servers
 having binary as default
   
  
  
  
  1.52  +1 -1  
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- FTP.java  22 Aug 2003 11:23:48 -  1.51
  +++ FTP.java  12 Sep 2003 20:32:29 -  1.52
  @@ -1706,7 +1706,7 @@
   } else {
   // see if we should issue a chmod command
   if (chmod != null) {
  -doSiteCommand(ftp, "chmod " + chmod + " " + filename);
  +doSiteCommand(ftp, "chmod " + chmod + " " + 
resolveFile(filename));
   }
   log("File " + file.getAbsolutePath() + " copied to " + 
server,
   Project.MSG_VERBOSE);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23143] - FTP put (with chmod set) from Windows-to-UNIX: wrong separator

2003-09-12 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23143

FTP put (with chmod set) from Windows-to-UNIX: wrong separator

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
   Target Milestone|--- |1.6



--- Additional Comments From [EMAIL PROTECTED]  2003-09-12 20:34 ---
problem fixed in CVS, will be available in the next nightly.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 22758] - [junit] add sun.reflect to the default trace filters

2003-09-12 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22758

[junit] add sun.reflect to the default trace filters

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]



--- Additional Comments From [EMAIL PROTECTED]  2003-09-12 19:20 ---
*** Bug 23144 has been marked as a duplicate of this bug. ***

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23144] - junit filterstack should also filter out sun.reflect.* stuff

2003-09-12 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23144

junit filterstack should also filter out sun.reflect.* stuff

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE



--- Additional Comments From [EMAIL PROTECTED]  2003-09-12 19:20 ---


*** This bug has been marked as a duplicate of 22758 ***

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23144] - junit filterstack should also filter out sun.reflect.* stuff

2003-09-12 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23144

junit filterstack should also filter out sun.reflect.* stuff

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Keywords||PatchAvailable

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23144] - junit filterstack should also filter out sun.reflect.* stuff

2003-09-12 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23144

junit filterstack should also filter out sun.reflect.* stuff





--- Additional Comments From [EMAIL PROTECTED]  2003-09-12 17:56 ---
(The patch is against the CVS head, not against the 1.5 branch or any tag)

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23144] - junit filterstack should also filter out sun.reflect.* stuff

2003-09-12 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23144

junit filterstack should also filter out sun.reflect.* stuff





--- Additional Comments From [EMAIL PROTECTED]  2003-09-12 17:47 ---
Created an attachment (id=8190)
Patch to improve stack trace filtering

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23144] New: - junit filterstack should also filter out sun.reflect.* stuff

2003-09-12 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23144

junit filterstack should also filter out sun.reflect.* stuff

   Summary: junit filterstack should also filter out sun.reflect.*
stuff
   Product: Ant
   Version: 1.5.4
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: Minor
  Priority: Other
 Component: Optional Tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


In the  task, the filterstack attribute causes lines containing
particular strings to be filtered out of stack traces in junit output,
to make the stack traces cleaner. The lines removed have to do with the
junit test invocation glue. The current implementation doesn't quite
finish the job; at least in J2SDK 1.4.2_01 on Windows, and Ant 1.5.4,
I get these lines:

at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)

I will attach a patch to make the stack filter remove these as well.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23143] New: - FTP put (with chmod set) from Windows-to-UNIX: wrong separator

2003-09-12 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23143

FTP put (with chmod set) from Windows-to-UNIX: wrong separator

   Summary: FTP put (with chmod set) from Windows-to-UNIX: wrong
separator
   Product: Ant
   Version: 1.6Alpha (nightly)
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Major
  Priority: Other
 Component: Optional Tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Bug #11044 (FTP chmod action: wrong separator) was fixed in Ant v1.6alpha so 
that the "chmod" action from optional FTP task works correctly when 
transferring files from windows to UNIX.

Unfortunately, a similar bug still exists (in v1.6alpha) in FTP task (FTP.java) 
inside the sendFile method when trying to execute the "put" action with the FTP 
chmod property set. Let me explain (all line #'s listed below are inside 
sendFile method).

Line #1678 creates a file to transfer and then calls resolveFile(filename) to 
fix the separator for the target platform. This is good. What is bad is the 
code on line #1709 to issue a chmod Site Command. The chmod Site Command is 
issued with the the old "filename" variable, which contains the Windows 
separators. Because of this, the chmod is not successful when the source 
platform is Windows and the target platform is UNIX. To fix this, line 1709 
should have been something like:

  doSiteCommand(ftp, "chmod " + chmod + " " + file.getPath());

The file.getPath() will designate the correct separator and the chmod should 
execute successfully.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2003-09-12 Thread conor
conor   2003/09/12 08:42:22

  Modified:src/main/org/apache/tools/ant/taskdefs Ant.java
  Log:
  Verbose it is ...
  
  Revision  ChangesPath
  1.91  +2 -2  ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -w -u -r1.90 -r1.91
  --- Ant.java  12 Sep 2003 14:04:46 -  1.90
  +++ Ant.java  12 Sep 2003 15:42:21 -  1.91
  @@ -411,10 +411,10 @@
   
   if (target != null && !"".equals(target)) {
   try {
  -log("Entering " + antFile + "...");
  +log("Entering " + antFile + "...", Project.MSG_VERBOSE);
   newProject.executeTarget(target);
   } finally {
  -log("Exiting " + antFile + ".");
  +log("Exiting " + antFile + ".", Project.MSG_VERBOSE);
   }
   }
   } finally {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[PATCH] More typos

2003-09-12 Thread Shatzer, Larry
Even more typos/misspellings...

-- Larry

Index: src/main/org/apache/tools/ant/BuildException.java
===
RCS file: 
/home/cvspublic/ant/src/main/org/apache/tools/ant/BuildException.java,v
retrieving revision 1.18
diff -u -r1.18 BuildException.java
--- src/main/org/apache/tools/ant/BuildException.java   10 Feb 2003 14:13:29 
-  1.18
+++ src/main/org/apache/tools/ant/BuildException.java   12 Sep 2003 15:08:05 
-
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
 /** Exception that might have caused this one. */
 private Throwable cause;
 
-/** Location in the build file where the exception occured */
+/** Location in the build file where the exception occurred */
 private Location location = Location.UNKNOWN_LOCATION;
 
 /**
Index: src/main/org/apache/tools/ant/ExitException.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/ExitException.java,v
retrieving revision 1.9
diff -u -r1.9 ExitException.java
--- src/main/org/apache/tools/ant/ExitException.java27 Aug 2003 14:23:16 
-  1.9
+++ src/main/org/apache/tools/ant/ExitException.java12 Sep 2003 15:08:06 
-
@@ -78,7 +78,7 @@
 
 /**
  * Constructs an exit exception.
- * @param msg the messge to be displayed.
+ * @param msg the message to be displayed.
  * @param status the status code returned via System.exit()
  */
 public ExitException(String msg, int status) {
Index: src/main/org/apache/tools/ant/Main.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/Main.java,v
retrieving revision 1.94
diff -u -r1.94 Main.java
--- src/main/org/apache/tools/ant/Main.java 12 Sep 2003 14:01:39 -  
1.94
+++ src/main/org/apache/tools/ant/Main.java 12 Sep 2003 15:08:06 -
@@ -71,7 +71,7 @@
 
 /**
  * Command line entry point into Ant. This class is entered via the
- * cannonical `public static void main` entry point and reads the
+ * canonical `public static void main` entry point and reads the
  * command line arguments. It then assembles and executes an Ant
  * project.
  * 
@@ -462,7 +462,7 @@
 }
 
 // make sure it's not a directory (this falls into the ultra
-// paranoid lets check everything catagory
+// paranoid lets check everything category
 
 if (buildFile.isDirectory()) {
 System.out.println("What? Buildfile: " + buildFile + " is a dir!");
@@ -540,7 +540,7 @@
  * Search parent directories for the build file.
  * 
  * Takes the given target as a suffix to append to each
- * parent directory in seach of a build file.  Once the
+ * parent directory in search of a build file.  Once the
  * root of the file-system has been reached an exception
  * is thrown.
  *
@@ -618,7 +618,7 @@
 oldsm = System.getSecurityManager();
 
 //SecurityManager can not be installed here for backwards
-//compatability reasons (PD). Needs to be loaded prior to
+//compatibility reasons (PD). Needs to be loaded prior to
 //ant class if we are going to implement it.
 //System.setSecurityManager(new NoExitSecurityManager());
 }
Index: src/main/org/apache/tools/ant/Project.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.153
diff -u -r1.153 Project.java
--- src/main/org/apache/tools/ant/Project.java  4 Sep 2003 11:46:03 -   
1.153
+++ src/main/org/apache/tools/ant/Project.java  12 Sep 2003 15:08:07 -
@@ -228,11 +228,11 @@
 
 /**
  * Set the default System input stream. Normally this stream is set to
- * System.in. This inputStream is used when no task inptu redirection is
+ * System.in. This inputStream is used when no task input redirection is
  * being performed.
  *
  * @param defaultInputStream the default input stream to use when input
- *is reuested.
+ *is requested.
  * @since Ant 1.6
  */
 public void setDefaultInputStream(InputStream defaultInputStream) {
@@ -242,7 +242,7 @@
 /**
  * Get this project's input stream
  *
- * @return the InputStream instance in use by this Porject instance to
+ * @return the InputStream instance in use by this Project instance to
  * read input
  */
 public InputStream getDefaultInputStream() {
@@ -332,7 +332,7 @@
  * Factory method to create a class loader 

RE: cvs commit: ant check.xml

2003-09-12 Thread Dominique Devienne
Typo. --DD

> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Friday, September 12, 2003 9:44 AM
> To: [EMAIL PROTECTED]
> Subject: cvs commit: ant check.xml
> 
>   Index: check.xml
>   ===
>   RCS file: /home/cvs/ant/check.xml,v
>   +  
>   +Check Ants codebase against certain code styleguid rules using
--^e---

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant check.xml

2003-09-12 Thread jhm
jhm 2003/09/12 07:43:52

  Modified:.check.xml
  Log:
  document the buildfile (target and project level)
  
  Revision  ChangesPath
  1.11  +23 -8 ant/check.xml
  
  Index: check.xml
  ===
  RCS file: /home/cvs/ant/check.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- check.xml 20 Jul 2003 09:47:19 -  1.10
  +++ check.xml 12 Sep 2003 14:43:52 -  1.11
  @@ -1,6 +1,22 @@
   
   
   
  +  
  +Check Ants codebase against certain code styleguid rules using
  +checkstyle and simian.
  +
  +Checkstyle uses an abstract syntax tree (AST) for doing checks
  +against java sources. It is available at 
http://checkstyle.sourceforge.net/
  +under GPL 2.1 license.
  +
  +"Simian (Similarity Analyser) identifies duplication in Java, C#, C,
  +CPP, COBOL, JSP, HTML source code and even plain text files."
  +It is available at http://www.redhillconsulting.com.au/products/simian/
  +and is for free use in open source projects.
  +
  +See external task page and homepages for more information.
  +  
  +
 
 
   
  @@ -17,10 +33,10 @@
 
   
 
  +  
   
  -  
  +  
   
  -
   
 
 
  @@ -31,7 +47,7 @@
   
 
   
  -  
  +  
   
   
  @@ -39,30 +55,29 @@
   
 
   
  -  
  +  
   
   
 
   
  -  
  +  
   
 
   
 
   
  -  
  +  
   
 
   
 
   
  -  
  +  
   
   
   
 
   
   
  -
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2003-09-12 Thread Stefan Bodewig
On Sat, 13 Sep 2003, Conor MacNeill <[EMAIL PROTECTED]>
wrote:

> The question I have is whether to log at INFO or VERBOSE level.

I'd say VERBOSE.

Stefan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Ant.ja va

2003-09-12 Thread Dominique Devienne
I saw the CVS mail, and I didn't like the fact that you logged at INFO
level... I have builds for a project that includes many native libs built
with CppTasks that are 'd, and I sure don't want all these messages
to start appearing, especially since I already use NoBannerLogger and don't
want traversal info when nothing is done in a particular project.

These messages are all the more useless since I own impl of NoBannerLogger
displays the hierarchy of Projects next to the target banner.

-1 to INFO
+1 to DEBUG or VERBOSE

--DD

> -Original Message-
> From: Conor MacNeill [mailto:[EMAIL PROTECTED]
> Sent: Friday, September 12, 2003 9:22 AM
> To: Ant Developers List
> Subject: Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs
> Ant.java
> 
> On Sat, 13 Sep 2003 12:04 am, [EMAIL PROTECTED] wrote:
> > conor   2003/09/12 07:04:46
> >
> >   Modified:src/main/org/apache/tools/ant/taskdefs Ant.java
> >   Log:
> >   Mark entry and exit of  and 
> >
> >   PR:   22718
> >   Submitted by: Jesse Glick
> >
> 
> This gives a message on entry and exit to a sub-build (via  and
> ). I think this can be useful when debugging a complex build.
> 
> The question I have is whether to log at INFO or VERBOSE level.
> 
> Conor
> 
> 
> 
> -
> 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/docs/manual/OptionalTasks script.html

2003-09-12 Thread jhm
jhm 2003/09/12 07:15:17

  Modified:docs/manual/OptionalTasks script.html
  Log:
  Link to documentation of "JavaAdapter".
  How to import classes outside of "java" namespace.
  
  Revision  ChangesPath
  1.13  +18 -4 ant/docs/manual/OptionalTasks/script.html
  
  Index: script.html
  ===
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/script.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- script.html   16 Jun 2003 10:09:09 -  1.12
  +++ script.html   12 Sep 2003 14:15:17 -  1.13
  @@ -9,14 +9,14 @@
   
   Script
   Description
  -Execute a script in a 
  +Execute a script in a
 http://jakarta.apache.org/bsf"; target="_top">Apache BSF 
supported language.
   Note: This task depends on external libraries not included in the 
Ant distribution.
   See Library Dependencies 
for more information.
   All items (tasks, targets, etc) of the running project are
   accessible from the script, using either their name or
   id attributes (as long as their names are considered
  -valid Java identifiers, that is). 
  +valid Java identifiers, that is).
   The name "project" is a pre-defined reference to the Project, which can be
   used instead of the project name. The name "self" is a pre-defined reference 
to the actual