AW: cvs commit: ant/src/main/org/apache/tools/ant/launch Launcher.java

[Antoine Lévy-Lambert]

OOPS - I had not read yet the commit of Conor in the ANT_16_BRANCH.
This change is superfluous, I think we will certainly copy to HEAD the
version of ANT_16_BRANCH.
Sorry about that one.
Antoine

-Ursprüngliche Nachricht-
Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Gesendet: Mittwoch, 24. September 2003 00:42
An: [EMAIL PROTECTED]
Betreff: cvs commit: ant/src/main/org/apache/tools/ant/launch
Launcher.java


antoine 2003/09/23 15:42:24

  Modified:src/main/org/apache/tools/ant/launch Launcher.java
  Log:
  remove the -lib argument in Launcher if this is the last argument, since
Main
  does not know what to do with it
  PR: 23358

  Revision  ChangesPath
  1.7   +8 -2
ant/src/main/org/apache/tools/ant/launch/Launcher.java

  Index: Launcher.java
  ===
  RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/launch/Launcher.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Launcher.java 22 Sep 2003 21:10:10 -  1.6
  +++ Launcher.java 23 Sep 2003 22:42:23 -  1.7
  @@ -127,10 +127,16 @@
   break;
   }
   }
  -if (libPath.equals("")) {
  +if (args.length > 0 && args[args.length -1].equals("-lib")) {
  +// if the last argument is -lib
  +// remove it from the arguments passed to Launcher
  +//
  +newargs = new String[args.length - 1];
  +System.arraycopy(args, 0, newargs, 0, args.length -1);
  +} else if (libPath.equals("")) {
  newargs = new String[args.length];
  System.arraycopy(args, 0, newargs, 0, args.length);
  -} else {
  +}  else {
   newargs = new String[args.length - 2];
   // copy the beginning of the args array
   if (argcount > 0 ) {




-
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/src/main/org/apache/tools/ant/launch Launcher.java

[antoine]

antoine 2003/09/23 15:42:24

  Modified:src/main/org/apache/tools/ant/launch Launcher.java
  Log:
  remove the -lib argument in Launcher if this is the last argument, since Main
  does not know what to do with it
  PR: 23358
  
  Revision  ChangesPath
  1.7   +8 -2  ant/src/main/org/apache/tools/ant/launch/Launcher.java
  
  Index: Launcher.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Launcher.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Launcher.java 22 Sep 2003 21:10:10 -  1.6
  +++ Launcher.java 23 Sep 2003 22:42:23 -  1.7
  @@ -127,10 +127,16 @@
   break;
   }
   }
  -if (libPath.equals("")) {
  +if (args.length > 0 && args[args.length -1].equals("-lib")) {
  +// if the last argument is -lib
  +// remove it from the arguments passed to Launcher
  +//
  +newargs = new String[args.length - 1];
  +System.arraycopy(args, 0, newargs, 0, args.length -1);
  +} else if (libPath.equals("")) {
  newargs = new String[args.length];
  System.arraycopy(args, 0, newargs, 0, args.length);
  -} else {
  +}  else {
   newargs = new String[args.length - 2];
   // copy the beginning of the args array
   if (argcount > 0 ) {
  
  
  

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

DO NOT REPLY [Bug 23358] - dist/bin/ant complains of nonexistant -lib option

[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=23358

dist/bin/ant complains of nonexistant -lib option

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]
 AssignedTo|[EMAIL PROTECTED]  |[EMAIL PROTECTED]
   Target Milestone|--- |1.6



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 22:34 ---
Will fix this one, sorry.

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

cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs ReplaceTest.java

[antoine]

antoine 2003/09/23 15:15:32

  Modified:src/etc/testcases/taskdefs Tag: ANT_16_BRANCH replace.xml
   src/etc/testcases/taskdefs/replace Tag: ANT_16_BRANCH
result.txt
   src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH ReplaceTest.java
  Log:
  Merge from HEAD into ANT_16_BRANCH the fix for ReplaceTest
  to make test9 pass under cygwin
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.4.2.1   +16 -5 ant/src/etc/testcases/taskdefs/replace.xml
  
  Index: replace.xml
  ===
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/replace.xml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- replace.xml   28 Jul 2003 00:16:06 -  1.4
  +++ replace.xml   23 Sep 2003 22:15:32 -  1.4.2.1
  @@ -2,6 +2,8 @@
   
   
   
  +  
  +
 
   
 
  @@ -41,13 +43,22 @@
   
 
   
  -  
  -
  -
  -
  +  
  +
  +
  +
  +
  +
  +
  +
  +
  +  
  +  
  +
  +
 
   
 
  -  
  +  
 
   
  
  
  
  No   revision
  No   revision
  1.1.2.1   +1 -0  ant/src/etc/testcases/taskdefs/replace/result.txt
  
  Index: result.txt
  ===
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/replace/result.txt,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- result.txt28 Jul 2003 00:16:06 -  1.1
  +++ result.txt23 Sep 2003 22:15:32 -  1.1.2.1
  @@ -4,3 +4,4 @@
   This is line four
   This is line five
   This is line six
  +
  
  
  
  No   revision
  No   revision
  1.8.2.1   +3 -2  
ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
  
  Index: ReplaceTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- ReplaceTest.java  28 Jul 2003 00:16:06 -  1.8
  +++ ReplaceTest.java  23 Sep 2003 22:15:32 -  1.8.2.1
  @@ -108,8 +108,9 @@
   
   public void test9() throws IOException{
   executeTarget("test9");
  -assertEqualContent(new File(TEST_PATH + "result.txt"),
  -new File(TEST_PATH + "output.txt"));
  +String tmpdir = project.getProperty("tmp.dir");
  +assertEqualContent(new File(tmpdir, "result.txt"),
  +new File(tmpdir, "output.txt"));
   }
   public void tearDown() {
   executeTarget("cleanup");
  
  
  

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

cvs commit: ant/docs/manual/CoreTypes custom-programming.html

[antoine]

antoine 2003/09/23 15:12:36

  Modified:docs/manual/CoreTypes custom-programming.html
  Log:
  xml escapes " replaced by literal quotes
  merged back from ANT_16_BRANCH
  
  Revision  ChangesPath
  1.4   +28 -28ant/docs/manual/CoreTypes/custom-programming.html
  
  Index: custom-programming.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTypes/custom-programming.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- custom-programming.html   23 Sep 2003 11:35:53 -  1.3
  +++ custom-programming.html   23 Sep 2003 22:12:36 -  1.4
  @@ -57,7 +57,7 @@
   public class AllUpperCaseCondition extends Condition {
   private String value;
   
  -// The setter for the "value" attribute
  +// The setter for the "value" attribute
   public void setValue(String value) {
   this.value = value;
   }
  @@ -65,7 +65,7 @@
   // This method evaluates the condition
   public boolean eval() {
   if (value == null) {
  -throw new BuildException("value attribute is not set");
  +throw new BuildException("value attribute is not set");
   }
   return value.toUpperCase().equals(value);
  }
  @@ -79,9 +79,9 @@
   
 
   
  +name="alluppercase"
  +classname="com.mydomain.AllUpperCaseCondition"
  +classpath="${mydomain.classes}"/>
 
   
   
  @@ -90,8 +90,8 @@
   
   
 
  -
  -   
  +
  +   
   
 
   
  @@ -109,7 +109,7 @@
   
   
 An example of a custom selection that selects filenames ending
  -  in ".java" would be:
  +  in ".java" would be:
   
   
 
  @@ -118,7 +118,7 @@
   import org.apache.tools.ant.types.selectors.FileSelector;
   public class JavaSelector implements FileSelector {
   public boolean isSelected(File b, String filename, File f) {
  -   return filename.toLowerCase().endsWith(".java");
  +   return filename.toLowerCase().endsWith(".java");
   }
   }
 
  @@ -129,9 +129,9 @@
   
 
   
  +name="javaselector"
  +classname="com.mydomain.JavaSelector"
  +classpath="${mydomain.classes}"/>
 
   
   
  @@ -140,8 +140,8 @@
   
   
 
  -
  -   
  +
  +   
 
  
   
  @@ -189,7 +189,7 @@
   }
   public void verifySettings() {
   if (number < 0) {
  -   throw new BuildException("Number attribute should be 
set");
  +   throw new BuildException("Number attribute should be set");
   }
   }
   public boolean isSelected(File baseDir, String filename, File file) {
  @@ -211,13 +211,13 @@
   
   
 
  -
  +
   ...
  -
  -   
  -  
  -  
  +
  +   
  +  
  +  
 
  
   
  @@ -291,9 +291,9 @@
   
   
   
  -
  -
  -
  +
  +
  +
   
   
 
  @@ -324,9 +324,9 @@
   to use the selector through .
   
   
  -
  -
  -
  +
  +
  +
   
   
 
  @@ -385,7 +385,7 @@
  private void lineNumber = 0;
  public String filter(String string) {
 lineNumber++;
  -  return "" + lineNumber + "\t" + string;
  +  return "" + lineNumber + "\t" + string;
  }
   }
  

DO NOT REPLY [Bug 23341] - breaks binary files

[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=23341

 breaks binary files





--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 22:13 ---
So it does, my apologies.

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

cvs commit: ant/docs/manual/CoreTypes custom-programming.html

[antoine]

antoine 2003/09/23 15:05:01

  Modified:docs/manual/CoreTypes Tag: ANT_16_BRANCH
custom-programming.html
  Log:
  Putting back quotes instead of xml escape "
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.2   +28 -28ant/docs/manual/CoreTypes/custom-programming.html
  
  Index: custom-programming.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTypes/custom-programming.html,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- custom-programming.html   23 Sep 2003 11:49:42 -  1.2.2.1
  +++ custom-programming.html   23 Sep 2003 22:05:01 -  1.2.2.2
  @@ -57,7 +57,7 @@
   public class AllUpperCaseCondition extends Condition {
   private String value;
   
  -// The setter for the "value" attribute
  +// The setter for the "value" attribute
   public void setValue(String value) {
   this.value = value;
   }
  @@ -65,7 +65,7 @@
   // This method evaluates the condition
   public boolean eval() {
   if (value == null) {
  -throw new BuildException("value attribute is not set");
  +throw new BuildException("value attribute is not set");
   }
   return value.toUpperCase().equals(value);
  }
  @@ -79,9 +79,9 @@
   
 
   
  +name="alluppercase"
  +classname="com.mydomain.AllUpperCaseCondition"
  +classpath="${mydomain.classes}"/>
 
   
   
  @@ -90,8 +90,8 @@
   
   
 
  -
  -   
  +
  +   
   
 
   
  @@ -109,7 +109,7 @@
   
   
 An example of a custom selection that selects filenames ending
  -  in ".java" would be:
  +  in ".java" would be:
   
   
 
  @@ -118,7 +118,7 @@
   import org.apache.tools.ant.types.selectors.FileSelector;
   public class JavaSelector implements FileSelector {
   public boolean isSelected(File b, String filename, File f) {
  -   return filename.toLowerCase().endsWith(".java");
  +   return filename.toLowerCase().endsWith(".java");
   }
   }
 
  @@ -129,9 +129,9 @@
   
 
   
  +name="javaselector"
  +classname="com.mydomain.JavaSelector"
  +classpath="${mydomain.classes}"/>
 
   
   
  @@ -140,8 +140,8 @@
   
   
 
  -
  -   
  +
  +   
 
  
   
  @@ -189,7 +189,7 @@
   }
   public void verifySettings() {
   if (number < 0) {
  -   throw new BuildException("Number attribute should be 
set");
  +   throw new BuildException("Number attribute should be set");
   }
   }
   public boolean isSelected(File baseDir, String filename, File file) {
  @@ -211,13 +211,13 @@
   
   
 
  -
  +
   ...
  -
  -   
  -  
  -  
  +
  +   
  +  
  +  
 
  
   
  @@ -291,9 +291,9 @@
   
   
   
  -
  -
  -
  +
  +
  +
   
   
 
  @@ -324,9 +324,9 @@
   to use the selector through .
   
   
  -
  -
  -
  +
  +
  +
   
   
 
  @@ -385,7 +385,7 @@
  private void lineNumber = 0;
  public String filter(String string) {
 lineNumber++;
  -  ret

cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs ReplaceTest.java

[antoine]

antoine 2003/09/23 14:51:14

  Modified:src/etc/testcases/taskdefs replace.xml
   src/etc/testcases/taskdefs/replace result.txt
   src/testcases/org/apache/tools/ant/taskdefs ReplaceTest.java
  Log:
  Make replace tests pass on cygwin (test9 was failing)
  
  Revision  ChangesPath
  1.5   +16 -5 ant/src/etc/testcases/taskdefs/replace.xml
  
  Index: replace.xml
  ===
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/replace.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- replace.xml   28 Jul 2003 00:16:06 -  1.4
  +++ replace.xml   23 Sep 2003 21:51:14 -  1.5
  @@ -2,6 +2,8 @@
   
   
   
  +  
  +
 
   
 
  @@ -41,13 +43,22 @@
   
 
   
  -  
  -
  -
  -
  +  
  +
  +
  +
  +
  +
  +
  +
  +
  +  
  +  
  +
  +
 
   
 
  -  
  +  
 
   
  
  
  
  1.2   +1 -0  ant/src/etc/testcases/taskdefs/replace/result.txt
  
  Index: result.txt
  ===
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/replace/result.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- result.txt28 Jul 2003 00:16:06 -  1.1
  +++ result.txt23 Sep 2003 21:51:14 -  1.2
  @@ -4,3 +4,4 @@
   This is line four
   This is line five
   This is line six
  +
  
  
  
  1.9   +3 -2  
ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
  
  Index: ReplaceTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ReplaceTest.java  28 Jul 2003 00:16:06 -  1.8
  +++ ReplaceTest.java  23 Sep 2003 21:51:14 -  1.9
  @@ -108,8 +108,9 @@
   
   public void test9() throws IOException{
   executeTarget("test9");
  -assertEqualContent(new File(TEST_PATH + "result.txt"),
  -new File(TEST_PATH + "output.txt"));
  +String tmpdir = project.getProperty("tmp.dir");
  +assertEqualContent(new File(tmpdir, "result.txt"),
  +new File(tmpdir, "output.txt"));
   }
   public void tearDown() {
   executeTarget("cleanup");
  
  
  

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

AW: Tasks, Taskdefs, classpaths, and ClassNotFound...

[Antoine Levy-Lambert]

Hi David,

I have experienced the same problem as you.
I have created a custom ant task called JNDIConnect.
This task is being given JNDI properties and establishes a connection to a
JNDI provider with the ritual "Context ctx = new InitialContext(env);"

This thing is obviously calling some kind of factory method too which will
use the name of the class of the JNDI provider to instantiate it.

In practice the custom task only works if the FSContext.jar and
providerutil.jar are in the classpath. (I am doing my tests with the file
system JNDI provider).

Your solution to this issue of class loading is certainly useful.

Cheers,

Antoine

-Ursprungliche Nachricht-
Von: David Wood [mailto:[EMAIL PROTECTED]
Gesendet: Dienstag, 23. September 2003 17:18
An: [EMAIL PROTECTED]; user@ant.apache.org
Betreff: Tasks, Taskdefs, classpaths, and ClassNotFound...


Hi everybody. I'm posting this to the lists in the hopes that the search
engines will pick it up and provide more help than I got. When I looked, I
saw lots of messages along the lines of "Help! Can't Define/change the
classpath within the ant build file"... but no good answers.

It seems some people were using or even defining their own custom Tasks,
only to find that "ClassNotFoundErrors" or "ClassCastExceptions" were
popping up as a result. If their experience was anything like mine, they
found that they could certainly define the classpath used to load their
custom task, but that once that task was loaded, it had problems finding
other classes it needed - even if they were within the classpath given in
the taskdef. A perplexing and frustruating problem.

The ugly solutions are obvious:

1) Using a script (or abusing your wrists) to specify a "system classpath"
for all of ant that includes the classes that your task can't find. This
is ugly, especially when not only is it unnecessary, but you're so close
to not needing to do it.

2) Putting all of the jars/classes that your task can't find into
ANT_HOME/lib. So now installation/transport of whatever you're doing is a
pain, and you've crudded up the ant namespace for every user of ant on
that system, potentially causing other problems.

I scoured google finding nothing of any substance about what exactly
caused this problem, or how it might be fixed. There were, however, a few
clues that led me to examine Cactus and JUnit, which have, in various
ways, dealt with issues of loading arbitrary classes in ant.

Ordinary Java operations like "new", casting literals, variable
declarations, and other "conventional" language features will operate via
the ClassLoader that loaded the Object they're running in. Even the
Reflection APIs appear to attempt to use the ClassLoader of the calling
Object. This, at least, makes some sense to me.

The problem comes with the way some Factory bootstrappers use reflection.
In these "bad" implementations, reflection will be used to find and
instantiate Factories, but with a "default" ClassLoader, rather than the
ClassLoader of the calling Object. I encountered this in code from Sun, in
the the JDOHelper class, which is used to bootstrap JDO
PersistenceManagerFactories. That method (by default) used the ClassLoader
of the current thread (Thread.currentThread().getContextClassLoader()).
Judging by other messages I found hunting around the net, this kind of
thing comes up in other situations as well.

If you defined a classpath for your taskdef, a special AntClassLoader was
created, configured with this classpath, and used to load your Task. But
inside your Task, when you, or anything you call, uses these "sloppy"
bootstrap routines, they can lose that ClassLoader (picking up ant's
instead), and that means that the custom classpath in your taskdef isn't
used.

Who knows what's affected. This may be rare, and I may be unlucky, but
bean stuff, factory stuff, database stuff, testing stuff, or anything else
that uses reflection internally could potentially have a problem. Not many
people write custom tasks that do these sorts of things, but it does come
up, and when it does, it seems to have left a trail of agony.

I found two ways to deal with this problem while making JDO work inside an
ant Task.

The sloppy way is to grab the "right" ClassLoader - the one you creataed
by giving a custom classpath in your taskdef - and shove it into the
current Thread. Yes, you can do that. FYI, these code examples have not
been compiled - they're just to give a general idea. So anywhere in the
Task (init(), execute()), but ideally right before the problem occurs:

  // Get the task class loader we used to load this tag.
  AntClassLoader taskloader = (AntClassLoader)
this.getClass().getClassLoader();

  // Shove it into the Thread, replacing the thread's ClassLoader:
  taskloader.setThreadContextLoader();

Then you do what you have to do. When your done, I highly advise doing a:

  // Reset the Thread's original ClassLoader.
  taskloader.resetThreadContextLoader();

Yes, taskloader remembers the or

DO NOT REPLY [Bug 18391] - RFE : ignoreMissingBuildFiles option for subant

[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=18391

RFE : ignoreMissingBuildFiles option for subant

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|DUPLICATE   |



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 21:24 ---
I've stubbed my toe on a use case that "just use filesets" does not cover now so
I am going to reopen this... I discovered it when I tried to migrate away from
my old patched version of ant (patched with the patch I submitted, and thus
allowing the ignoreMissingBuildFile atribute) to a newer version.


  


Elswhere I define


  

  



I definately want a dirset for this path, when it is used for copying as I want
the entire directories which include among other things, java code, libraries,
images and build files, but I definately don't want to fail if it copies a
directory that doesn't have a build file (there are many). I DO very much want
the build to fail if one of the sub builds fail. 

I would like to not need to maintain 2 specifications of this path. (the second
one being a fileset with the pattern "*/*/*/psets/*/build.xml). 

I am entirely open to an alternate (shorter!) name for the atribute, but don't
seem to be able to think of one I like better

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

cvs commit: ant/src/testcases/org/apache/tools/ant/filters ConcatFilterTest.java

[jhm]

jhm 2003/09/23 14:21:01

  Modified:src/etc/testcases/filters concat.xml
   src/main/org/apache/tools/ant/filters ConcatFilter.java
   src/testcases/org/apache/tools/ant/filters
ConcatFilterTest.java
  Log:
  Let ConcatFilterTest delete its files without exceptions.
  
  Revision  ChangesPath
  1.3   +1 -1  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
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- concat.xml19 Sep 2003 09:24:13 -  1.2
  +++ concat.xml23 Sep 2003 21:21:01 -  1.3
  @@ -93,7 +93,7 @@
 
   
   
  +  tofile="result/concat.ConcatFilterPrependAppend.test">
 
   
 
  
  
  
  1.3   +21 -15
ant/src/main/org/apache/tools/ant/filters/ConcatFilter.java
  
  Index: ConcatFilter.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/filters/ConcatFilter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConcatFilter.java 19 Sep 2003 09:24:13 -  1.2
  +++ ConcatFilter.java 23 Sep 2003 21:21:01 -  1.3
  @@ -76,7 +76,7 @@
* file.
*
* @since 1.6
  - * @version 2003-09-17
  + * @version 2003-09-23
* @author Jan Matèrne
*/
   public final class ConcatFilter extends BaseParamFilterReader
  @@ -89,10 +89,10 @@
   private File append;
   
   /** Reader for prepend-file. */
  -private Reader prependReader = new EmptyReader();
  +private Reader prependReader = null;
   
   /** Reader for append-file. */
  -private Reader appendReader = new EmptyReader();
  +private Reader appendReader = null;
   
   /**
* Constructor for "dummy" instances.
  @@ -136,12 +136,28 @@
   
   // The readers return -1 if they end. So simply read the "prepend"
   // after that the "content" and at the end the "append" file.
  -ch = prependReader.read();
  +if (prependReader != null) {
  +ch = prependReader.read();
  +if (ch == -1) {
  +// I am the only one so I have to close the reader
  +prependReader.close();
  +prependReader = null;
  +}
  +}
   if (ch == -1) {
   ch = super.read();
   }
   if (ch == -1) {
  -ch = appendReader.read();
  +// don´t call super.close() because that reader is used
  +// on other places ...
  +if (appendReader != null) {
  +ch = appendReader.read();
  +if (ch == -1) {
  +// I am the only one so I have to close the reader
  +appendReader.close();
  +appendReader = null;
  +}
  +}
   }
   
   return ch;
  @@ -233,14 +249,4 @@
   appendReader = new BufferedReader(new FileReader(append));
   }
  }
  -
  -   /**
  -* Reader which is always at the end of file.
  -* Used for easier algorithm (polymorphism instead if-cascades).
  -*/
  -   private class EmptyReader extends Reader {
  -   public int read(char[] ch, int i1, int i2) { return -1; }
  -   public void close() { }
  -   }
  -
   }
  
  
  
  1.3   +65 -70
ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
  
  Index: ConcatFilterTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConcatFilterTest.java 19 Sep 2003 09:24:13 -  1.2
  +++ ConcatFilterTest.java 23 Sep 2003 21:21:01 -  1.3
  @@ -111,22 +111,7 @@
   }
   
   public void tearDown() {
  -// I dont know why - but on my machine I always get a
  -// "Unable to delete file ...result\append.txt" (or prepend.txt)
  -// from Delete.removeDir(Delete.java:612).
  -// Win2000, JDK 1.4.1_02
  -// A  before  doesn´t work. From 10ms to 3000ms.
  -// I modified the taskdefs.Delete.DELETE_RETRY_SLEEP_MILLIS
  -// from 10 up to 2000 ms, but no success.
  -// So I give up - and hope for a suggestion from another one.
  -// But this shouldn´t let the testcases fail, so I do the cleanup
  -// inside a try-block
  -//Jan
  -try {
  -executeTarget("cleanup");
  -} catch (Exception e) {
  -e.printStackTrace();
  -}
  +executeTarget("cleanup");
   }
   
   public void testFilterReaderNoArgs() throws IOException

cvs commit: ant/src/testcases/org/apache/tools/ant/filters ConcatFilterTest.java

[jhm]

jhm 2003/09/23 14:07:00

  Modified:src/etc/testcases/filters Tag: ANT_16_BRANCH concat.xml
   src/main/org/apache/tools/ant/filters Tag: ANT_16_BRANCH
ConcatFilter.java
   src/testcases/org/apache/tools/ant/filters Tag:
ANT_16_BRANCH ConcatFilterTest.java
  Log:
  Let ConcatFilterTest delete its files without exceptions.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.1   +1 -1  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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- concat.xml19 Sep 2003 09:24:13 -  1.2
  +++ concat.xml23 Sep 2003 21:07:00 -  1.2.2.1
  @@ -93,7 +93,7 @@
 
   
   
  +  tofile="result/concat.ConcatFilterPrependAppend.test">
 
   
 
  
  
  
  No   revision
  No   revision
  1.2.2.1   +21 -15
ant/src/main/org/apache/tools/ant/filters/ConcatFilter.java
  
  Index: ConcatFilter.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/filters/ConcatFilter.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ConcatFilter.java 19 Sep 2003 09:24:13 -  1.2
  +++ ConcatFilter.java 23 Sep 2003 21:07:00 -  1.2.2.1
  @@ -76,7 +76,7 @@
* file.
*
* @since 1.6
  - * @version 2003-09-17
  + * @version 2003-09-23
* @author Jan Matèrne
*/
   public final class ConcatFilter extends BaseParamFilterReader
  @@ -89,10 +89,10 @@
   private File append;
   
   /** Reader for prepend-file. */
  -private Reader prependReader = new EmptyReader();
  +private Reader prependReader = null;
   
   /** Reader for append-file. */
  -private Reader appendReader = new EmptyReader();
  +private Reader appendReader = null;
   
   /**
* Constructor for "dummy" instances.
  @@ -136,12 +136,28 @@
   
   // The readers return -1 if they end. So simply read the "prepend"
   // after that the "content" and at the end the "append" file.
  -ch = prependReader.read();
  +if (prependReader != null) {
  +ch = prependReader.read();
  +if (ch == -1) {
  +// I am the only one so I have to close the reader
  +prependReader.close();
  +prependReader = null;
  +}
  +}
   if (ch == -1) {
   ch = super.read();
   }
   if (ch == -1) {
  -ch = appendReader.read();
  +// don´t call super.close() because that reader is used
  +// on other places ...
  +if (appendReader != null) {
  +ch = appendReader.read();
  +if (ch == -1) {
  +// I am the only one so I have to close the reader
  +appendReader.close();
  +appendReader = null;
  +}
  +}
   }
   
   return ch;
  @@ -233,14 +249,4 @@
   appendReader = new BufferedReader(new FileReader(append));
   }
  }
  -
  -   /**
  -* Reader which is always at the end of file.
  -* Used for easier algorithm (polymorphism instead if-cascades).
  -*/
  -   private class EmptyReader extends Reader {
  -   public int read(char[] ch, int i1, int i2) { return -1; }
  -   public void close() { }
  -   }
  -
   }
  
  
  
  No   revision
  No   revision
  1.2.2.1   +65 -70
ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
  
  Index: ConcatFilterTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ConcatFilterTest.java 19 Sep 2003 09:24:13 -  1.2
  +++ ConcatFilterTest.java 23 Sep 2003 21:07:00 -  1.2.2.1
  @@ -111,22 +111,7 @@
   }
   
   public void tearDown() {
  -// I dont know why - but on my machine I always get a
  -// "Unable to delete file ...result\append.txt" (or prepend.txt)
  -// from Delete.removeDir(Delete.java:612).
  -// Win2000, JDK 1.4.1_02
  -// A  before  doesn´t work. From 10ms to 3000ms.
  -// I modified the taskdefs.Delete.DELETE_RETRY_SLEEP_MILLIS
  -// from 10 up to 2000 ms, but no success.
  -// So I give up - and hope for a suggestion from another one.
  -// But this shouldn´t let the testcases fail, so I do the cleanup

[patch] [vms] updates to Exec, DirectoryScanner, and FileUtils

[Knut Wannheden]

Hi,

I have been working a little bit again to get Ant to run on OpenVMS. It
seems like most things actually run quite well, which is encouraging. Also
the latest maintainance release of the Java VM (1.4.1-2) fixes some problems
that kept me from using Ant on OpenVMS (e.g. the File#setLastModified(long)
didn't work).

I've attached a patch which includes the following changes:

 .  now supports nested  elements on OpenVMS. As the
Runtime#exec() doesn't support the environment array on OpenVMS  sets
up the environment (logical names) in the DCL script which is generated
 . updates to the documentation for 
 . DirectoryScanner now also works in case sensitive mode on OpenVMS
 . I added a method FileUtils#toVMSPath(File) which returns a VMS style path
for a Unix style path. This method isn't used internally yet, but should be
used in the future for 

I hope to be able to contribute a patch for runant.py once the details of
the launcher -lib option have been worked out.  This is what I use on
OpenVMS to launch Ant.

Cheers,

--knut


begin 666 vms-updates-patch.txt
[EMAIL PROTECTED]($1I5-C86YN97(N:F%V80T*/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/0T*4D-3(&9I;&4Z("]H;VUE+V-V3L-
M"B!I;7!O5-C86YN97(-"B @(" @(" @:6UP;&5M96YTPT*( [EMAIL PROTECTED],@3W!E;E9-4R!T:&4@;W!EPT*(" @
M(" @(" @(" @(" @(" @(" @(" @(" @("!M>69I;&4@/2!F:6YD1FEL92AB
M87-E9&ER+"!C=7)R96YT96QE;65N="D[#0H@(" @(" @(" @(" @(" @(" @
M(" @(" @(" @(&EF("AM>69I;&4@(3T@;G5L;"D@>PT*(" @(" @(" @(" @
M(" @(" @(" @(" @(" @(" @(" @8W5R&5C
M*"[EMAIL PROTECTED]&]E2P-"BL@
M(" @"2\O('-O('=E(&]N;'D@[EMAIL PROTECTED];W!E;G9M&-E<'1I;VX@>PT*+2 @(" @(" @(" @(%-TV-R96%T94-O;6UA
M;F1&:6QE*&-M9"[EMAIL PROTECTED]"E].PT*(" @(" @(" @(" @(')E
M='5R;B!S=7!E&5C*'!R;VIE8W0L('9M&5C*%!R;VIE8W0@<')O:F5C
M="[EMAIL PROTECTED]:[EMAIL PROTECTED]"!3=')I;F=;72!E;G8L#0H@(" @(" @(" @(" @
M(" @(" @(" @(" @(" @($9I;&[EMAIL PROTECTED]:VEN9T1I<[EMAIL 
PROTECTED]&AR;W=S($E/17AC
M97!T:6]N('L-"BT@(" @(" @(" @("!3=')I;F=;72!V;7-#;60@/2![8W)E
M871E0V]M;6%N9$9I;&4H8VUD*2YG9710871H*"E].PT**R @(" @(" @(" @
M(%-T&[EMAIL PROTECTED](" @(" @(" @("HO#0HM(" @(" @("!P&-E<'1I
M;VX@>PT**R @(" @(" @<')I=F%T92!&:6QE(&-R96%T94-O;6UA;F1&:6QE
M*%-T2![#0HM(" @
M(" @(" @(" @(" @(&]U=" ](&YE=R!0PT**PD)"0D):6YT(&[EMAIL PROTECTED]
M#0HK"0D)"0EF;W(@*&EN="!I(#T@,3L@:2 \(&5N=BYL96YG=&@@.R!I*RLI
M('L-"BL)"0D)"0EE<4EN9&5X([EMAIL PROTECTED]&5X3V8H)STG*3L-"BL)
M"0D)"0EI9B H97%);F1E>" A/2 M,2D@>PT**PD)"0D)"0EO=70N<')I;G0H
M([EMAIL PROTECTED]&24Y%+TY/3$]'("(I.PT**PD)"0D)"0EO=70N<')I;G0H96YV6VE=
M+G-U8G-T<[EMAIL PROTECTED]"!E<4EN9&5X*2D[#0HK"0D)"0D)"6]U="YPPT**R @(" @(" @(" @(" @(" @(" @;W5T+G!R:6YT;&XH(B M(BD[#0HK
M(" @(" @(" @(" @(" @(" @("!O=70N<')I;G0H8VUD6VE=*3L-"B @(" @
M(" @(" @(" @(" @?0T*+2 @(" @(" @(" @(" @("!O=70N<')I;G1L;BAD
M8VQ#;60N=&]3=')I;F&5C+FAT;6P-
M"CT]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T-"E)#4R!F:6QE.B O:&]M92]C=G-P
M=6)L:6,O86YT+V1O8W,O;6%N=6%L+T-O&5C+FAT;[EMAIL PROTECTED]
M&5C
M+FAT;6P-"BTM+2!E>&5C+FAT;6P),[EMAIL PROTECTED](#(P,#,@,[EMAIL PROTECTED],C(@+3 
P
M,# ),2XS- T**RLK(&5X96,N:'1M; DR,R!397 @,C P,R R,#HS.3HT,R M
M,# P, T*0$ @+3(P+#(P("LR,"PR-B! 0 T*(#PO<#X-"B @#0H@/&@T/D]P
M96Y635,@57-E&5C=71A8FQE/"]C;V1E/B!A;F0@/&-O9&4^)FQT.V%R
M9R9G=#L\+V-O9&4^#0HK96QE;65N=',@:7,@[EMAIL PROTECTED]>2!A
M&5C
M)[EMAIL PROTECTED]&[EMAIL PROTECTED]:R!I;B!A;B!E;G9I6QE+B @270@:7,@86QS;R!R97%U:7)E
M9"!T:&%T('1H92!L;V=I8V%L#0HM/&-O9&4^2D%6021&3U)+7U-54%!/4E1?
M0TA$25(\+V-O9&4^(&ES('-E="!T;R \8V]D93Y44E5%/"]C;V1E/B H2!F86QS96QY(&-L86EM('[EMAIL PROTECTED]@97)R;W(@
M;V-C=7)E9" H;W(@&ET(&-O9&5S+CPO<#X-"B -"B \:#,^4&%R86UE=&5R
M[EMAIL PROTECTED];"]&:6QE571I;',N:F%V80T*/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/0T*4D-3(&9I;&4Z("]H;VUE+V-V6UB;VQI8R!L:6YKF5D('9E2!D969A=6QT(&EN=&5R;F%L;'[EMAIL PROTECTED]',@5DU3
M('!A=&AS#0HK"2 J('1O(%5N:7@@[EMAIL 
PROTECTED]("8F#0HK"0D)(6YA;64N"DN#0HK"0D)"7)E<&QA8V4H1FEL92YS97!A"D[#0HK"0D)?2!E
M;'-E('L-"BL)"0D)9&ER96-T;W)Y(#T@;F5W(%-T"[EMAIL PROTECTED]&ER16YD*2X-"BL)"0D)"7)E<&QA8V4H1FEL
M92YS97!A2 A/2!N
M=6QL*2![#0HK"0D)9&ER96-T;W)Y+FEN

cvs commit: ant/docs/manual cover.html

[jhm]

jhm 2003/09/23 13:56:32

  Modified:docs/manual cover.html
  Log:
  Forgotten dot at the end.
  
  Revision  ChangesPath
  1.8   +1 -1  ant/docs/manual/cover.html
  
  Index: cover.html
  ===
  RCS file: /home/cvs/ant/docs/manual/cover.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- cover.html22 Sep 2003 15:05:21 -  1.7
  +++ cover.html23 Sep 2003 20:56:32 -  1.8
  @@ -16,7 +16,7 @@
   version then this is not the correct manual set. Please use the 
documentation 
   appropriate to your current version. Also, if you are using a version
   older than the most recent release, we recommend an upgrade to fix bugs
  -as well as provide new functionality 
  +as well as provide new functionality. 
  
   
   
  
  
  

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

cvs commit: ant/docs/manual cover.html

[jhm]

jhm 2003/09/23 13:53:11

  Modified:docs/manual Tag: ANT_16_BRANCH cover.html
  Log:
  Not "alpha" any more. Forgotten dot at the end.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.6.2.1   +2 -2  ant/docs/manual/cover.html
  
  Index: cover.html
  ===
  RCS file: /home/cvs/ant/docs/manual/cover.html,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- cover.html24 Jan 2003 08:55:05 -  1.6
  +++ cover.html23 Sep 2003 20:53:11 -  1.6.2.1
  @@ -9,14 +9,14 @@

 
 Apache Ant 1.6 Manual
  -  This is the manual for version 1.6alpha of 
  +  This is the manual for version 1.6 of 
 http://ant.apache.org/index.html";>Apache Ant. 
   If your version 
   of Ant (as verified with ant -version) is older or newer than 
this 
   version then this is not the correct manual set. Please use the 
documentation 
   appropriate to your current version. Also, if you are using a version
   older than the most recent release, we recommend an upgrade to fix bugs
  -as well as provide new functionality 
  +as well as provide new functionality. 
  
   
   
  
  
  

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

Re: cvs commit: ant/src/script ant

[Gus Heck]

These changes arn't working for me.
See http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23358
-Gus
Knut Wannheden wrote:
These changes expand on Antoine's -lib code to support multiple -lib
   

options.
 

In addition, the -lib option can now name a directory containing jars and
   

all
 

jars in that directory will be added to Ant's launch classpath.
   

So I suppose it isn't possible to add a directory with classes in it as
a -lib option.  The classes need to be packed up in a jar, right?
--
knut

-
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/src/script ant

[Knut Wannheden]

>
> These changes expand on Antoine's -lib code to support multiple -lib
options.
> In addition, the -lib option can now name a directory containing jars and
all
> jars in that directory will be added to Ant's launch classpath.
>

So I suppose it isn't possible to add a directory with classes in it as
a -lib option.  The classes need to be packed up in a jar, right?

--
knut




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

Re: Antidote TODO (WAS:RE: antidote diff)

[Jack J. Woehr]

Christoph Wilhelms wrote:

> > Not familiar with that, but will try to take a look. There is
> > a *possibility* (not a certainty) that I will lose my
> > high-speed connection in the near future, which would make
> > playing with Mozilla a little hard. We'll see what happens.
>
> Mozilla Firebird is mall and fast... Should be no problem for you :-)

Um, 29Mb of source is not "small" on a 56K modem!

> > But ... Preferences and storing them via Properties I
> > understand well. How we handle the GUI side of that "remains
> > to be seen". There is also the NetBeans model of a giant Options tree.
>
> This would be overkill IMO. We should be fine with a (maximum) two level
> hirachy! And remember: Let's keep the "baby" small and fast :-)

Good idea

> Oh: If you need Icons: don't hesitate to tell me! I'll paind them with
> pleasure!

Will do!

--
Jack J. Woehr  # You measure democracy by the freedom it
Senior Consultant  # gives its dissidents, not the freedom
Purematrix, Inc.   # it gives its assimilated conformists.
www.purematrix.com # - Abbie Hoffman

JUnit task - forking only once for a batch

[Philip Aston]

[Initially sent to user@ant.apache.org, resent to a more appropriate
place].



Hi,

I finally got fed up with the cost of forking a new process for every test
(~1 second in my environment). I've hacked  to support a new type
of  where where all of the tests are executed in a single
sub-process. *Much* faster.

I'm quite willing to clean this up and submit it as a patch; but first
I have some questions:


1. Is there planned support for this already?

2. If not, who maintains the JUnit task, and would they like
 

3. If they would, which version of ANT should I base the patch on?
   

Regards,

- Phil

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

Re: ReplaceTest failing under cygwin

[J.Pietschmann]

Antoine Lévy-Lambert wrote:
of tokens and values to System.getProperty("line.separator"), but that the
files used for the tests are terminated with \n only when one uses the
cvs.exe of cygwin.
And if the CygWin is installed using Unix line endings (the default).
Is there anybody out there who checked "Use DOS line endings" for
CygWin?
J.Pietschmann
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 23358] New: - dist/bin/ant complains of nonexistant -lib option

[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=23358

dist/bin/ant complains of nonexistant -lib option

   Summary: dist/bin/ant complains of nonexistant -lib option
   Product: Ant
   Version: 1.7Alpha (nightly)
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: Critical
  Priority: Other
 Component: Wrapper scripts
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I just did a cvs checkout and did a successful build. When I tried to use the
newly built ant, I got the following:

[EMAIL PROTECTED] psets]$ ant
Unknown argument: -lib
ant [options] [target [target2 [target3] ...]]
Options:
  -help, -h  print this message
  -projecthelp, -p   print project help information
  -version   print the version information and exit
  -diagnostics   print information that might be helpful to
 diagnose or report problems.
  -quiet, -q be extra quiet
  -verbose, -v   be extra verbose
  -debug, -d print debugging information
  -emacs, -e produce logging information without adornments
  -logfile use given file for log
-l ''
  -logger the class which is to perform logging
  -listener   add an instance of class as a project listener
  -noinput   do not allow interactive input
  -buildfile   use given buildfile
-file  ''
-f ''
  -D=   use value for given property
  -keep-going, -kexecute all targets that do not depend
 on failed target(s)
  -propertyfileload all properties from file with -D
 properties taking precedence
  -inputhandler   the class which will handle input requests
  -find(s)earch for buildfile towards the root of
-s the filesystem and use it

Further information:
[EMAIL PROTECTED] psets]$ which ant
~/projects/ant/dist/bin/ant
[EMAIL PROTECTED] psets]$ uname -a
Linux draco.research.olin.edu 2.4.20-20.9smp #1 SMP Mon Aug 18 11:18:01 EDT 2003
i686 athlon i386 GNU/Linux

I believe this is related to a change recently commited by antoine...

http://cvs.apache.org/viewcvs/ant/src/script/ant

The command I used to pull my copy from cvs is the one from the website:

cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout ant

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

RE: Antidote TODO (WAS:RE: antidote diff)

[Christoph Wilhelms]

> Not familiar with that, but will try to take a look. There is 
> a *possibility* (not a certainty) that I will lose my 
> high-speed connection in the near future, which would make 
> playing with Mozilla a little hard. We'll see what happens.

Mozilla Firebird is mall and fast... Should be no problem for you :-)

> But ... Preferences and storing them via Properties I 
> understand well. How we handle the GUI side of that "remains 
> to be seen". There is also the NetBeans model of a giant Options tree.

This would be overkill IMO. We should be fine with a (maximum) two level
hirachy! And remember: Let's keep the "baby" small and fast :-)

Oh: If you need Icons: don't hesitate to tell me! I'll paind them with
pleasure!

Greetings,
Christoph


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

Re: Ant 1.6 and Namespaces

[peter reilly]

On Tuesday 23 September 2003 18:08, Kevin LaVergne wrote:
> I am attempting to test Ant 1.6 on my company's buildfiles. We have been
> using namespaces (without declaring them) but it now seems that they won't

The problem is the "without declaring them", ant 1.5 and before did
not enable namespace support in the xml parser, so the prefix:taskname was
passed tru to and the name included the "prefix:" part.

Ant 1.6 supports xml's namespace, which means that you have to define
the namespace URI. The URI can be anything (except names beginning with ant),
but you need to specify the URI when you use typedef or taskdef.

so

   
   or
   
   or using an antlib
   
  
   



Peter

> work at all. I have found that when I have the namespace in front of a task
> name, I get an error saying that the namespace is not declared. If I then
> declare the namespace I get an error saying that the task class can't be
> found. Is the namespace URI supposed to be pointing to something specific?
>
> Thanks,
>
> Kevin LaVergne
>
> Here is the error that I get (I have done everything that it says in the
> error before sending this email):
>
> BUILD FAILED
> C:\views\klavergn_synergy_1.0\Public\buildfiles\build-settings.ent:397:
> Could not create task or type of type:
> http://www.parago.com/ant/tasks/clearcase:latestBaseline.
>
> Ant could not find the task or a class this task relies upon.
>
> This is common and has a number of causes; the usual
> solutions are to read the manual pages then download and
> install needed JAR files, or fix the build file:
>   - You have misspelt
> 'http://www.parago.com/ant/tasks/clearcase:latestBaseline'.
> Fix: check your spelling.
>   - The task needs an external JAR file to execute
> and this is not found at the right place in the classpath.
> Fix: check the documentation for dependencies.
> Fix: declare the task.
>   - The task is an Ant optional task and optional.jar is absent
> Fix: look for optional.jar in ANT_HOME/lib, download if needed
>   - The task was not built into optional.jar as dependent
> libraries were not found at build time.
> Fix: look in the JAR to verify, then rebuild with the needed
> libraries, or download a release version from apache.org
>   - The build file was written for a later version of Ant
> Fix: upgrade to at least the latest release version of Ant
>   - The task is not an Ant core or optional task
> and needs to be declared using .
>
> Remember that for JAR files to be visible to Ant tasks implemented
> in ANT_HOME/lib, the files must be in the same directory or on the
> classpath
>
> Please neither file bug reports on this problem, nor email the
> Ant mailing lists, until all of these causes have been explored,
> as this is not an Ant bug.
>
>
> -
> 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]

Ant 1.6 and Namespaces

[Kevin LaVergne]

I am attempting to test Ant 1.6 on my company's buildfiles. We have been 
using namespaces (without declaring them) but it now seems that they won't 
work at all. I have found that when I have the namespace in front of a task 
name, I get an error saying that the namespace is not declared. If I then 
declare the namespace I get an error saying that the task class can't be 
found. Is the namespace URI supposed to be pointing to something specific?

Thanks,
Kevin LaVergne
Here is the error that I get (I have done everything that it says in the 
error before sending this email):

BUILD FAILED
C:\views\klavergn_synergy_1.0\Public\buildfiles\build-settings.ent:397: 
Could not create task or type of type: 
http://www.parago.com/ant/tasks/clearcase:latestBaseline.

Ant could not find the task or a class this task relies upon.
This is common and has a number of causes; the usual
solutions are to read the manual pages then download and
install needed JAR files, or fix the build file:
 - You have misspelt 
'http://www.parago.com/ant/tasks/clearcase:latestBaseline'.
   Fix: check your spelling.
 - The task needs an external JAR file to execute
   and this is not found at the right place in the classpath.
   Fix: check the documentation for dependencies.
   Fix: declare the task.
 - The task is an Ant optional task and optional.jar is absent
   Fix: look for optional.jar in ANT_HOME/lib, download if needed
 - The task was not built into optional.jar as dependent
   libraries were not found at build time.
   Fix: look in the JAR to verify, then rebuild with the needed
   libraries, or download a release version from apache.org
 - The build file was written for a later version of Ant
   Fix: upgrade to at least the latest release version of Ant
 - The task is not an Ant core or optional task
   and needs to be declared using .

Remember that for JAR files to be visible to Ant tasks implemented
in ANT_HOME/lib, the files must be in the same directory or on the
classpath
Please neither file bug reports on this problem, nor email the
Ant mailing lists, until all of these causes have been explored,
as this is not an Ant bug.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: ant build.xml

[Steve Loughran]

[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 @@
 
   
 
  +  
   
 
   
  
  
  

-
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: things that break

[Steve Loughran]

Stefan Bodewig wrote:
On 23 Sep 2003, Stefan Bodewig <[EMAIL PROTECTED]> wrote:
On Mon, 22 Sep 2003, Steve Loughran <[EMAIL PROTECTED]> wrote:

The late fix to DotnetCompile doesnt seem to break C# apps.
They've broken Mono:

Things go back to the point where we've been a few days ago (i.e. all
csc tests pass, the ilasm tests fail) if I change
includedefaultreferences to use "true" instead of "false".  We need to
adapt the documentation of this attribute and make clear that it now
only toggles the /nostdlib flag (and remove any reference to
mscore.dll).
yes, I need to update all the .net docs, and should have caught that 
extra fix to the mono tests. I think now all you need to change between 
mono and csc is the name of the executable

Mono status:
testCSC
testCSCintrinsicFileset
testCSCdll
testCscReferences
testILDASM_empty

testJsharp
this is a noop without vjc on the path
pass for a self-compiled Mono 0.26 on Linux and a fink installed Mono
0.23 on Mac OS X (one day I'll figure out how to compile Mono 0.26
without a JIT and can upgrade my Mac installation).
do you cross compile it?
-steve

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

Re: cvs commit: ant/src/script ant

[Conor MacNeill]

On Wed, 24 Sep 2003 01:40 am, [EMAIL PROTECTED] wrote:
> conor   2003/09/23 08:40:36
>
>   Modified:.Tag: ANT_16_BRANCH build.sh
>src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
> Launcher.java
>src/script Tag: ANT_16_BRANCH ant
>   Log:
>   Add support for multiple -lib options. Also allow -lib to specify
>   a directory of jars rather than just the directory itself. Update
>   build.sh to use this. Unix only for now. Windows later.
>

These changes expand on Antoine's -lib code to support multiple -lib options. 
In addition, the -lib option can now name a directory containing jars and all 
jars in that directory will be added to Ant's launch classpath.

I've made these changes to the Unix side of things for now. I'll be on a 
Windows box tomorrow to make the appropriate changes there.

I moved the -lib $CLASSPATH behind the main arguments ($@) to catch things 
like incomplete argument specifications such as

ant -lib

The build.sh file has been updated to use these new features to pick up 
lib/optional as a -lib directory.

You'll need to bootstrap to pick up these features and have the build.sh file 
work.

I'll merge across when I've done the Windows changes.

Conor




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

DO NOT REPLY [Bug 20576] - STlabel doesn't create "Build" labels.

[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=20576

STlabel doesn't create "Build" labels.





--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 16:05 ---
I see no problem with making the docs match the code.

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

DO NOT REPLY [Bug 19877] - prefix attribute of webinf sub-task of war core task no longer relative to WEB-INF

[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=19877

prefix attribute of webinf sub-task of war core task no longer relative to 
WEB-INF

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]
 AssignedTo|[EMAIL PROTECTED]  |[EMAIL PROTECTED]
   Severity|Normal  |Minor



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:49 ---
I'll try that with 1.4 when I find time - as I can't believe it has worked that
way. 8-)

OK, the way it works in 1.5.x is what it was intended to be.  If you need
to place things into a prefixed dir inside WEB-INF, use a  and
specify the full prefix.

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

DO NOT REPLY [Bug 20576] - STlabel doesn't create "Build" labels.

[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=20576

STlabel doesn't create "Build" labels.





--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:45 ---
Steve, any problem with making the docs match the code?  Doing it the other
way around could be backwards incompatible.

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

DO NOT REPLY [Bug 23339] - Core Task War, Ear, Jar should have the M feature available

[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=23339

Core Task War, Ear, Jar should have the M feature available





--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:44 ---
Thank you for the clarification.  I will see what happens when that occurs and 
contact the appropriate development group if the jar spec is not followed.

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

cvs commit: ant/src/script ant

[conor]

conor   2003/09/23 08:40:36

  Modified:.Tag: ANT_16_BRANCH build.sh
   src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
Launcher.java
   src/script Tag: ANT_16_BRANCH ant
  Log:
  Add support for multiple -lib options. Also allow -lib to specify
  a directory of jars rather than just the directory itself. Update
  build.sh to use this. Unix only for now. Windows later.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.35.2.1  +1 -26 ant/build.sh
  
  Index: build.sh
  ===
  RCS file: /home/cvs/ant/build.sh,v
  retrieving revision 1.35
  retrieving revision 1.35.2.1
  diff -u -w -u -r1.35 -r1.35.2.1
  --- build.sh  11 Aug 2003 13:18:19 -  1.35
  +++ build.sh  23 Sep 2003 15:40:36 -  1.35.2.1
  @@ -28,31 +28,6 @@
 exit
   fi
   
  -LOCALCLASSPATH=
  -# add in the dependency .jar files
  -DIRLIBS=lib/optional/*.jar
  -for i in ${DIRLIBS}
  -do
  -if [ "$i" != "${DIRLIBS}" ] ; then
  -LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
  -fi
  -done
  -
  -# make sure the classpath is in unix format
  -if $cygwin ; then
  -CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  -fi
  -
  -CLASSPATH=$LOCALCLASSPATH:$CLASSPATH
  -
  -# switch back to Windows format
  -if $cygwin ; then
  -CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
  -fi
  -
  -export CLASSPATH
  -
  -
   if [ "$REALANTHOME" != "" ] ; then
 if $cygwin; then
REALANTHOME=`cygpath --path --windows "$REALANTHOME"`
  @@ -62,5 +37,5 @@
 ANT_INSTALL="-emacs"
   fi
   
  -bootstrap/bin/ant "$ANT_INSTALL" $*
  +bootstrap/bin/ant -lib lib/optional "$ANT_INSTALL" $*
   
  
  
  
  No   revision
  No   revision
  1.5.2.2   +45 -30ant/src/main/org/apache/tools/ant/launch/Launcher.java
  
  Index: Launcher.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Launcher.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -w -u -r1.5.2.1 -r1.5.2.2
  --- Launcher.java 22 Sep 2003 21:15:41 -  1.5.2.1
  +++ Launcher.java 23 Sep 2003 15:40:36 -  1.5.2.2
  @@ -58,6 +58,10 @@
   import java.net.MalformedURLException;
   import java.io.File;
   import java.util.StringTokenizer;
  +import java.util.List;
  +import java.util.ArrayList;
  +import java.util.Iterator;
  +
   
   /**
*  This is a launcher for Ant.
  @@ -118,37 +122,48 @@
   throw new IllegalStateException("Ant home is set incorrectly or "
   + "ant could not be located");
   }
  -String libPath = "";
  -String[] newargs = null;
  -int argcount = -1;
  -for (argcount = 0; argcount < args.length -1; argcount++) {
  -if (args[argcount].equals("-lib")) {
  -libPath = args[argcount + 1];
  -break;
  -}
  +
  +List libPaths = new ArrayList();
  +List argList = new ArrayList();
  +String[] newArgs;
  +
  +for (int i = 0; i < args.length; ++i) {
  +if (args[i].equals("-lib")) {
  +if (i == args.length - 1) {
  +throw new IllegalStateException("The -lib argument must "
  ++ "be followed by a library location");
   }
  -if (libPath.equals("")) {
  -   newargs = new String[args.length];
  -   System.arraycopy(args, 0, newargs, 0, args.length);
  +libPaths.add(args[++i]);
   } else {
  -newargs = new String[args.length - 2];
  -// copy the beginning of the args array
  -if (argcount > 0 ) {
  -System.arraycopy(args, 0, newargs, 0 ,argcount);
  -}
  -// copy the end of the args array
  -if ((argcount + 2 < args.length) && argcount > 0) {
  -System.arraycopy(args, argcount + 2, newargs, argcount, 
args.length - (argcount + 2));
  +argList.add(args[i]);
   }
   }
  -StringTokenizer myTokenizer = new StringTokenizer(libPath, 
System.getProperty("path.separator"));
  -URL[] classPathJars = new URL[myTokenizer.countTokens()];
  -int classPathJarCount = 0;
  +
  +if (libPaths.size() == 0) {
  +newArgs = args;
  +} else {
  +newArgs = (String[]) argList.toArray(new String[0]);
  +}
  +
  +List libPathURLs = new ArrayList();
  +for (Iterator i = libPaths.iterator(); i.hasNext();) {
  +String libPath = (String) i.next();
  +StringTokenizer myTokenizer
  += new StringTokenizer(libPath, 
System.getProperty("path.separator"));
   while (myTokenizer.hasMoreElements()) {
  -St

DO NOT REPLY [Bug 20053] - Method required to clear down the "recorderEntries" Hashtable in the ANT 1.5.3 Recorder Class

[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=20053

Method required to clear down the "recorderEntries" Hashtable in the ANT 1.5.3 
Recorder Class

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|Normal  |Enhancement



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:42 ---
I'll mark this as an enhancement request.

The most logical thing to me (and I think it would help your GUI app) would be
to auto-clear the cache on the buildFinished event as the RecorderEntry 
instances
will close their output files there as well.

Would that be enough for your case?

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

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit PlainJUnitResultFormatter.java

[bodewig]

bodewig 2003/09/23 08:32:18

  Modified:src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH PlainJUnitResultFormatter.java
  Log:
  Remove redundant output, PR 20194
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.19.2.1  +4 -4  
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
  
  Index: PlainJUnitResultFormatter.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -r1.19 -r1.19.2.1
  --- PlainJUnitResultFormatter.java19 Jul 2003 08:11:05 -  1.19
  +++ PlainJUnitResultFormatter.java23 Sep 2003 15:32:18 -  1.19.2.1
  @@ -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
  @@ -198,12 +198,12 @@
* A Test is finished.
*/
   public void endTest(Test test) {
  +if (Boolean.TRUE.equals(failed.get(test))) {
  +return;
  +}
   synchronized (wri) {
   wri.print("Testcase: "
 + JUnitVersionHelper.getTestCaseName(test));
  -if (Boolean.TRUE.equals(failed.get(test))) {
  -return;
  -}
   Long l = (Long) testStarts.get(test);
   double seconds = 0;
   // can be null if an error occured in setUp
  
  
  

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

DO NOT REPLY [Bug 20194] - PlainJUnitResultFormatter produces poor output

[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=20194

PlainJUnitResultFormatter produces poor output

[EMAIL PROTECTED] changed:

   What|Removed |Added

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



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:34 ---
Actually it is not missing a newline, there is a "Testcase:
testAccessibleComponent3" too much.

Should be fixed with nightly build 2003-09-24.

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

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit PlainJUnitResultFormatter.java

[bodewig]

bodewig 2003/09/23 08:31:49

  Modified:src/main/org/apache/tools/ant/taskdefs/optional/junit
PlainJUnitResultFormatter.java
  Log:
  Remove redundant output, PR 20194
  
  Revision  ChangesPath
  1.20  +4 -4  
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
  
  Index: PlainJUnitResultFormatter.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- PlainJUnitResultFormatter.java19 Jul 2003 08:11:05 -  1.19
  +++ PlainJUnitResultFormatter.java23 Sep 2003 15:31:48 -  1.20
  @@ -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
  @@ -198,12 +198,12 @@
* A Test is finished.
*/
   public void endTest(Test test) {
  +if (Boolean.TRUE.equals(failed.get(test))) {
  +return;
  +}
   synchronized (wri) {
   wri.print("Testcase: "
 + JUnitVersionHelper.getTestCaseName(test));
  -if (Boolean.TRUE.equals(failed.get(test))) {
  -return;
  -}
   Long l = (Long) testStarts.get(test);
   double seconds = 0;
   // can be null if an error occured in setUp
  
  
  

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

DO NOT REPLY [Bug 20207] - enhance telnet task to be able to gather read outputs into a property

[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=20207

enhance telnet task to be able to gather read outputs into a property

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|Normal  |Enhancement

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

DO NOT REPLY [Bug 20215] - System.getProperties()

[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=20215

System.getProperties()





--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:22 ---
This here

> dropping P:\jdk\jre\lib\i18n.jar from path as it doesn't exist

looks suspicious.  Is the file really not there?

If it isn't, I think all i18n stuff is missing and the VM falls back to an en_US
locale.  This would explain the wrong values you report at the bottom.

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

Tasks, Taskdefs, classpaths, and ClassNotFound...

[David Wood]

Hi everybody. I'm posting this to the lists in the hopes that the search
engines will pick it up and provide more help than I got. When I looked, I
saw lots of messages along the lines of "Help! Can't Define/change the
classpath within the ant build file"... but no good answers.

It seems some people were using or even defining their own custom Tasks,
only to find that "ClassNotFoundErrors" or "ClassCastExceptions" were
popping up as a result. If their experience was anything like mine, they
found that they could certainly define the classpath used to load their
custom task, but that once that task was loaded, it had problems finding
other classes it needed - even if they were within the classpath given in
the taskdef. A perplexing and frustruating problem.

The ugly solutions are obvious:

1) Using a script (or abusing your wrists) to specify a "system classpath"
for all of ant that includes the classes that your task can't find. This
is ugly, especially when not only is it unnecessary, but you're so close
to not needing to do it.

2) Putting all of the jars/classes that your task can't find into
ANT_HOME/lib. So now installation/transport of whatever you're doing is a
pain, and you've crudded up the ant namespace for every user of ant on
that system, potentially causing other problems.

I scoured google finding nothing of any substance about what exactly
caused this problem, or how it might be fixed. There were, however, a few
clues that led me to examine Cactus and JUnit, which have, in various
ways, dealt with issues of loading arbitrary classes in ant.

Ordinary Java operations like "new", casting literals, variable
declarations, and other "conventional" language features will operate via
the ClassLoader that loaded the Object they're running in. Even the
Reflection APIs appear to attempt to use the ClassLoader of the calling
Object. This, at least, makes some sense to me.

The problem comes with the way some Factory bootstrappers use reflection.
In these "bad" implementations, reflection will be used to find and
instantiate Factories, but with a "default" ClassLoader, rather than the
ClassLoader of the calling Object. I encountered this in code from Sun, in
the the JDOHelper class, which is used to bootstrap JDO
PersistenceManagerFactories. That method (by default) used the ClassLoader
of the current thread (Thread.currentThread().getContextClassLoader()).
Judging by other messages I found hunting around the net, this kind of
thing comes up in other situations as well.

If you defined a classpath for your taskdef, a special AntClassLoader was
created, configured with this classpath, and used to load your Task. But
inside your Task, when you, or anything you call, uses these "sloppy"
bootstrap routines, they can lose that ClassLoader (picking up ant's
instead), and that means that the custom classpath in your taskdef isn't
used.

Who knows what's affected. This may be rare, and I may be unlucky, but
bean stuff, factory stuff, database stuff, testing stuff, or anything else
that uses reflection internally could potentially have a problem. Not many
people write custom tasks that do these sorts of things, but it does come
up, and when it does, it seems to have left a trail of agony.

I found two ways to deal with this problem while making JDO work inside an
ant Task.

The sloppy way is to grab the "right" ClassLoader - the one you creataed
by giving a custom classpath in your taskdef - and shove it into the
current Thread. Yes, you can do that. FYI, these code examples have not
been compiled - they're just to give a general idea. So anywhere in the
Task (init(), execute()), but ideally right before the problem occurs:

  // Get the task class loader we used to load this tag.
  AntClassLoader taskloader = (AntClassLoader)
this.getClass().getClassLoader();

  // Shove it into the Thread, replacing the thread's ClassLoader:
  taskloader.setThreadContextLoader();

Then you do what you have to do. When your done, I highly advise doing a:

  // Reset the Thread's original ClassLoader.
  taskloader.resetThreadContextLoader();

Yes, taskloader remembers the original for later reset. This puts the
right ClassLoader where JDOHelper wants to look for it by default. I
tested this way cursorily and it seemed to work. I think it could be
useful if you're dealing with a series of similar problems rather than
just one instance.

However, it is messy. You don't want to change the ClassLoader except
where you need to. I don't know what else looks at the Thread's
ClassLoader... It might affect ant, it might affect other tasks, who
knows. However, if you're in a bind, you can try it - you might get away
with it. You do get some additional control with the AntClassLoader, which
can be useful for forcing a solution like this to work, via methods that
allow you to control which classes, or whole package roots, are handled by
the child and which are immediately delegated to the parent ("system")...
Anyway, another small indicat

DO NOT REPLY [Bug 20366] - ANT zip target does not include empty directories

[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=20366

ANT zip target does not include empty directories

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution||WORKSFORME

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

DO NOT REPLY [Bug 20618] - class org.apache.tools.ant.util.regexp.Jdk14RegexpMatcher

[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=20618

class org.apache.tools.ant.util.regexp.Jdk14RegexpMatcher

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:16 ---
I've always been bad with names and Ant's sources tell a lot of stories about 
this
(even Erik and Steve tell them in their book, thankfully without pointing 
fingers).

I admit, I've been the one who called the method match and used a misleading
name.  The behavior we have is more a partialMatch or something - and is the
behavior most of the applications of that method inside Ant need.

So yes, the name is wrong and we can't change for backwards compatibility.

If you need exact matching, anchoring your pattern with ^ and $ is the way to 
go.

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

DO NOT REPLY [Bug 20699] - rmic and seaprate input/output directories

[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=20699

rmic and seaprate input/output directories

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|Major   |Enhancement

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

DO NOT REPLY [Bug 20939] - BuildExcpetion being logged when a path does not exist.

[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=20939

BuildExcpetion being logged when a path does not exist.





--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:10 ---
Sorry, I didn't see that you explicitly asked whether you should submit a patch.

Of course!  Patches are always welcome.

I'm just afraid that you'll find that it is harder than you think.  The code
generating the warning is the exception handler in Project#addReference - around
line 1755 in CVS HEAD.

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

cvs commit: ant/src/testcases/org/apache/tools/ant/types XMLCatalogTest.java

[bodewig]

bodewig 2003/09/23 08:03:36

  Modified:.Tag: ANT_16_BRANCH WHATSNEW
   src/etc/testcases/taskdefs/optional Tag: ANT_16_BRANCH
xmlvalidate.xml
   src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
XMLCatalog.java
   src/testcases/org/apache/tools/ant/taskdefs/optional Tag:
ANT_16_BRANCH XmlValidateTest.java
   src/testcases/org/apache/tools/ant/types Tag: ANT_16_BRANCH
XMLCatalogTest.java
  Log:
  Merge fix for PR 20965 from HEAD
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.503.2.2 +3 -0  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.1
  retrieving revision 1.503.2.2
  diff -u -r1.503.2.1 -r1.503.2.2
  --- WHATSNEW  22 Sep 2003 15:02:01 -  1.503.2.1
  +++ WHATSNEW  23 Sep 2003 15:03:36 -  1.503.2.2
  @@ -248,6 +248,9 @@
   *  could fail on JVMs that use null to indicate the system 
classloader.
 Bugzilla Report 23320.
   
  +* s only worked when defined inside of tasks.  Bugzilla
  +  Report 20965.
  +
   Other changes:
   --
   * All tasks can be used outside of s.  Note that some tasks
  
  
  
  No   revision
  No   revision
  1.11.2.1  +10 -0 ant/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
  
  Index: xmlvalidate.xml
  ===
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/xmlvalidate.xml,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- xmlvalidate.xml   10 Dec 2002 07:39:22 -  1.11
  +++ xmlvalidate.xml   23 Sep 2003 15:03:36 -  1.11.2.1
  @@ -25,6 +25,16 @@
   
 
   
  +  
  +
  +  
  +
  +
  +  
  +  
  +
  +  
  +
 
   
 
  
  
  
  No   revision
  No   revision
  1.32.2.1  +23 -17ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
  
  Index: XMLCatalog.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
  retrieving revision 1.32
  retrieving revision 1.32.2.1
  diff -u -r1.32 -r1.32.2.1
  --- XMLCatalog.java   13 Aug 2003 15:14:31 -  1.32
  +++ XMLCatalog.java   23 Sep 2003 15:03:36 -  1.32.2.1
  @@ -208,7 +208,7 @@
* @return the elements of the catalog - ResourceLocation objects
*/
   private Vector getElements() {
  -return elements;
  +return getRef().elements;
   }
   
   /**
  @@ -217,7 +217,7 @@
* @return the classpath
*/
   private Path getClasspath() {
  -return classpath;
  +return getRef().classpath;
   }
   
   /**
  @@ -335,7 +335,7 @@
* @return the catalog path
*/
   public Path getCatalogPath() {
  -return this.catalogPath;
  +return getRef().catalogPath;
   }
   
   
  @@ -421,17 +421,6 @@
   if (!elements.isEmpty()) {
   throw tooManyAttributes();
   }
  -// change this to get the objects from the other reference
  -Object o = r.getReferencedObject(getProject());
  -// we only support references to other XMLCatalogs
  -if (o instanceof XMLCatalog) {
  -// set all elements from referenced catalog to this one
  -XMLCatalog catalog = (XMLCatalog) o;
  -setElements(catalog.getElements());
  -} else {
  -String msg = r.getRefId() + " does not refer to an XMLCatalog";
  -throw new BuildException(msg);
  -}
   super.setRefid(r);
   }
   
  @@ -443,6 +432,10 @@
   public InputSource resolveEntity(String publicId, String systemId)
   throws SAXException, IOException {
   
  +if (isReference()) {
  +return getRef().resolveEntity(publicId, systemId);
  +}
  +
   if (!isChecked()) {
   // make sure we don't have a circular reference here
   Stack stk = new Stack();
  @@ -472,6 +465,10 @@
   public Source resolve(String href, String base)
   throws TransformerException {
   
  +if (isReference()) {
  +return getRef().resolve(href, base);
  +}
  +
   if (!isChecked()) {
   // make sure we don't have a circular reference here
   Stack stk = new Stack();
  @@ -516,6 +513,16 @@
   }
   
   /**
  + * @since Ant 1.6
  + */
  +private XMLCatalog getRef() {
  +if (!isReference()) {
  +return this;
  +}
  +return (XMLCatalog) getCheckedRef(XMLCatalog.class, "xmlcatalog");
  +

DO NOT REPLY [Bug 20965] - does not work - ignores nested items

[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=20965

 does not work - ignores nested 
 items

[EMAIL PROTECTED] changed:

   What|Removed |Added

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



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 15:04 ---
Should be fixed with nightly build 2003-09-24.

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

RE: AW: [PATCH] and problem with patch.xml

[Jan . Materne]

I think an that time (whenever :-) we should write a transformer. Maybe
on top of the chaperon parser. (Forrest uses that, too). There are so many
documents that the checks by hand are to much work, I think.


Jan

> -Original Message-
> From: Shatzer, Larry [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, September 23, 2003 4:53 PM
> To: 'Ant Developers List'
> Subject: RE: AW: [PATCH] and problem with patch.xml
> 
> 
> My only reason for doing it was to make it consistent, since 
> we had a bit of
> both. I figured since we were going to move these html 
> documents to XML at
> some point, make the migration easier. Either way works for me.
> 
> -- Larry
> 
> > -Original Message-
> > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> > Sent: Tuesday, September 23, 2003 5:05 AM
> > To: [EMAIL PROTECTED]
> > Subject: RE: AW: [PATCH] and problem with patch.xml
> > 
> > 
> > HTML is not XML. And while writing example is much easier to work
> > with " than with ".
> > 
> > Maybe that´s a default setting in the html checker :-)
> > 
> > 
> > Jan
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 

RE: AW: [PATCH] and problem with patch.xml

[Shatzer, Larry]

My only reason for doing it was to make it consistent, since we had a bit of
both. I figured since we were going to move these html documents to XML at
some point, make the migration easier. Either way works for me.

-- Larry

> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, September 23, 2003 5:05 AM
> To: [EMAIL PROTECTED]
> Subject: RE: AW: [PATCH] and problem with patch.xml
> 
> 
> HTML is not XML. And while writing example is much easier to work
> with " than with ".
> 
> Maybe that´s a default setting in the html checker :-)
> 
> 
> Jan

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

cvs commit: ant/src/testcases/org/apache/tools/ant/types XMLCatalogTest.java

[bodewig]

bodewig 2003/09/23 07:43:31

  Modified:src/testcases/org/apache/tools/ant/types XMLCatalogTest.java
  Log:
  forgot to commit file
  
  Revision  ChangesPath
  1.5   +1 -9  
ant/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
  
  Index: XMLCatalogTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLCatalogTest.java   10 Feb 2003 14:14:55 -  1.4
  +++ XMLCatalogTest.java   23 Sep 2003 14:43:31 -  1.5
  @@ -172,14 +172,6 @@
   }
   
   public void testEmptyElementIfIsReference() {
  -try {
  -catalog.setRefid(new Reference("dummyref"));
  -fail("Can add reference to nonexistent XMLCatalog");
  -} catch (BuildException be) {
  -assertEquals("Reference dummyref not found.",
  - be.getMessage());
  -}
  -
   ResourceLocation dtd = new ResourceLocation();
   dtd.setPublicId("PUBLIC ID ONE");
   dtd.setLocation("i/dont/exist.dtd");
  
  
  

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

cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional XmlValidateTest.java

[bodewig]

bodewig 2003/09/23 07:33:43

  Modified:.WHATSNEW
   src/etc/testcases/taskdefs/optional xmlvalidate.xml
   src/main/org/apache/tools/ant/types XMLCatalog.java
   src/testcases/org/apache/tools/ant/taskdefs/optional
XmlValidateTest.java
  Log:
  Defer expansion of reference until the catalog gets used.
  
  PR: 20965
  
  Revision  ChangesPath
  1.505 +3 -0  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.504
  retrieving revision 1.505
  diff -u -r1.504 -r1.505
  --- WHATSNEW  22 Sep 2003 15:05:21 -  1.504
  +++ WHATSNEW  23 Sep 2003 14:33:43 -  1.505
  @@ -248,6 +248,9 @@
   *  could fail on JVMs that use null to indicate the system 
classloader.
 Bugzilla Report 23320.
   
  +* s only worked when defined inside of tasks.  Bugzilla
  +  Report 20965.
  +
   Other changes:
   --
   * All tasks can be used outside of s.  Note that some tasks
  
  
  
  1.12  +10 -0 ant/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
  
  Index: xmlvalidate.xml
  ===
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/xmlvalidate.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- xmlvalidate.xml   10 Dec 2002 07:39:22 -  1.11
  +++ xmlvalidate.xml   23 Sep 2003 14:33:43 -  1.12
  @@ -25,6 +25,16 @@
   
 
   
  +  
  +
  +  
  +
  +
  +  
  +  
  +
  +  
  +
 
   
 
  
  
  
  1.33  +23 -17ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
  
  Index: XMLCatalog.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- XMLCatalog.java   13 Aug 2003 15:14:31 -  1.32
  +++ XMLCatalog.java   23 Sep 2003 14:33:43 -  1.33
  @@ -208,7 +208,7 @@
* @return the elements of the catalog - ResourceLocation objects
*/
   private Vector getElements() {
  -return elements;
  +return getRef().elements;
   }
   
   /**
  @@ -217,7 +217,7 @@
* @return the classpath
*/
   private Path getClasspath() {
  -return classpath;
  +return getRef().classpath;
   }
   
   /**
  @@ -335,7 +335,7 @@
* @return the catalog path
*/
   public Path getCatalogPath() {
  -return this.catalogPath;
  +return getRef().catalogPath;
   }
   
   
  @@ -421,17 +421,6 @@
   if (!elements.isEmpty()) {
   throw tooManyAttributes();
   }
  -// change this to get the objects from the other reference
  -Object o = r.getReferencedObject(getProject());
  -// we only support references to other XMLCatalogs
  -if (o instanceof XMLCatalog) {
  -// set all elements from referenced catalog to this one
  -XMLCatalog catalog = (XMLCatalog) o;
  -setElements(catalog.getElements());
  -} else {
  -String msg = r.getRefId() + " does not refer to an XMLCatalog";
  -throw new BuildException(msg);
  -}
   super.setRefid(r);
   }
   
  @@ -443,6 +432,10 @@
   public InputSource resolveEntity(String publicId, String systemId)
   throws SAXException, IOException {
   
  +if (isReference()) {
  +return getRef().resolveEntity(publicId, systemId);
  +}
  +
   if (!isChecked()) {
   // make sure we don't have a circular reference here
   Stack stk = new Stack();
  @@ -472,6 +465,10 @@
   public Source resolve(String href, String base)
   throws TransformerException {
   
  +if (isReference()) {
  +return getRef().resolve(href, base);
  +}
  +
   if (!isChecked()) {
   // make sure we don't have a circular reference here
   Stack stk = new Stack();
  @@ -516,6 +513,16 @@
   }
   
   /**
  + * @since Ant 1.6
  + */
  +private XMLCatalog getRef() {
  +if (!isReference()) {
  +return this;
  +}
  +return (XMLCatalog) getCheckedRef(XMLCatalog.class, "xmlcatalog");
  +}
  +
  +/**
* The instance of the CatalogResolver strategy to use.
*/
   private CatalogResolver catalogResolver = null;
  @@ -576,9 +583,8 @@
   && getCatalogPath().list().length != 0) {
   log("Warning: catalogpath listing external catalogs"
   + " will be ignored", Project.MSG_WARN);
  -log("Failed to load Apache reso

DO NOT REPLY [Bug 20965] - does not work - ignores nested items

[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=20965

 does not work - ignores nested 
 items

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]
 AssignedTo|[EMAIL PROTECTED]  |[EMAIL PROTECTED]

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

DO NOT REPLY [Bug 10857] - xmlcatalog does not work as project-child, only as target-child

[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=10857

xmlcatalog does not work as project-child, only as target-child

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||DUPLICATE



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 14:08 ---
Collecting the related bugs, even if this one has been reported first.

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

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

DO NOT REPLY [Bug 20965] - does not work - ignores nested items

[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=20965

 does not work - ignores nested 
 items

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 14:08 ---
*** Bug 10857 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 10857] - xmlcatalog does not work as project-child, only as target-child

[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=10857

xmlcatalog does not work as project-child, only as target-child

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 14:08 ---
Don't know why this has been closed as invalid as I can reproduce it.

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

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

[peterreilly]

peterreilly2003/09/23 07:04:36

  Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroDef.java
  Log:
  remove method implemented in superclass
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.7.2.2   +0 -9  ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- MacroDef.java 23 Sep 2003 13:56:44 -  1.7.2.1
  +++ MacroDef.java 23 Sep 2003 14:04:36 -  1.7.2.2
  @@ -91,15 +91,6 @@
   }
   
   /**
  - * Set the class loader.
  - * Not used
  - * @param classLoader a ClassLoader value
  - */
  -public void setAntlibClassLoader(ClassLoader classLoader) {
  -// Ignore
  -}
  -
  -/**
* Add a nested task to ExtendType
* @param nestedTask  Nested task/type to extend
*/
  
  
  

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

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

[peterreilly]

peterreilly2003/09/23 07:04:05

  Modified:src/main/org/apache/tools/ant/taskdefs MacroDef.java
  Log:
  remove method implemented in superclass
  
  Revision  ChangesPath
  1.9   +0 -9  ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MacroDef.java 23 Sep 2003 13:55:52 -  1.8
  +++ MacroDef.java 23 Sep 2003 14:04:05 -  1.9
  @@ -91,15 +91,6 @@
   }
   
   /**
  - * Set the class loader.
  - * Not used
  - * @param classLoader a ClassLoader value
  - */
  -public void setAntlibClassLoader(ClassLoader classLoader) {
  -// Ignore
  -}
  -
  -/**
* Add a nested task to ExtendType
* @param nestedTask  Nested task/type to extend
*/
  
  
  

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

DO NOT REPLY [Bug 20965] - does not work - ignores nested items

[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=20965

 does not work - ignores nested 
 items

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]
   ||international.com



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 14:06 ---
*** Bug 18438 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 18438] - Referenced xmlcatalog does not include the classpath

[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=18438

Referenced xmlcatalog does not include the classpath

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 14:06 ---
Collecting the related bugs, even if this one has been reported first.

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

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

DO NOT REPLY [Bug 22834] - XSLT fails transforming file with doctype

[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=22834

XSLT fails transforming file with doctype





--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 14:05 ---
Are you defining your xmlcatalog outside of the task?

Sounds like a duplicate of bug 20965 that I've just been able to confirm in my
environment.

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

cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs MacroDefTest.java

[peterreilly]

peterreilly2003/09/23 06:56:44

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
   src/etc/testcases/taskdefs Tag: ANT_16_BRANCH macrodef.xml
   src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroDef.java MacroInstance.java
   src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH MacroDefTest.java
  Log:
  remove attributestyle attribute from macrodef
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.1   +0 -33 ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- macrodef.html 15 Aug 2003 09:33:45 -  1.2
  +++ macrodef.html 23 Sep 2003 13:56:44 -  1.2.2.1
  @@ -38,17 +38,6 @@
   
   No
 
  -  
  -attributestyle
  -
  -  Temporary
  -  this attribute specifies if the attribute is in ant style
  -  (i.e. ${attributeName}) or xpath style (i.e @attributeName).
  -  Valid values are "ant" and "xpath". The default value
  -  is "ant".
  -
  -No
  -  
   
 Parameters specified as nested elements
   attribute
  @@ -63,11 +52,6 @@
 task using the ant property notation - ${attribute name}.
 Note that is not an actual ant property.
   
  -
  -  If the attribute style is set to "xpath", the attribute is
  -  specified in the body of the template task by prefixing the
  -  name with a "@".
  -
   Parameters
   
 
  @@ -138,23 +122,6 @@
 this is a test
  
   
  -  
  -
  -
  -  The following fragment sets the attribute style to "xpath"
  -  for the macro definition  and calls the
  -  macro. The fragment should output "attribute is this is a test".
  -
  -
  -  
  -
  -   
  -   
  -  attribute is @abc
  -   
  -
  -
  -
 
   
   
  
  
  
  No   revision
  No   revision
  1.2.2.1   +0 -10 ant/src/etc/testcases/taskdefs/macrodef.xml
  
  Index: macrodef.xml
  ===
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/macrodef.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- macrodef.xml  15 Aug 2003 09:33:45 -  1.2
  +++ macrodef.xml  23 Sep 2003 13:56:44 -  1.2.2.1
  @@ -45,14 +45,4 @@
   
 
   
  -  
  -
  -  
  -  
  -attribute is @[EMAIL PROTECTED]
  -  
  -
  -
  -
  -  
   
  
  
  
  No   revision
  No   revision
  1.7.2.1   +0 -44 ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- MacroDef.java 22 Sep 2003 08:58:58 -  1.7
  +++ MacroDef.java 23 Sep 2003 13:56:44 -  1.7.2.1
  @@ -81,7 +81,6 @@
   private String name;
   private List   attributes = new ArrayList();
   private Mapelements = new HashMap();
  -private intattributeStyle = AttributeStyle.ANT;
   
   /**
* Name of the definition
  @@ -92,46 +91,6 @@
   }
   
   /**
  - * Enumerated type for attributeStyle attribute
  - *
  - * @see EnumeratedAttribute
  - */
  -public static class AttributeStyle extends EnumeratedAttribute {
  -/** Enumerated values */
  -public static final int ANT = 0, XPATH = 1;
  -
  -/**
  - * get the values
  - * @return an array of the allowed values for this attribute.
  - */
  -public String[] getValues() {
  -return new String[] {"ant", "xpath"};
  -}
  -}
  -
  -/**
  - * Experimental
  - * I am uncertain at the moment how to encode attributes
  - * using ant style ${attribute} or xpath style @attribute.
  - * The first may get mixed up with ant properties and
  - * the second may get mixed up with xpath.
  - * The default at the moment is ant s
  - *
  - * @param style an AttributeStyle value
  - */
  -public void setAttributeStyle(AttributeStyle style) {
  -attributeStyle = style.getIndex();
  -}
  -
  -/**
  -

cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs MacroDefTest.java

[peterreilly]

peterreilly2003/09/23 06:55:52

  Modified:docs/manual/CoreTasks macrodef.html
   src/etc/testcases/taskdefs macrodef.xml
   src/main/org/apache/tools/ant/taskdefs MacroDef.java
MacroInstance.java
   src/testcases/org/apache/tools/ant/taskdefs
MacroDefTest.java
  Log:
  remove attributestyle attribute from macrodef
  
  Revision  ChangesPath
  1.3   +0 -33 ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- macrodef.html 15 Aug 2003 09:33:45 -  1.2
  +++ macrodef.html 23 Sep 2003 13:55:52 -  1.3
  @@ -38,17 +38,6 @@
   
   No
 
  -  
  -attributestyle
  -
  -  Temporary
  -  this attribute specifies if the attribute is in ant style
  -  (i.e. ${attributeName}) or xpath style (i.e @attributeName).
  -  Valid values are "ant" and "xpath". The default value
  -  is "ant".
  -
  -No
  -  
   
 Parameters specified as nested elements
   attribute
  @@ -63,11 +52,6 @@
 task using the ant property notation - ${attribute name}.
 Note that is not an actual ant property.
   
  -
  -  If the attribute style is set to "xpath", the attribute is
  -  specified in the body of the template task by prefixing the
  -  name with a "@".
  -
   Parameters
   
 
  @@ -138,23 +122,6 @@
 this is a test
  
   
  -  
  -
  -
  -  The following fragment sets the attribute style to "xpath"
  -  for the macro definition  and calls the
  -  macro. The fragment should output "attribute is this is a test".
  -
  -
  -  
  -
  -   
  -   
  -  attribute is @abc
  -   
  -
  -
  -
 
   
   
  
  
  
  1.3   +0 -10 ant/src/etc/testcases/taskdefs/macrodef.xml
  
  Index: macrodef.xml
  ===
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/macrodef.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- macrodef.xml  15 Aug 2003 09:33:45 -  1.2
  +++ macrodef.xml  23 Sep 2003 13:55:52 -  1.3
  @@ -45,14 +45,4 @@
   
 
   
  -  
  -
  -  
  -  
  -attribute is @[EMAIL PROTECTED]
  -  
  -
  -
  -
  -  
   
  
  
  
  1.8   +0 -44 ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MacroDef.java 22 Sep 2003 08:58:58 -  1.7
  +++ MacroDef.java 23 Sep 2003 13:55:52 -  1.8
  @@ -81,7 +81,6 @@
   private String name;
   private List   attributes = new ArrayList();
   private Mapelements = new HashMap();
  -private intattributeStyle = AttributeStyle.ANT;
   
   /**
* Name of the definition
  @@ -92,46 +91,6 @@
   }
   
   /**
  - * Enumerated type for attributeStyle attribute
  - *
  - * @see EnumeratedAttribute
  - */
  -public static class AttributeStyle extends EnumeratedAttribute {
  -/** Enumerated values */
  -public static final int ANT = 0, XPATH = 1;
  -
  -/**
  - * get the values
  - * @return an array of the allowed values for this attribute.
  - */
  -public String[] getValues() {
  -return new String[] {"ant", "xpath"};
  -}
  -}
  -
  -/**
  - * Experimental
  - * I am uncertain at the moment how to encode attributes
  - * using ant style ${attribute} or xpath style @attribute.
  - * The first may get mixed up with ant properties and
  - * the second may get mixed up with xpath.
  - * The default at the moment is ant s
  - *
  - * @param style an AttributeStyle value
  - */
  -public void setAttributeStyle(AttributeStyle style) {
  -attributeStyle = style.getIndex();
  -}
  -
  -/**
  - * Experimental
  - * @return the attribute style
  - */
  -public int getAttributeStyle() {
  -return attributeStyle;
  -}
  -
  -/**
* Set the class loader.
* Not used
* @param classLoader a ClassLoader value
  @@ -435,9 +394,6 @@
   

DO NOT REPLY [Bug 21083] - exec "cvs commit" doesn't work for sudo

[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=21083

exec "cvs commit" doesn't work for sudo

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 13:54 ---
I agree with Gus, this is a CVS setup problem, not an Ant problem (and nothing
Ant could solve IMHO).

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

RE: concat teardown failing

[Jan . Materne]

> > Because we have a 1.6 version and a head version on cvs. How should
> > I commit the changes?
> 
> Twice.
> 
> The easiest way for you probably is to copy your ant workspace and
> inside your copy run cvs up -r ANT_16_BRANCH.  After that the copy
> will be working on the branch while your old copy points to CVS HEAD.
> 
> Stefan


That sound doable :-)


Jan

RE: concat teardown failing

[Jan . Materne]

> > Because we have a 1.6 version and a head version on cvs. How should
> > I commit the changes?
> 
> On both versions.
> The easiest is to make the changes on HEAD, make a diff file (before
> the commit on HEAD), and apply the changes to 1.6, and then commit
> in both.

- changes on HEAD: ok, that´s what I do normally (so I know that :-)
- make a diff file: should be possible ...
- commit to HEAD: yep
- apply to 1.6: do I have to checkout the 1.6 before that? 


Jan

Re: concat teardown failing

[Stefan Bodewig]

On Tue, 23 Sep 2003, Jan Materne <[EMAIL PROTECTED]> wrote:

> Because we have a 1.6 version and a head version on cvs. How should
> I commit the changes?

Twice.

The easiest way for you probably is to copy your ant workspace and
inside your copy run cvs up -r ANT_16_BRANCH.  After that the copy
will be working on the branch while your old copy points to CVS HEAD.

Stefan

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

Re: cvs commit: ant/src/main/org/apache/tools/ant/util ResourceUtils.java SourceFileScanner.java

[Stefan Bodewig]

On 23 Sep 2003, <[EMAIL PROTECTED]> wrote:

>   Add a granularity attribute to ,  and  that
>   works the same way as the attribute of the  selector.

the original problem is that source and target directories live on
different machines with clocks being slightly (but for a well known
amount) out of sync.

You can deal with it in  by explicitly using a 
selector, but selectors are not available in .

I have not merged it into the 1.6 branch for two reasons:

(1) I'm not sure whether we should add it to  and  at all
or rather require the explicit usage of .  This would of
course lead to a lot of duplication.  Compare


  
  

  


to


  

  

  
  

  

  

  


the same mapper three times, definition of targetdir in three places.

(2) The changes to SourceFileScanner and ResourceUtils will have an
impact on Windows.  As I'm unable to test anything there, I'd rather
wait for failure reports before I go and merge things.

Stefan

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

Re: concat teardown failing

[peter reilly]

On Tuesday 23 September 2003 14:25, [EMAIL PROTECTED] wrote:
> Thats the advantage of automated unit tests :-)
>
> Ok, I refactor the test suite a little bit.
>
> Because we have a 1.6 version and a head version on cvs. How should
> I commit the changes?

On both versions.
The easiest is to make the changes on HEAD, make a diff file (before
the commit on HEAD), and apply the changes to 1.6, and then commit
in both.

Peter


>
>
> Jan
>
> > -Original Message-
> > From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
> > Sent: Tuesday, September 23, 2003 3:24 PM
> > To: [EMAIL PROTECTED]
> > Subject: Re: concat teardown failing
> >
> > On Tue, 23 Sep 2003, Jan Materne <[EMAIL PROTECTED]> wrote:
> > > I have modified the FileUtils.readFully(Reader rdr, int bufferSize)
> > > so that it closes the reader and all works.
> >
> > I think that would be the wrong place.  It may be my old C thinking
> > coming from explicit memory managment, but I think that the code that
> > aquires a resource should be responsible of releasing it as well.
> >
> > > Ups - some other tests failed because of the closed reader. So I
> > > close the reader in the ConcatFilterTest.
> >
> > You see 8-)
> >
> > Stefan
> >
> > -
> > 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: concat teardown failing

[Jan . Materne]

Thats the advantage of automated unit tests :-)

Ok, I refactor the test suite a little bit.

Because we have a 1.6 version and a head version on cvs. How should
I commit the changes?


Jan

> -Original Message-
> From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, September 23, 2003 3:24 PM
> To: [EMAIL PROTECTED]
> Subject: Re: concat teardown failing
> 
> 
> On Tue, 23 Sep 2003, Jan Materne <[EMAIL PROTECTED]> wrote:
> 
> > I have modified the FileUtils.readFully(Reader rdr, int bufferSize)
> > so that it closes the reader and all works.
> 
> I think that would be the wrong place.  It may be my old C thinking
> coming from explicit memory managment, but I think that the code that
> aquires a resource should be responsible of releasing it as well.
> 
> > Ups - some other tests failed because of the closed reader. So I
> > close the reader in the ConcatFilterTest.
> 
> You see 8-)
> 
> Stefan
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 

Re: concat teardown failing

[Stefan Bodewig]

On Tue, 23 Sep 2003, Jan Materne <[EMAIL PROTECTED]> wrote:

> I have modified the FileUtils.readFully(Reader rdr, int bufferSize)
> so that it closes the reader and all works.

I think that would be the wrong place.  It may be my old C thinking
coming from explicit memory managment, but I think that the code that
aquires a resource should be responsible of releasing it as well.

> Ups - some other tests failed because of the closed reader. So I
> close the reader in the ConcatFilterTest.

You see 8-)

Stefan

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

cvs commit: ant/src/main/org/apache/tools/ant/util ResourceUtils.java SourceFileScanner.java

[bodewig]

bodewig 2003/09/23 06:16:05

  Modified:docs/manual/CoreTasks copy.html move.html sync.html
   src/main/org/apache/tools/ant/taskdefs Copy.java Sync.java
   src/main/org/apache/tools/ant/util ResourceUtils.java
SourceFileScanner.java
  Log:
  Add a granularity attribute to ,  and  that works
  the same way as the attribute of the  selector.
  
  PR: 22150
  
  Revision  ChangesPath
  1.20  +10 -0 ant/docs/manual/CoreTasks/copy.html
  
  Index: copy.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- copy.html 24 Jul 2003 13:14:20 -  1.19
  +++ copy.html 23 Sep 2003 13:16:04 -  1.20
  @@ -135,6 +135,16 @@
 since Ant 1.6.
   No - defaults to false.
 
  +  
  +granularity
  +The number of milliseconds leeway to give before
  +deciding a file is out of date. This is needed because not every
  +file system supports tracking the last modified time to the
  +millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
  +systems.  This can also be useful if source and target files live
  +on separate machines with clocks being out of sync.  since Ant
  +1.6.
  +  
   
   Parameters specified as nested elements
   
  
  
  
  1.15  +10 -0 ant/docs/manual/CoreTasks/move.html
  
  Index: move.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/move.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- move.html 24 Jul 2003 13:14:20 -  1.14
  +++ move.html 23 Sep 2003 13:16:04 -  1.15
  @@ -113,6 +113,16 @@
 since Ant 1.6.
   No - defaults to false.
 
  +  
  +granularity
  +The number of milliseconds leeway to give before
  +deciding a file is out of date. This is needed because not every
  +file system supports tracking the last modified time to the
  +millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
  +systems.  This can also be useful if source and target files live
  +on separate machines with clocks being out of sync.  since Ant
  +1.6.
  +  
   
   Parameters specified as nested elements
   mapper
  
  
  
  1.4   +10 -0 ant/docs/manual/CoreTasks/sync.html
  
  Index: sync.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/sync.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sync.html 14 May 2003 11:58:18 -  1.3
  +++ sync.html 23 Sep 2003 13:16:04 -  1.4
  @@ -51,6 +51,16 @@
Log the files that are being copied.
No; defaults to false.
 
  +  
  +granularity
  +The number of milliseconds leeway to give before
  +deciding a file is out of date. This is needed because not every
  +file system supports tracking the last modified time to the
  +millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
  +systems.  This can also be useful if source and target files live
  +on separate machines with clocks being out of sync.  since Ant
  +1.6.
  +  
   
   
   Parameters specified as nested elements
  
  
  
  1.67  +18 -3 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
  
  Index: Copy.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Copy.java 16 Sep 2003 09:08:55 -  1.66
  +++ Copy.java 23 Sep 2003 13:16:04 -  1.67
  @@ -121,12 +121,14 @@
   private FileUtils fileUtils;
   private String inputEncoding = null;
   private String outputEncoding = null;
  +private long granularity = 0;
   
   /**
* Copy task constructor.
*/
   public Copy() {
   fileUtils = FileUtils.newFileUtils();
  +granularity = fileUtils.getFileTimestampGranularity();
   }
   
   /**
  @@ -371,6 +373,18 @@
   }
   
   /**
  + * The number of milliseconds leeway to give before deciding a
  + * target is out of date.
  + *
  + * Default is 0 milliseconds, or 2 seconds on DOS systems.
  + *
  + * @since Ant 1.6
  + */
  +public void setGranularity(long granularity) {
  +this.granularity = granularity;
  +}
  +
  +/**
* Performs the copy operation.
* @exception BuildException if an error occurs
*/
  @@ -397,7 +411,8 @@
   }
   
   if (forceOverwrite || !destFile.exists()
  -|| (file.lastModified() > destFile.lastModified())) {
  +   

RE: concat teardown failing

[Jan . Materne]

Yeah !

I have modified the FileUtils.readFully(Reader rdr, int bufferSize) so that
it closes the reader and all works.

Now the retest of ants whole test suite ... if there are no problems I will
commit that.

Ups - some other tests failed because of the closed reader. So I close the
reader in the ConcatFilterTest.
Yes, only the org.apache.tools.ant.taskdefs.ReplaceTest.test9() fails (like
before).

Thanks Peter.


Jan

> -Original Message-
> From: peter reilly [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, September 23, 2003 2:35 PM
> To: Ant Developers List
> Subject: Re: concat teardown failing
> 
> 
> Bingo, I think.
> 
> The tests in ConcatFilterTest do this:
> String resultContent = fu.readFully(
>  new java.io.FileReader(resultFile));
> so nothing closes the resultfile.
> 
> Peter
> 
> On Tuesday 23 September 2003 10:17, [EMAIL PROTECTED] wrote:
> > co
> >
> > > > ncat.filterReaderPrepend.tes
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 

cvs commit: ant build.xml

[bodewig]

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 @@
 
   
 
  +  
   
 
   
  
  
  

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

cvs commit: ant/docs/manual/OptionalTasks dotnet.html

[bodewig]

bodewig 2003/09/23 06:07:10

  Modified:docs/manual/OptionalTasks Tag: ANT_16_BRANCH dotnet.html
  Log:
  2003
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.10.2.2  +1 -1  ant/docs/manual/OptionalTasks/dotnet.html
  
  Index: dotnet.html
  ===
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- dotnet.html   23 Sep 2003 08:29:07 -  1.10.2.1
  +++ dotnet.html   23 Sep 2003 13:07:10 -  1.10.2.2
  @@ -681,7 +681,7 @@
   Initial proof of concept; very rudimentary support for CSC only. 
   
   
  -Copyright © 2000-2002 Apache Software Foundation. All 
rights
  +Copyright © 2000-2003 Apache Software Foundation. All 
rights
   Reserved.
   
   
  
  
  

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

cvs commit: ant/docs/manual/OptionalTasks dotnet.html

[bodewig]

bodewig 2003/09/23 06:06:48

  Modified:docs/manual/OptionalTasks dotnet.html
  Log:
  2003
  
  Revision  ChangesPath
  1.12  +1 -1  ant/docs/manual/OptionalTasks/dotnet.html
  
  Index: dotnet.html
  ===
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- dotnet.html   23 Sep 2003 07:29:28 -  1.11
  +++ dotnet.html   23 Sep 2003 13:06:48 -  1.12
  @@ -681,7 +681,7 @@
   Initial proof of concept; very rudimentary support for CSC only. 
   
   
  -Copyright © 2000-2002 Apache Software Foundation. All 
rights
  +Copyright © 2000-2003 Apache Software Foundation. All 
rights
   Reserved.
   
   
  
  
  

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

RE: Ant 1.6

[Rob van Oostrum]

IMHO there's 2 possible triggers for branching off:

- it's time to run the build/release and you want to make sure you capture
the point at which this was done
- a critical piece of work that should not go into the build/release
absolutely has to go into CVS

so for practical reasons (i.e. having to double-commit a bunch of stuff) you
probably want to wait as long as possible from now on ... might even want to
consider hanging on to post-next-release patches until after the branch has
been created. On the other hand, double maintenance doesn't need to be all
that painful. Since everybody's used to using patchfiles anyway, why not
keep 2 checked out versions of Ant around (one on the branch, one on the
HEAD). Apply a patch to both and do a commit on both. I betcha it's every so
slightly quicker than the whole cvs merge thing.


just my CAD$ .02

Rob

> -Original Message-
> From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED]
> Sent: September 23, 2003 6:35 AM
> To: Ant Developers List
> Subject: AW: Ant 1.6
>

[...]

> I also think that branches add extra work, but sooner or later
> someone will
> have a new feature which can only go into 1.7 and not in 1.6. There is
> already  which I have got to remove from the ANT_16_BRANCH.
>
> Cheers,
>
> Antoine


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

Re: concat teardown failing

[peter reilly]

Bingo, I think.

The tests in ConcatFilterTest do this:
String resultContent = fu.readFully(
 new java.io.FileReader(resultFile));
so nothing closes the resultfile.

Peter

On Tuesday 23 September 2003 10:17, [EMAIL PROTECTED] wrote:
> co
>
> > > ncat.filterReaderPrepend.tes


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

RE: AW: [PATCH] and problem with patch.xml

[Jan . Materne]

HTML is not XML. And while writing example is much easier to work
with " than with ".

Maybe that´s a default setting in the html checker :-)


Jan

> -Original Message-
> From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, September 23, 2003 2:02 PM
> To: Ant Developers List
> Subject: AW: AW: [PATCH] and problem with patch.xml
> 
> 
> Actually I don't know for sure why " should be preferred to ".
> I can revert this part of the change if this is causing an outcry.
> 
> 
> Antoine
> 
> -Ursprüngliche Nachricht-
> Von: peter reilly [mailto:[EMAIL PROTECTED]
> Gesendet: Dienstag, 23. September 2003 13:44
> An: Ant Developers List
> Betreff: Re: AW: [PATCH] and problem with patch.xml
> 
> 
> Is there any reason   " is preferred to " in
> html files ?
> 
> It makes reading the html source containg
> build script examples quite difficult
> 
> Peter
> 
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 

AW: AW: [PATCH] and problem with patch.xml

[Antoine Lévy-Lambert]

Actually I don't know for sure why " should be preferred to ".
I can revert this part of the change if this is causing an outcry.


Antoine

-Ursprüngliche Nachricht-
Von: peter reilly [mailto:[EMAIL PROTECTED]
Gesendet: Dienstag, 23. September 2003 13:44
An: Ant Developers List
Betreff: Re: AW: [PATCH] and problem with patch.xml


Is there any reason   " is preferred to " in
html files ?

It makes reading the html source containg
build script examples quite difficult

Peter



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

RE: concat teardown failing

[Jan . Materne]

I give up ...

Same on JDK 1.2.1 and 1.4.1.

- I tried changing Delete.DELETE_RETRY_SLEEP_MILLIS to 1 (10 seconds)
  without success.
- closing the "in" reader of ConcatFilter would cause an error in
FilterReader.ready()
- setting the "in" to null would cause an NPE in BufferedReader (somewhere)
- the file which can´t be deleted is read and write enabled
- Peters patch has solved the problem with the append and prepend files
- the problem with the resulting file is still open but can´t be solved in
the same
  manner (I think)


More ideas?


Jan





> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, September 23, 2003 12:50 PM
> To: [EMAIL PROTECTED]
> Subject: RE: concat teardown failing
> 
> 
> Difference to my solution is only that you´re setting the append- and
> prepend reader
> to null. But that don´t work on my machine :-(
> 
> But I don´t get the error while deleting the append- or 
> prepend file. I get
> the error
> while deleting the resulting file.
> 
> But if I add a "super.close()" I´ll get other errors ...
> 
> But I have changed the code according to your modifications. 
> So it should
> pass on linux (a little progress).
> 
> 
> Jan
> 
> 
> 
> > -Original Message-
> > > I have tried with closing them, but it doesn´t work.
> > > But send me your code please. Maybe you have done some 
> different :-)
> > >
> > >
> > Attached.
> > Peter
> > 
> 

DO NOT REPLY [Bug 22888] - using regex package when optional.jar is not on classpath

[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=22888

using regex package when optional.jar is not on classpath

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 11:54 ---
Ant 1.6 is going to have this kind of sorted out.

The JDK 1.4 implementation will be in nodeps.jar, the one for ORO in ant-oro.jar
and the jakarta-regexp implementation in ant-jakarta-regexp.jar.

There'll be no monolithic optional.jar.

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

cvs commit: ant/docs/manual/CoreTypes custom-programming.html

[antoine]

antoine 2003/09/23 04:49:42

  Modified:docs/manual/CoreTypes Tag: ANT_16_BRANCH
custom-programming.html
  Log:
  merging last change from head
  Submitted by: Larry Shatzer (larry dot shatzer at spirent dot com)
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.1   +30 -31ant/docs/manual/CoreTypes/custom-programming.html
  
  Index: custom-programming.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTypes/custom-programming.html,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- custom-programming.html   13 Aug 2003 09:05:22 -  1.2
  +++ custom-programming.html   23 Sep 2003 11:49:42 -  1.2.2.1
  @@ -1,9 +1,8 @@
   
 
   
  -Custom Components
  +Custom Components
 
  -
 
   Custom Components
   Overview
  @@ -66,10 +65,10 @@
   // This method evaluates the condition
   public boolean eval() {
   if (value == null) {
  -throw new BuildException("value attribute is not set");
  +throw new BuildException("value attribute is not set");
   }
   return value.toUpperCase().equals(value);
  -   }
  +   }
   }
 
   
  @@ -80,9 +79,9 @@
   
 
   
  +name="alluppercase"
  +classname="com.mydomain.AllUpperCaseCondition"
  +classpath="${mydomain.classes}"/>
 
   
   
  @@ -91,8 +90,8 @@
   
   
 
  -
  -   
  +
  +   
   
 
   
  @@ -110,7 +109,7 @@
   
   
 An example of a custom selection that selects filenames ending
  -  in ".java" would be:
  +  in ".java" would be:
   
   
 
  @@ -119,7 +118,7 @@
   import org.apache.tools.ant.types.selectors.FileSelector;
   public class JavaSelector implements FileSelector {
   public boolean isSelected(File b, String filename, File f) {
  -   return filename.toLowerCase().endsWith(".java");
  +   return filename.toLowerCase().endsWith(".java");
   }
   }
 
  @@ -130,9 +129,9 @@
   
 
   
  +name="javaselector"
  +classname="com.mydomain.JavaSelector"
  +classpath="${mydomain.classes}"/>
 
   
   
  @@ -141,14 +140,14 @@
   
   
 
  -
  -   
  +
  +   
 
  
   
 
   
  - 
  +
 
   One may use
   org.apache.tools.ant.types.selectors.BaseSelector,
  @@ -164,7 +163,7 @@
   last chance to check your settings for consistency because it
   calls verifySettings(). Override this method and
   call setError() within it if you detect any
  -problems in how your selector is set up.
  +problems in how your selector is set up.
   
   
 To write custom selector containers one should extend
  @@ -190,7 +189,7 @@
   }
   public void verifySettings() {
   if (number < 0) {
  -   throw new BuildException("Number attribute should be set");
  +   throw new BuildException("Number attribute should be 
set");
   }
   }
   public boolean isSelected(File baseDir, String filename, File file) {
  @@ -212,13 +211,13 @@
   
   
 
  -
  +
   ...
  -
  -   
  -  
  -  
  +
  +   
  +  
  +  
 
  
   
  @@ -229,7 +228,7 @@
   
   
 The custom selector was the pre ant 1.6 way of defining custom 
selectors.
  -  This method is still supported for backward compatiblity.
  +  This method is still supported for backward compatibility.
   
   You can write your own selectors and use them within the selector
 containers by specifying them within the  tag.
  @@ -299,7 +298,7 @@
   
 
   
  -
  +
   The core selectors that can also be used as custom se

Re: AW: [PATCH] and problem with patch.xml

[peter reilly]

Is there any reason   " is preferred to " in
html files ?

It makes reading the html source containg
build script examples quite difficult 

Peter

On Tuesday 23 September 2003 12:39, Antoine Lévy-Lambert wrote:
> Patch submitted, thanks
>
> Antoine
>
> -Ursprüngliche Nachricht-
> Von: Shatzer, Larry [mailto:[EMAIL PROTECTED]
> Gesendet: Dienstag, 23. September 2003 00:00
> An: '[EMAIL PROTECTED]'
> Betreff: [PATCH] and problem with patch.xml
>
>
> While making changes to custom-programing.html, I found an invalid property
> in the documentation.
>
> "${mydomain.classes" which should be "${mydomain.classes}".
>
> When running patch.xml, it has a problem:
>
> Caught exception (org.apache.tools.ant.BuildException) while expanding
> no.copyright.set: Syntax error in property: <
> classpath="${mydomain.classes"/>
>
> Since patch.txt.tmp has both properties showing (invalid and valid), it
> tries to expand them both, and fails.
>
> I'm not quite sure how to fix this in patch.xml for future problems with
> this. In the short term I've attached a patch to fix custom-programing.html
> (along with a few other changes like use of " to " to be more
> consistent, and spelling).
>
> -- 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]

AW: [PATCH] and problem with patch.xml

[Antoine Lévy-Lambert]

Patch submitted, thanks

Antoine

-Ursprüngliche Nachricht-
Von: Shatzer, Larry [mailto:[EMAIL PROTECTED]
Gesendet: Dienstag, 23. September 2003 00:00
An: '[EMAIL PROTECTED]'
Betreff: [PATCH] and problem with patch.xml


While making changes to custom-programing.html, I found an invalid property
in the documentation.

"${mydomain.classes" which should be "${mydomain.classes}".

When running patch.xml, it has a problem:

Caught exception (org.apache.tools.ant.BuildException) while expanding
no.copyright.set: Syntax error in property: <
classpath="${mydomain.classes"/>

Since patch.txt.tmp has both properties showing (invalid and valid), it
tries to expand them both, and fails.

I'm not quite sure how to fix this in patch.xml for future problems with
this. In the short term I've attached a patch to fix custom-programing.html
(along with a few other changes like use of " to " to be more
consistent, and spelling).

-- Larry



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

cvs commit: ant/docs/manual/CoreTypes custom-programming.html

[antoine]

antoine 2003/09/23 04:35:53

  Modified:docs/manual/CoreTypes custom-programming.html
  Log:
  replacing of " with " there was also a paragraph which was closed
  twice with 
  Submitted by: Larry Shatzer (larry dot shatzer at spirent dot com)
  
  Revision  ChangesPath
  1.3   +30 -31ant/docs/manual/CoreTypes/custom-programming.html
  
  Index: custom-programming.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTypes/custom-programming.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- custom-programming.html   13 Aug 2003 09:05:22 -  1.2
  +++ custom-programming.html   23 Sep 2003 11:35:53 -  1.3
  @@ -1,9 +1,8 @@
   
 
   
  -Custom Components
  +Custom Components
 
  -
 
   Custom Components
   Overview
  @@ -66,10 +65,10 @@
   // This method evaluates the condition
   public boolean eval() {
   if (value == null) {
  -throw new BuildException("value attribute is not set");
  +throw new BuildException("value attribute is not set");
   }
   return value.toUpperCase().equals(value);
  -   }
  +   }
   }
 
   
  @@ -80,9 +79,9 @@
   
 
   
  +name="alluppercase"
  +classname="com.mydomain.AllUpperCaseCondition"
  +classpath="${mydomain.classes}"/>
 
   
   
  @@ -91,8 +90,8 @@
   
   
 
  -
  -   
  +
  +   
   
 
   
  @@ -110,7 +109,7 @@
   
   
 An example of a custom selection that selects filenames ending
  -  in ".java" would be:
  +  in ".java" would be:
   
   
 
  @@ -119,7 +118,7 @@
   import org.apache.tools.ant.types.selectors.FileSelector;
   public class JavaSelector implements FileSelector {
   public boolean isSelected(File b, String filename, File f) {
  -   return filename.toLowerCase().endsWith(".java");
  +   return filename.toLowerCase().endsWith(".java");
   }
   }
 
  @@ -130,9 +129,9 @@
   
 
   
  +name="javaselector"
  +classname="com.mydomain.JavaSelector"
  +classpath="${mydomain.classes}"/>
 
   
   
  @@ -141,14 +140,14 @@
   
   
 
  -
  -   
  +
  +   
 
  
   
 
   
  - 
  +
 
   One may use
   org.apache.tools.ant.types.selectors.BaseSelector,
  @@ -164,7 +163,7 @@
   last chance to check your settings for consistency because it
   calls verifySettings(). Override this method and
   call setError() within it if you detect any
  -problems in how your selector is set up.
  +problems in how your selector is set up.
   
   
 To write custom selector containers one should extend
  @@ -190,7 +189,7 @@
   }
   public void verifySettings() {
   if (number < 0) {
  -   throw new BuildException("Number attribute should be set");
  +   throw new BuildException("Number attribute should be 
set");
   }
   }
   public boolean isSelected(File baseDir, String filename, File file) {
  @@ -212,13 +211,13 @@
   
   
 
  -
  +
   ...
  -
  -   
  -  
  -  
  +
  +   
  +  
  +  
 
  
   
  @@ -229,7 +228,7 @@
   
   
 The custom selector was the pre ant 1.6 way of defining custom 
selectors.
  -  This method is still supported for backward compatiblity.
  +  This method is still supported for backward compatibility.
   
   You can write your own selectors and use them within the selector
 containers by specifying them within the  tag.
  @@ -299,7 +298,7 @@
   
 
   
  -
  +
   The core selectors that can also be used as custom selectors
 are
   
  @@ -364,7 +363,7 @@
   cou

DO NOT REPLY [Bug 23341] - breaks binary files

[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=23341

 breaks binary files

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 11:28 ---
It does and it is documented that way.  From 's manual page

> Note: If you employ filters in your copy operation, you should limit the copy 
> to
> text files. Binary files will be corrupted by the copy operation.

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

cvs commit: ant/xdocs/stylesheets templates.vm

[bodewig]

bodewig 2003/09/23 04:04:10

  Modified:docs antnews.html bindownload.html bylaws.html
contributors.html cvs.html external.html faq.html
index.html legal.html license.html mail.html
mission.html problems.html projects.html
resources.html srcdownload.html
   docs/projects index.html
   docs/projects/antidote design.html index.html module.html
   xdocsindex.xml
   xdocs/stylesheets templates.vm
  Log:
  Add AC logo on all pages.  This solution is ugly, ugly and ugly.  Feel free 
to improve upon it
  
  Revision  ChangesPath
  1.78  +4 -0  ant/docs/antnews.html
  
  Index: antnews.html
  ===
  RCS file: /home/cvs/ant/docs/antnews.html,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- antnews.html  20 Aug 2003 23:28:59 -  1.77
  +++ antnews.html  23 Sep 2003 11:04:09 -  1.78
  @@ -79,6 +79,10 @@
 
   
 
  +  http://apachecon.com/2003/US/index.html";>
  +http://jakarta.apache.org/images/logos/ac2003-150.gif"/>
  +  
   
 
 Apache Ant
  
  
  
  1.37  +4 -0  ant/docs/bindownload.html
  
  Index: bindownload.html
  ===
  RCS file: /home/cvs/ant/docs/bindownload.html,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- bindownload.html  18 Aug 2003 09:58:27 -  1.36
  +++ bindownload.html  23 Sep 2003 11:04:09 -  1.37
  @@ -73,6 +73,10 @@
 
   
 
  +  http://apachecon.com/2003/US/index.html";>
  +http://jakarta.apache.org/images/logos/ac2003-150.gif"/>
  +  
   
 
 Apache Ant
  
  
  
  1.4   +4 -0  ant/docs/bylaws.html
  
  Index: bylaws.html
  ===
  RCS file: /home/cvs/ant/docs/bylaws.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- bylaws.html   3 Jul 2003 08:37:17 -   1.3
  +++ bylaws.html   23 Sep 2003 11:04:09 -  1.4
  @@ -73,6 +73,10 @@
 
   
 
  +  http://apachecon.com/2003/US/index.html";>
  +http://jakarta.apache.org/images/logos/ac2003-150.gif"/>
  +  
   
 
 Apache Ant
  
  
  
  1.30  +4 -0  ant/docs/contributors.html
  
  Index: contributors.html
  ===
  RCS file: /home/cvs/ant/docs/contributors.html,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- contributors.html 2 Sep 2003 16:17:40 -   1.29
  +++ contributors.html 23 Sep 2003 11:04:09 -  1.30
  @@ -73,6 +73,10 @@
 
   
 
  +  http://apachecon.com/2003/US/index.html";>
  +http://jakarta.apache.org/images/logos/ac2003-150.gif"/>
  +  
   
 
 Apache Ant
  
  
  
  1.21  +4 -0  ant/docs/cvs.html
  
  Index: cvs.html
  ===
  RCS file: /home/cvs/ant/docs/cvs.html,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- cvs.html  3 Jul 2003 08:37:17 -   1.20
  +++ cvs.html  23 Sep 2003 11:04:09 -  1.21
  @@ -73,6 +73,10 @@
 
   
 
  +  http://apachecon.com/2003/US/index.html";>
  +http://jakarta.apache.org/images/logos/ac2003-150.gif"/>
  +  
   
 
 Apache Ant
  
  
  
  1.137 +4 -0  ant/docs/external.html
  
  Index: external.html
  ===
  RCS file: /home/cvs/ant/docs/external.html,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- external.html 19 Sep 2003 12:44:15 -  1.136
  +++ external.html 23 Sep 2003 11:04:09 -  1.137
  @@ -75,6 +75,10 @@
 
   
 
  +  http://apachecon.com/2003/US/index.html";>
  +http://jakarta.apache.org/images/logos/ac2003-150.gif"/>
  +  
   
 
 Apache Ant
  
  
  
  1.78  +4 -0  ant/docs/faq.html
  
  Index: faq.html
  ===
  RCS file: /home/cvs/ant/docs/faq.html,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- faq.html  20 Aug 2003 16:07:48 -  1.77
  +++ faq.html  23 Sep 2003 11:04:09 -  1.78
  @@ -75,6 +75,10 @@
 
   
 
  +  http://apachecon.com/2003/US/index.html";>
  +http://jakarta.apache.org/images/logos/ac2003-150.gif"/>
  +  
   
 
 Apache Ant
  
  

RE: concat teardown failing

[Jan . Materne]

Difference to my solution is only that you´re setting the append- and
prepend reader
to null. But that don´t work on my machine :-(

But I don´t get the error while deleting the append- or prepend file. I get
the error
while deleting the resulting file.

But if I add a "super.close()" I´ll get other errors ...

But I have changed the code according to your modifications. So it should
pass on linux (a little progress).


Jan



> -Original Message-
> > I have tried with closing them, but it doesn´t work.
> > But send me your code please. Maybe you have done some different :-)
> >
> >
> Attached.
> Peter
> 

AW: ReplaceTest failing under cygwin

[Antoine Lévy-Lambert]

I am going to change the test.
Probably running all input and expected files through  should do
it.
I will need to copy everything first to a tmp directory though.

Cheers,

Antoine

-Ursprüngliche Nachricht-
Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Gesendet: Dienstag, 23. September 2003 12:45
An: [EMAIL PROTECTED]
Betreff: RE: ReplaceTest failing under cygwin


> - Change the test... or declare the failure invalid.
>   The test checks line ending without having control of the
> lineendings as
>   on windows, the cvs client may or may not add 's to
> files. For text
>   files it should, but cygwin's cvs client does not do this. A simple
>   fix is to use a cvs client that respects crazy windows/dos behaviour
>   (cvsnt is the one I used when I was on NT).
>
>   The test could write the expected result instead of using
> expected files
>   in cvs.
>
> Peter


I think changing the test would be good.
But why don´t add a  before the tests?


Jan


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

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs defaults.properties Classloader.java

[antoine]

antoine 2003/09/23 03:45:15

  Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
defaults.properties
  Removed: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Classloader.java
  Log:
  Remove ClassLoader from the ant 1.6 branch
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.153.2.1 +0 -1  
ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
  
  Index: defaults.properties
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
  retrieving revision 1.153
  retrieving revision 1.153.2.1
  diff -u -r1.153 -r1.153.2.1
  --- defaults.properties   6 Sep 2003 07:09:59 -   1.153
  +++ defaults.properties   23 Sep 2003 10:45:15 -  1.153.2.1
  @@ -70,7 +70,6 @@
   concat=org.apache.tools.ant.taskdefs.Concat
   cvstagdiff=org.apache.tools.ant.taskdefs.cvslib.CvsTagDiff
   tempfile=org.apache.tools.ant.taskdefs.TempFile
  -classloader=org.apache.tools.ant.taskdefs.Classloader
   import=org.apache.tools.ant.taskdefs.ImportTask
   whichresource=org.apache.tools.ant.taskdefs.WhichResource
   subant=org.apache.tools.ant.taskdefs.SubAnt
  
  
  

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

RE: ReplaceTest failing under cygwin

[Jan . Materne]

> On Tuesday 23 September 2003 11:23, Antoine Lévy-Lambert wrote:
> > ReplaceTest fails under cygwin.
> > [junit] Testcase: test9 took 0,13 sec
> >  [junit]FAILED [junit] expected:<10> but was:<13>
> >  [junit] junit.framework.AssertionFailedError: expected:<10> but
> > was:<13>
> >
> > This has to do with the fact that the Replace task changes 
> the line endings
> > of tokens and values to 
> System.getProperty("line.separator"), but that the
> > files used for the tests are terminated with \n only when 
> one uses the
> > cvs.exe of cygwin.
> >
> > I can think of several ways of fixing this :
> >
> > - the easiest would be to change the Replace task, not to 
> touch the line
> > endings of tokens and values at all. After all, I do not 
> know why they get
> > such a special treatment. But this would also be a backward 
> incompatible
> > change,
> >
> > - adding an enumerated attribute eol (like in the fixcrlf 
> task) to the
> > nested elements , , 
> . Like in
> > the fixcrlf task, the platform's line separator would be 
> the default there,
> > and "asis" would be used to run the test(s) with 
> predictable results.
> 
> - Change the test... or declare the failure invalid.
>   The test checks line ending without having control of the 
> lineendings as
>   on windows, the cvs client may or may not add 's to 
> files. For text
>   files it should, but cygwin's cvs client does not do this. A simple
>   fix is to use a cvs client that respects crazy windows/dos behaviour
>   (cvsnt is the one I used when I was on NT).
> 
>   The test could write the expected result instead of using 
> expected files
>   in cvs.
> 
> Peter


I think changing the test would be good.
But why don´t add a  before the tests?


Jan

Re: ReplaceTest failing under cygwin

[peter reilly]

On Tuesday 23 September 2003 11:23, Antoine Lévy-Lambert wrote:
> ReplaceTest fails under cygwin.
> [junit] Testcase: test9 took 0,13 sec
>  [junit]  FAILED [junit] expected:<10> but was:<13>
>  [junit] junit.framework.AssertionFailedError: expected:<10> but
> was:<13>
>
> This has to do with the fact that the Replace task changes the line endings
> of tokens and values to System.getProperty("line.separator"), but that the
> files used for the tests are terminated with \n only when one uses the
> cvs.exe of cygwin.
>
> I can think of several ways of fixing this :
>
> - the easiest would be to change the Replace task, not to touch the line
> endings of tokens and values at all. After all, I do not know why they get
> such a special treatment. But this would also be a backward incompatible
> change,
>
> - adding an enumerated attribute eol (like in the fixcrlf task) to the
> nested elements , , . Like in
> the fixcrlf task, the platform's line separator would be the default there,
> and "asis" would be used to run the test(s) with predictable results.

- Change the test... or declare the failure invalid.
  The test checks line ending without having control of the lineendings as
  on windows, the cvs client may or may not add 's to files. For text
  files it should, but cygwin's cvs client does not do this. A simple
  fix is to use a cvs client that respects crazy windows/dos behaviour
  (cvsnt is the one I used when I was on NT).

  The test could write the expected result instead of using expected files
  in cvs.

Peter
>
> Is the reason why line endings of tokens and values in  are
> manipulated that, when they are read from  to ant \n as line separator also on Windows, which is generally not what is
> desired ? When on the contrary the replacetoken or replacevalue come from a
> property, the build file writer is fully in control of the flavour of the
> line endings of the tokens and values and would not need any special
> manipulation.
>
> Cheers,
>
> Antoine
>
>
> -
> 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]

AW: Ant 1.6

[Antoine Lévy-Lambert]

-Ursprüngliche Nachricht-
Von: Conor MacNeill [mailto:[EMAIL PROTECTED]
Gesendet: Dienstag, 23. September 2003 12:42
An: Ant Developers List
Betreff: Re: Ant 1.6


>On Tue, 23 Sep 2003 04:13 pm, Stefan Bodewig wrote:
>>
>> I remeber you've told me the same at least once in the past 8-)
>>

>Well, I don't like the inefficiency :-). It doesn't make sense to me to
branch
>and then do a whole lot of work to keep the branches in sync :-( Anyway,
I'll
>be merging across any changes.

I also think that branches add extra work, but sooner or later someone will
have a new feature which can only go into 1.7 and not in 1.6. There is
already  which I have got to remove from the ANT_16_BRANCH.

Cheers,

Antoine




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

Re: Ant 1.6

[Conor MacNeill]

On Tue, 23 Sep 2003 04:13 pm, Stefan Bodewig wrote:
>
> I remeber you've told me the same at least once in the past 8-)
>

Well, I don't like the inefficiency :-). It doesn't make sense to me to branch 
and then do a whole lot of work to keep the branches in sync :-( Anyway, I'll 
be merging across any changes.

I want to change the -lib handling a little.

Conor


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

ReplaceTest failing under cygwin

[Antoine Lévy-Lambert]

ReplaceTest fails under cygwin.
[junit] Testcase: test9 took 0,13 sec
 [junit]FAILED [junit] expected:<10> but was:<13>
 [junit] junit.framework.AssertionFailedError: expected:<10> but
was:<13>

This has to do with the fact that the Replace task changes the line endings
of tokens and values to System.getProperty("line.separator"), but that the
files used for the tests are terminated with \n only when one uses the
cvs.exe of cygwin.

I can think of several ways of fixing this :

- the easiest would be to change the Replace task, not to touch the line
endings of tokens and values at all. After all, I do not know why they get
such a special treatment. But this would also be a backward incompatible
change,

- adding an enumerated attribute eol (like in the fixcrlf task) to the
nested elements , , . Like in
the fixcrlf task, the platform's line separator would be the default there,
and "asis" would be used to run the test(s) with predictable results.

Is the reason why line endings of tokens and values in  are
manipulated that, when they are read from 

Re: concat teardown failing

[peter reilly]

On Tuesday 23 September 2003 11:10, [EMAIL PROTECTED] wrote:
> I have tried with closing them, but it doesn´t work.
> But send me your code please. Maybe you have done some different :-)
>
>
Attached.
PeterIndex: ConcatFilter.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/ConcatFilter.java,v
retrieving revision 1.2
diff -u -r1.2 ConcatFilter.java
--- ConcatFilter.java	19 Sep 2003 09:24:13 -	1.2
+++ ConcatFilter.java	23 Sep 2003 10:12:46 -
@@ -89,10 +89,10 @@
 private File append;
 
 /** Reader for prepend-file. */
-private Reader prependReader = new EmptyReader();
+private Reader prependReader = null;
 
 /** Reader for append-file. */
-private Reader appendReader = new EmptyReader();
+private Reader appendReader = null;
 
 /**
  * Constructor for "dummy" instances.
@@ -136,12 +136,24 @@
 
 // The readers return -1 if they end. So simply read the "prepend"
 // after that the "content" and at the end the "append" file.
-ch = prependReader.read();
+if (prependReader != null) {
+ch = prependReader.read();
+if (ch == -1) {
+prependReader.close();
+prependReader = null;
+}
+}
 if (ch == -1) {
 ch = super.read();
 }
 if (ch == -1) {
-ch = appendReader.read();
+if (appendReader != null) {
+ch = appendReader.read();
+if (ch == -1) {
+appendReader.close();
+appendReader = null;
+}
+}
 }
 
 return ch;
@@ -234,13 +246,4 @@
 }
}
 
-   /**
-* Reader which is always at the end of file.
-* Used for easier algorithm (polymorphism instead if-cascades).
-*/
-   private class EmptyReader extends Reader {
-   public int read(char[] ch, int i1, int i2) { return -1; }
-   public void close() { }
-   }
-
-}
\ No newline at end of file
+}

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

RE: concat teardown failing

[Jan . Materne]

I have tried with closing them, but it doesn´t work.
But send me your code please. Maybe you have done some different :-)


Jan

> -Original Message-
> From: peter reilly [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, September 23, 2003 12:04 PM
> To: Ant Developers List
> Subject: Re: concat teardown failing
> 
> 
> I think the problem is in o.a.t.a.filters.ConcatFilter
> 
> The code opens the prepend and append files but
> does not close them.
> 
> I have code that closes the files and passes the
> tests on linux, but do not have windows to
> test on.
> 
> Peter
> On Tuesday 23 September 2003 10:17, [EMAIL PROTECTED] wrote:
> > I need help ...
> >
> >
> > I have inserted some debug statements in 
> FileUtils.copyFile() (line up
> > 531). And the result:
> >   FileUtils:538 - start
> >   FileUtils: 542
> >   FileUtils: 559 filterSetsAvailable=false
> >   FileUtils:623
> >
> > 
> sourceFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filt
> ers\input\con
> >c atfilter.test
> >
> > 
> destFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filter
> s\result\conc
> >a t.filterReaderPrepend.test
> >   FileUtils:667
> >   FileUtils:669: close [EMAIL PROTECTED]
> >   FileUtils:671: close [EMAIL PROTECTED]
> >   FileUtils:705 - ende
> >   execute Target: cleanup
> >   Unable to delete file
> > 
> C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\
> concat.filter
> >R eaderPrepend.test
> >
> >
> > The concat.filterReaderPrepend.test can´t be deleted but 
> it´s closed in
> > line 669.
> >
> > Any ideas?
> >
> >
> > Jan
> >
> > > -Original Message-
> > > From: [EMAIL PROTECTED] 
> [mailto:[EMAIL PROTECTED]
> > > Sent: Tuesday, September 23, 2003 9:05 AM
> > > To: [EMAIL PROTECTED]
> > > Subject: RE: concat teardown failing
> > >
> > >
> > > And I thought that´s only on my machine ... (that´s why I put that
> > > into a try-catch block in the tearDown() - the _real_ 
> test shouldn´t
> > > fail only because the cleanup fails ...)
> > >
> > > "task not closing things" - I will take a look into that.
> > > While programming I use java.io.FileReader without a close (I
> > > have tried
> > > that - without success). And the other filters doesn´t close
> > > the Reader
> > > either.
> > >
> > > More hints are welcome :-)
> > >
> > >
> > >
> > > Jan
> > >
> > > > -Original Message-
> > > > From: Steve Loughran [mailto:[EMAIL PROTECTED]
> > > > Sent: Tuesday, September 23, 2003 8:23 AM
> > > > To: Ant Developers List
> > > > Subject: concat teardown failing
> > > >
> > > >
> > > >
> > > > the cleanup script in concat.xml is failing. Looks to me like
> > > > the files
> > > > are still open when the delete task takes action. Could set
> > > > failonerror
> > > > flags to ignore it, but it may be a symptom of the task not
> > > > closing things.
> > > >
> > > > platform: winxp, java1.4.2
> > > >
> > > >  [junit] - Standard Error -
> > > >  [junit]
> > > > 
> C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13:
> > > > Unable to delete file
> > > > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co
> > > > ncat.filterReaderPrepend.test
> > > >  [junit]at
> > > > org.apache.tools.ant.taskdefs.Delete.removeDir(Delete.java:612)
> > > >  [junit]at
> > > > org.apache.tools.ant.taskdefs.Delete.execute(Delete.java:530)
> > > >  [junit]at
> > > > 
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:303)
> > > >  [junit]at
> > >
> > > org.apache.tools.ant.Task.perform(Task.java:401)
> > >
> > > >  [junit]at
> > >
> > > org.apache.tools.ant.Target.execute(Target.java:338)
> > >
> > > >  [junit]at
> > > > org.apache.tools.ant.Target.performTasks(Target.java:365)
> > > >  [junit]at
> > > > org.apache.tools.ant.Project.executeTarget(Project.java:1237)
> > > >  [junit]at
> > > > org.apache.tools.ant.BuildFileTest.executeTarget(BuildFileTest
> > > > .java:273)
> > > >  [junit]at
> > > > org.apache.tools.ant.filters.ConcatFilterTest.tearDown(ConcatF
> > > > ilterTest.java:126)
> > > >
> > > > ...
> > > >
> > > >  [junit]
> > > > 
> C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13:
> > > > Unable to delete file
> > >
> > > 
> C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\append.txt
> > >
> > > >  [junit]
> > > > 
> C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13:
> > > > Unable to delete file
> > > > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co
> > > > ncat.concatfilter.test
> > > >
> > > > ...
> > >
> > > 
> -
> > >
> > > > 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: concat teardown failing

[peter reilly]

I think the problem is in o.a.t.a.filters.ConcatFilter

The code opens the prepend and append files but
does not close them.

I have code that closes the files and passes the
tests on linux, but do not have windows to
test on.

Peter
On Tuesday 23 September 2003 10:17, [EMAIL PROTECTED] wrote:
> I need help ...
>
>
> I have inserted some debug statements in FileUtils.copyFile() (line up
> 531). And the result:
>   FileUtils:538 - start
>   FileUtils: 542
>   FileUtils: 559 filterSetsAvailable=false
>   FileUtils:623
>
> sourceFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\input\con
>c atfilter.test
>
> destFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\conc
>a t.filterReaderPrepend.test
>   FileUtils:667
>   FileUtils:669: close [EMAIL PROTECTED]
>   FileUtils:671: close [EMAIL PROTECTED]
>   FileUtils:705 - ende
>   execute Target: cleanup
>   Unable to delete file
> C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\concat.filter
>R eaderPrepend.test
>
>
> The concat.filterReaderPrepend.test can´t be deleted but it´s closed in
> line 669.
>
> Any ideas?
>
>
> Jan
>
> > -Original Message-
> > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> > Sent: Tuesday, September 23, 2003 9:05 AM
> > To: [EMAIL PROTECTED]
> > Subject: RE: concat teardown failing
> >
> >
> > And I thought that´s only on my machine ... (that´s why I put that
> > into a try-catch block in the tearDown() - the _real_ test shouldn´t
> > fail only because the cleanup fails ...)
> >
> > "task not closing things" - I will take a look into that.
> > While programming I use java.io.FileReader without a close (I
> > have tried
> > that - without success). And the other filters doesn´t close
> > the Reader
> > either.
> >
> > More hints are welcome :-)
> >
> >
> >
> > Jan
> >
> > > -Original Message-
> > > From: Steve Loughran [mailto:[EMAIL PROTECTED]
> > > Sent: Tuesday, September 23, 2003 8:23 AM
> > > To: Ant Developers List
> > > Subject: concat teardown failing
> > >
> > >
> > >
> > > the cleanup script in concat.xml is failing. Looks to me like
> > > the files
> > > are still open when the delete task takes action. Could set
> > > failonerror
> > > flags to ignore it, but it may be a symptom of the task not
> > > closing things.
> > >
> > > platform: winxp, java1.4.2
> > >
> > >  [junit] - Standard Error -
> > >  [junit]
> > > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13:
> > > Unable to delete file
> > > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co
> > > ncat.filterReaderPrepend.test
> > >  [junit]  at
> > > org.apache.tools.ant.taskdefs.Delete.removeDir(Delete.java:612)
> > >  [junit]  at
> > > org.apache.tools.ant.taskdefs.Delete.execute(Delete.java:530)
> > >  [junit]  at
> > > org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:303)
> > >  [junit]  at
> >
> > org.apache.tools.ant.Task.perform(Task.java:401)
> >
> > >  [junit]  at
> >
> > org.apache.tools.ant.Target.execute(Target.java:338)
> >
> > >  [junit]  at
> > > org.apache.tools.ant.Target.performTasks(Target.java:365)
> > >  [junit]  at
> > > org.apache.tools.ant.Project.executeTarget(Project.java:1237)
> > >  [junit]  at
> > > org.apache.tools.ant.BuildFileTest.executeTarget(BuildFileTest
> > > .java:273)
> > >  [junit]  at
> > > org.apache.tools.ant.filters.ConcatFilterTest.tearDown(ConcatF
> > > ilterTest.java:126)
> > >
> > > ...
> > >
> > >  [junit]
> > > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13:
> > > Unable to delete file
> >
> > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\append.txt
> >
> > >  [junit]
> > > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13:
> > > Unable to delete file
> > > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co
> > > ncat.concatfilter.test
> > >
> > > ...
> >
> > -
> >
> > > 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 scp.html sshexec.html

[bodewig]

bodewig 2003/09/23 02:34:50

  Modified:docs/manual/OptionalTasks Tag: ANT_16_BRANCH scp.html
sshexec.html
  Log:
  tested jsch-0.1.8
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.7.2.1   +1 -1  ant/docs/manual/OptionalTasks/scp.html
  
  Index: scp.html
  ===
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- scp.html  28 Aug 2003 07:10:39 -  1.7
  +++ scp.html  23 Sep 2003 09:34:50 -  1.7.2.1
  @@ -20,7 +20,7 @@
   in the Ant distribution.  See Library Dependencies
   for more information.  This task has been tested with jsch-0.1.2 to
  -jsch-0.1.7.
  +jsch-0.1.8.
   
   Parameters
   
  
  
  
  1.5.2.1   +3 -2  ant/docs/manual/OptionalTasks/sshexec.html
  
  Index: sshexec.html
  ===
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/sshexec.html,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- sshexec.html  28 Aug 2003 07:10:39 -  1.5
  +++ sshexec.html  23 Sep 2003 09:34:50 -  1.5.2.1
  @@ -18,8 +18,9 @@
   Note: This task depends on external libraries not included
   in the Ant distribution.  See Library Dependencies
  -for more information.  This task has been tested with jsch-0.1.7 and
  -won't work with earlier versions of jsch..
  +for more information.  This task has been tested with jsch-0.1.7 to
  +jsch-0.1.8 and won't work with versions of jsch earlier than
  +0.1.7.
   
   Parameters
   
  
  
  

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

cvs commit: ant/docs/manual/OptionalTasks scp.html sshexec.html

[bodewig]

bodewig 2003/09/23 02:32:48

  Modified:docs/manual/OptionalTasks scp.html sshexec.html
  Log:
  tested jsch-0.1.8
  
  Revision  ChangesPath
  1.8   +1 -1  ant/docs/manual/OptionalTasks/scp.html
  
  Index: scp.html
  ===
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- scp.html  28 Aug 2003 07:10:39 -  1.7
  +++ scp.html  23 Sep 2003 09:32:48 -  1.8
  @@ -20,7 +20,7 @@
   in the Ant distribution.  See Library Dependencies
   for more information.  This task has been tested with jsch-0.1.2 to
  -jsch-0.1.7.
  +jsch-0.1.8.
   
   Parameters
   
  
  
  
  1.6   +3 -2  ant/docs/manual/OptionalTasks/sshexec.html
  
  Index: sshexec.html
  ===
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/sshexec.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sshexec.html  28 Aug 2003 07:10:39 -  1.5
  +++ sshexec.html  23 Sep 2003 09:32:48 -  1.6
  @@ -18,8 +18,9 @@
   Note: This task depends on external libraries not included
   in the Ant distribution.  See Library Dependencies
  -for more information.  This task has been tested with jsch-0.1.7 and
  -won't work with earlier versions of jsch..
  +for more information.  This task has been tested with jsch-0.1.7 to
  +jsch-0.1.8 and won't work with versions of jsch earlier than
  +0.1.7.
   
   Parameters
   
  
  
  

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

RE: concat teardown failing

[Jan . Materne]

I need help ...


I have inserted some debug statements in FileUtils.copyFile() (line up 531).
And the result:
  FileUtils:538 - start
  FileUtils: 542
  FileUtils: 559 filterSetsAvailable=false
  FileUtils:623
 
sourceFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\input\conc
atfilter.test
 
destFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\conca
t.filterReaderPrepend.test
  FileUtils:667
  FileUtils:669: close [EMAIL PROTECTED]
  FileUtils:671: close [EMAIL PROTECTED]
  FileUtils:705 - ende
  execute Target: cleanup
  Unable to delete file
C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\concat.filterR
eaderPrepend.test


The concat.filterReaderPrepend.test can´t be deleted but it´s closed in line
669.

Any ideas?


Jan



> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, September 23, 2003 9:05 AM
> To: [EMAIL PROTECTED]
> Subject: RE: concat teardown failing
> 
> 
> And I thought that´s only on my machine ... (that´s why I put that
> into a try-catch block in the tearDown() - the _real_ test shouldn´t
> fail only because the cleanup fails ...)
> 
> "task not closing things" - I will take a look into that.
> While programming I use java.io.FileReader without a close (I 
> have tried
> that - without success). And the other filters doesn´t close 
> the Reader
> either.
> 
> More hints are welcome :-)
> 
> 
> 
> Jan
> 
> 
> 
> > -Original Message-
> > From: Steve Loughran [mailto:[EMAIL PROTECTED]
> > Sent: Tuesday, September 23, 2003 8:23 AM
> > To: Ant Developers List
> > Subject: concat teardown failing
> > 
> > 
> > 
> > the cleanup script in concat.xml is failing. Looks to me like 
> > the files 
> > are still open when the delete task takes action. Could set 
> > failonerror 
> > flags to ignore it, but it may be a symptom of the task not 
> > closing things.
> > 
> > platform: winxp, java1.4.2
> > 
> >  [junit] - Standard Error -
> >  [junit] 
> > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: 
> > Unable to delete file 
> > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co
> > ncat.filterReaderPrepend.test
> >  [junit]at 
> > org.apache.tools.ant.taskdefs.Delete.removeDir(Delete.java:612)
> >  [junit]at 
> > org.apache.tools.ant.taskdefs.Delete.execute(Delete.java:530)
> >  [junit]at 
> > org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:303)
> >  [junit]at 
> org.apache.tools.ant.Task.perform(Task.java:401)
> >  [junit]at 
> org.apache.tools.ant.Target.execute(Target.java:338)
> >  [junit]at 
> > org.apache.tools.ant.Target.performTasks(Target.java:365)
> >  [junit]at 
> > org.apache.tools.ant.Project.executeTarget(Project.java:1237)
> >  [junit]at 
> > org.apache.tools.ant.BuildFileTest.executeTarget(BuildFileTest
> > .java:273)
> >  [junit]at 
> > org.apache.tools.ant.filters.ConcatFilterTest.tearDown(ConcatF
> > ilterTest.java:126)
> > 
> > ...
> > 
> >  [junit] 
> > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: 
> > Unable to delete file 
> > 
> C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\append.txt
> > 
> >  [junit] 
> > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: 
> > Unable to delete file 
> > C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co
> > ncat.concatfilter.test
> > 
> > ...
> > 
> > 
> > 
> > 
> > 
> > 
> -
> > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > For additional commands, e-mail: [EMAIL PROTECTED]
> > 
> 

RE: Ant 1.6

[Jan . Materne]

> I would like to release ant 1.6 beta on tuesday next week 
> (September 30th).
> Can you all have your changes ready by then ?
> 
> Really what I would prefer is that all changes which should 
> go into both 1.6
> and HEAD get merged by the committer who does the change, so 
> that I do not
> have to do it myself.
> 
> I would like to have a serious look at 3 test cases which fail in my
> environment Win2000/cygwin :
> 1) ReplaceTest : failing because cygwin cvs checks out the 
> files with a \n
> separator, but the multiline replacement introduces \r\n (just in the
> replaced part, the rest of the file stays unchanged).
> 
> 2) ModifiedSelectorTest : fails for me under cygwin, no idea yet why

works on my machine (Win2K, JDK 1.4.1), so I haven´t any idea, either.


> 3) ConcatTest : I also have the problem

I am searching ...



Jan