classloader task

2004-03-15 Thread Rainer Noack
After taskdef supports the loaderref attribute, I've written a task, 
that is able to explicitely create classloaders, append classpath 
entries to existing classloaders and put the actual path of a 
classloader into a property. 

In several projects, this avoids some of the annoying constraints and 
workarounds occasionally reported in bugzilla and the mailing lists.

I've merged it with Costin's sleeping classloader task and I think
it could be a helpful enhancement.

Currently it supports URLClassLoader and AntClassLoader and it is 
designed to simply support custom extensions for any arbitrary 
ClassLoader.

Regards,
Rainer

? docs/manual/CoreTasks/classloader.html
? src/etc/testcases/taskdefs/classloader
? src/main/org/apache/tools/ant/taskdefs/classloader
? src/main/org/apache/tools/ant/types/LoaderHandler.java
? src/main/org/apache/tools/ant/types/LoaderHandlerSet.java
? src/main/org/apache/tools/ant/types/URLPath.java
? src/main/org/apache/tools/ant/types/LoaderRef.java
? src/main/org/apache/tools/ant/types/LoaderParameters.java
? src/main/org/apache/tools/ant/types/AntLoaderParameters.java
? src/main/org/apache/tools/ant/util/URLUtils.java
? src/testcases/org/apache/tools/ant/taskdefs/ClassloaderTest.java
? src/testcases/org/apache/tools/ant/types/URLPathTest.java
Index: CONTRIBUTORS
===
RCS file: /home/cvspublic/ant/CONTRIBUTORS,v
retrieving revision 1.2
diff -u -r1.2 CONTRIBUTORS
--- CONTRIBUTORS13 Mar 2004 08:29:26 -  1.2
+++ CONTRIBUTORS13 Mar 2004 16:21:17 -
@@ -146,6 +146,7 @@
 Pierre Dittgen
 Raphael Pierquin
 R Handerson
+Rainer Noack
 Richard Evans
 Rick Beton
 Robert Anderson
Index: docs/manual/coretasklist.html
===
RCS file: /home/cvspublic/ant/docs/manual/coretasklist.html,v
retrieving revision 1.53
diff -u -r1.53 coretasklist.html
--- docs/manual/coretasklist.html   12 Mar 2004 15:11:35 -  1.53
+++ docs/manual/coretasklist.html   13 Mar 2004 16:24:03 -
@@ -26,6 +26,7 @@
 a href=CoreTasks/pack.htmlBZip2/abr
 a href=CoreTasks/checksum.htmlChecksum/abr
 a href=CoreTasks/chmod.htmlChmod/abr
+a href=CoreTasks/classloader.htmlClassloader/abr
 a href=CoreTasks/concat.htmlConcat/abr
 a href=CoreTasks/condition.htmlCondition/abr
 nbsp;nbsp;a href=CoreTasks/conditions.htmlSupported conditions/abr
Index: src/etc/testcases/taskdefs/classloader.xml
===
RCS file: /home/cvspublic/ant/src/etc/testcases/taskdefs/classloader.xml,v
retrieving revision 1.2
diff -u -r1.2 classloader.xml
--- src/etc/testcases/taskdefs/classloader.xml  24 Dec 2002 18:09:39 -  
1.2
+++ src/etc/testcases/taskdefs/classloader.xml  13 Mar 2004 16:28:14 -
@@ -1,23 +1,119 @@
-project name=classloader-test default=main basedir=.
+project name=classloader-test default=test-system2prop basedir=.
 
-  target name=init
+  target name=test.system2prop
+classloader loader=system property=test.cl.system2prop /
+condition property=test.system2prop
+   isset property=test.cl.system2prop/
+/condition
+  /target
+  
+  target name=test.report
+classloader report=true/
+  /target
 
-path id=myJars 
-  !-- both ant-junit.jar and junit.jar must be loaded from the same path 
--
-  pathelement path=${ant.home}/lib/ant-junit.jar /
-  pathelement path=${junit.jar} /
-/path
+  target name=test.system2prop
+classloader loader=system property=test.cl.system2prop /
+condition property=test.system2prop
+   isset property=test.cl.system2prop/
+/condition
+  /target
 
-classloader classpathRef=myJars 
- reverse=true 
-  
+  target name=test.createURL
+classloader loader=test.cl.createURL
+  classpath
+ urlpathelement location=http://my.domain/my.1st.jar/
+ urlpathelement 
path=http://my.domain/my.2nd.jar;http://my.domain/my.3rd.jar/
+  /classpath
 /classloader
-junit /
-  
+classloader loader=test.cl.createURL property=test.cl.createURL/
+condition property=test.createURL
+   equals 
arg1=http://my.domain/my.1st.jar;http://my.domain/my.2nd.jar;http://my.domain/my.3rd.jar;
 
+   arg2=${test.cl.createURL}/
+/condition
+
+  /target
+
+  target name=test.updateURL
+classloader loader=test.cl.updateURL
+  classpath
+ urlpathelement location=http://my.domain/my.1st.jar/
+  /classpath
+/classloader
+classloader loader=test.cl.updateURL property=test.cl.updateURL
+  classpath
+ urlpathelement location=http://my.domain/my.2nd.jar/
+  /classpath
+/classloader
+condition property=test.updateURL
+   equals arg1=http://my.domain/my.1st.jar;http://my.domain/my.2nd.jar; 
+   arg2=${test.cl.updateURL}/
+/condition
+
+  /target
+
+  target name=test.createAnt
+classloader loader=test.cl.createAnt
+   

javac and compilerargs

2004-03-15 Thread Arnaud Vandyck
Hi all!

My name is Arnaud Vandyck and I'm new here. I use ant for a long time
and cannot do anything without it! ;-)

I'm also a Debian Developer (like Stefan Gybas, Takashi Okamoto and
others).

I'd like to make some changes in the
ant-1.6.1/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java task
to change the behavior. I'd like ant NOT to pass the -C argument if a
nested compilerarg tag exists.

The reason:

I'd like to be able to build java sources to native code with gcj. I
think this can be achieved if I pass some extra arguments to the
compilerarg commandline like this:

javac srcdir=${src} destdir=${build}
  compilerarg line=--main=org.debian.java.HelloNative -o 
build/hellonative
  compiler=gcj/
/javac

But in the Gcj task, the '-C' argument is passed

/**
 *  gcj should be set for generate class.
 */
cmd.createArgument().setValue(-C);

I'd like to know if I can add a condition  around this line so if there
is compilerarg tag, with the '-o' or '--main=' argument, no -C
argument is passed to gcj.

Many thanks for your time and help,

-- 
~/.signature not found

This is Unix we're talking about, remember.  It's not supposed to be
nice for the applications programmer.
-- Matthew Danish on debian-devel

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



DO NOT REPLY [Bug 27641] - Ordering of targets affects processing of macro instance validation.

2004-03-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=27641.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=27641

Ordering of targets affects processing of macro instance validation.





--- Additional Comments From [EMAIL PROTECTED]  2004-03-15 09:53 ---
I have not been able to duplicate this using
the provided build.xml file.
Or with the targets reversed.

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



Re: javac and compilerargs

2004-03-15 Thread Stefan Bodewig
On Mon, 15 Mar 2004, Arnaud Vandyck [EMAIL PROTECTED] wrote:

 I'd like to make some changes in the
 ant-1.6.1/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
 task to change the behavior. I'd like ant NOT to pass the -C
 argument if a nested compilerarg tag exists.

This is hard to do in a backwards compatible way.

Honestly, I'm not sure how big our gcj user base is and how many of
them use compilerarg to pass additional arguments, the answer could
very well be zero.  But if it is bigger than that, such a change would
break their builds.

Is there a command line argument that you'd always use when compiling
to native code, like --main?  If this was the case, we could silently
omit -C if compiler args have been specified and one of them started
with --main=.

The only other solution I'd see would be a compiler specific magic
property.  Something like build.compiler.gcj.native and we'd drop -C
if that property was set to true.

Stefan

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



cvs commit: ant/xdocs faq.xml

2004-03-15 Thread bodewig
bodewig 2004/03/15 03:23:48

  Modified:.WHATSNEW
   docs faq.html
   src/main/org/apache/tools/ant/taskdefs Java.java
   xdocsfaq.xml
  Log:
  Don't swallow the stack trace if a Java program throws an exception.
  
  Revision  ChangesPath
  1.572 +3 -0  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.571
  retrieving revision 1.572
  diff -u -r1.571 -r1.572
  --- WHATSNEW  12 Mar 2004 09:00:30 -  1.571
  +++ WHATSNEW  15 Mar 2004 11:23:47 -  1.572
  @@ -84,6 +84,9 @@
   
   * NPE when running commons listener. Bugzilla Report 27373.
   
  +* java swallowed the stack trace of exceptions thrown by the
  +  executed program if run in the same VM.
  +
   Other changes:
   --
   
  
  
  
  1.95  +18 -0 ant/docs/faq.html
  
  Index: faq.html
  ===
  RCS file: /home/cvs/ant/docs/faq.html,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- faq.html  29 Feb 2004 08:43:54 -  1.94
  +++ faq.html  15 Mar 2004 11:23:48 -  1.95
  @@ -342,6 +342,12 @@
   - they worked in Ant 1.5?
 
 /a/li
  +lia href=#java.exception.stacktrace
  +  
  +The program I run via lt;javagt; throws an exception but I
  +can't seem to get the full stack trace.
  +  
  +  /a/li
   /ul
   
 h3 class=sectionAnswers/h3
  @@ -1593,6 +1599,18 @@
   p
 This approach should work for ant1.5 and ant1.6.
   /p
  +p class=faq
  +  a name=java.exception.stacktrace/a
  +  
  +The program I run via lt;javagt; throws an exception but I
  +can't seem to get the full stack trace.
  +  
  +/p
  +  pThis is a know bug that has been fixed after the 
release of
  +Ant 1.6.1./p
  +pAs a workaround, run your lt;javagt; task with
  +codefork=true/code and Ant will display the full
  +trace./p
   /div
 /div
   
  
  
  
  1.87  +14 -2 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- Java.java 9 Mar 2004 16:48:05 -   1.86
  +++ Java.java 15 Mar 2004 11:23:48 -  1.87
  @@ -19,6 +19,8 @@
   
   import java.io.File;
   import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.io.StringWriter;
   import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.ExitException;
  @@ -169,14 +171,14 @@
   if (failOnError) {
   throw e;
   } else {
  -log(e.getMessage(), Project.MSG_ERR);
  +log(e);
   return 0;
   }
   } catch (Throwable t) {
   if (failOnError) {
   throw new BuildException(t);
   } else {
  -log(t.getMessage(), Project.MSG_ERR);
  +log(t);
   return 0;
   }
   }
  @@ -792,4 +794,14 @@
   return new ExecuteWatchdog(timeout.longValue());
   }
   
  +/**
  + * @since 1.6.2
  + */
  +private void log(Throwable t) {
  +StringWriter sw = new StringWriter();
  +PrintWriter w = new PrintWriter(sw);
  +t.printStackTrace(w);
  +w.close();
  +log(sw.toString(), Project.MSG_ERR);
  +}
   }
  
  
  
  1.51  +15 -0 ant/xdocs/faq.xml
  
  Index: faq.xml
  ===
  RCS file: /home/cvs/ant/xdocs/faq.xml,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- faq.xml   19 Feb 2004 12:45:03 -  1.50
  +++ faq.xml   15 Mar 2004 11:23:48 -  1.51
  @@ -1409,6 +1409,21 @@
   /p
 /answer
   /faq
  +
  +faq id=java.exception.stacktrace
  +  question
  +The program I run via lt;javagt; throws an exception but I
  +can't seem to get the full stack trace.
  +  /question
  +  answer
  +pThis is a know bug that has been fixed after the release of
  +Ant 1.6.1./p
  +
  +pAs a workaround, run your lt;javagt; task with
  +codefork=true/code and Ant will display the full
  +trace./p
  +  /answer
  +/faq
 /faqsection
   
   /document
  
  
  

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

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

2004-03-15 Thread bodewig
bodewig 2004/03/15 03:27:04

  Modified:src/main/org/apache/tools/ant/taskdefs Java.java
  Log:
  White-space changes only
  
  Revision  ChangesPath
  1.88  +65 -65ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- Java.java 15 Mar 2004 11:23:48 -  1.87
  +++ Java.java 15 Mar 2004 11:27:04 -  1.88
  @@ -681,41 +681,41 @@
*/
   private int fork(String[] command) throws BuildException {
   
  -Execute exe
  -= new Execute(redirector.createHandler(), createWatchdog());
  -exe.setAntRun(getProject());
  -
  -if (dir == null) {
  -dir = getProject().getBaseDir();
  -} else if (!dir.exists() || !dir.isDirectory()) {
  -throw new BuildException(dir.getAbsolutePath()
  - +  is not a valid directory,
  - getLocation());
  -}
  -
  -exe.setWorkingDirectory(dir);
  -
  -String[] environment = env.getVariables();
  -if (environment != null) {
  -for (int i = 0; i  environment.length; i++) {
  -log(Setting environment variable:  + environment[i],
  -Project.MSG_VERBOSE);
  -}
  -}
  -exe.setNewenvironment(newEnvironment);
  -exe.setEnvironment(environment);
  -
  -exe.setCommandline(command);
  -try {
  -int rc = exe.execute();
  -redirector.complete();
  -if (exe.killedProcess()) {
  -throw new BuildException(Timeout: killed the 
sub-process);
  -}
  -return rc;
  -} catch (IOException e) {
  -throw new BuildException(e, getLocation());
  -}
  +Execute exe
  += new Execute(redirector.createHandler(), createWatchdog());
  +exe.setAntRun(getProject());
  +
  +if (dir == null) {
  +dir = getProject().getBaseDir();
  +} else if (!dir.exists() || !dir.isDirectory()) {
  +throw new BuildException(dir.getAbsolutePath()
  + +  is not a valid directory,
  + getLocation());
  +}
  +
  +exe.setWorkingDirectory(dir);
  +
  +String[] environment = env.getVariables();
  +if (environment != null) {
  +for (int i = 0; i  environment.length; i++) {
  +log(Setting environment variable:  + environment[i],
  +Project.MSG_VERBOSE);
  +}
  +}
  +exe.setNewenvironment(newEnvironment);
  +exe.setEnvironment(environment);
  +
  +exe.setCommandline(command);
  +try {
  +int rc = exe.execute();
  +redirector.complete();
  +if (exe.killedProcess()) {
  +throw new BuildException(Timeout: killed the sub-process);
  +}
  +return rc;
  +} catch (IOException e) {
  +throw new BuildException(e, getLocation());
  +}
   }
   
   /**
  @@ -723,36 +723,36 @@
*/
   private void spawn(String[] command) throws BuildException {
   
  -Execute exe
  -= new Execute();
  -exe.setAntRun(getProject());
  -
  -if (dir == null) {
  -dir = getProject().getBaseDir();
  -} else if (!dir.exists() || !dir.isDirectory()) {
  -throw new BuildException(dir.getAbsolutePath()
  - +  is not a valid directory,
  - getLocation());
  -}
  -
  -exe.setWorkingDirectory(dir);
  -
  -String[] environment = env.getVariables();
  -if (environment != null) {
  -for (int i = 0; i  environment.length; i++) {
  -log(Setting environment variable:  + environment[i],
  -Project.MSG_VERBOSE);
  -}
  -}
  -exe.setNewenvironment(newEnvironment);
  -exe.setEnvironment(environment);
  -
  -exe.setCommandline(command);
  -try {
  -exe.spawn();
  -} catch (IOException e) {
  -throw new BuildException(e, getLocation());
  -}
  +Execute exe
  += new Execute();
  +exe.setAntRun(getProject());
  +
  +if (dir == null) {
  +dir = getProject().getBaseDir();
  +} 

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

2004-03-15 Thread bodewig
bodewig 2004/03/15 03:29:13

  Modified:.Tag: ANT_16_BRANCH WHATSNEW
   src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Java.java
  Log:
  merge
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.503.2.60 +3 -0  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.59
  retrieving revision 1.503.2.60
  diff -u -r1.503.2.59 -r1.503.2.60
  --- WHATSNEW  12 Mar 2004 09:01:48 -  1.503.2.59
  +++ WHATSNEW  15 Mar 2004 11:29:13 -  1.503.2.60
  @@ -35,6 +35,9 @@
   
   * NPE when running commons listener. Bugzilla Report 27373.
   
  +* java swallowed the stack trace of exceptions thrown by the
  +  executed program if run in the same VM.
  +
   Other changes:
   --
   
  
  
  
  No   revision
  No   revision
  1.77.2.8  +74 -62ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.77.2.7
  retrieving revision 1.77.2.8
  diff -u -r1.77.2.7 -r1.77.2.8
  --- Java.java 9 Mar 2004 17:01:33 -   1.77.2.7
  +++ Java.java 15 Mar 2004 11:29:13 -  1.77.2.8
  @@ -19,6 +19,8 @@
   
   import java.io.File;
   import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.io.StringWriter;
   import java.util.Vector;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.ExitException;
  @@ -169,14 +171,14 @@
   if (failOnError) {
   throw e;
   } else {
  -log(e.getMessage(), Project.MSG_ERR);
  +log(e);
   return 0;
   }
   } catch (Throwable t) {
   if (failOnError) {
   throw new BuildException(t);
   } else {
  -log(t.getMessage(), Project.MSG_ERR);
  +log(t);
   return 0;
   }
   }
  @@ -667,41 +669,41 @@
*/
   private int fork(String[] command) throws BuildException {
   
  -Execute exe
  -= new Execute(redirector.createHandler(), createWatchdog());
  -exe.setAntRun(getProject());
  -
  -if (dir == null) {
  -dir = getProject().getBaseDir();
  -} else if (!dir.exists() || !dir.isDirectory()) {
  -throw new BuildException(dir.getAbsolutePath()
  - +  is not a valid directory,
  - getLocation());
  -}
  -
  -exe.setWorkingDirectory(dir);
  -
  -String[] environment = env.getVariables();
  -if (environment != null) {
  -for (int i = 0; i  environment.length; i++) {
  -log(Setting environment variable:  + environment[i],
  -Project.MSG_VERBOSE);
  -}
  +Execute exe
  += new Execute(redirector.createHandler(), createWatchdog());
  +exe.setAntRun(getProject());
  +
  +if (dir == null) {
  +dir = getProject().getBaseDir();
  +} else if (!dir.exists() || !dir.isDirectory()) {
  +throw new BuildException(dir.getAbsolutePath()
  + +  is not a valid directory,
  + getLocation());
  +}
  +
  +exe.setWorkingDirectory(dir);
  +
  +String[] environment = env.getVariables();
  +if (environment != null) {
  +for (int i = 0; i  environment.length; i++) {
  +log(Setting environment variable:  + environment[i],
  +Project.MSG_VERBOSE);
   }
  -exe.setNewenvironment(newEnvironment);
  -exe.setEnvironment(environment);
  +}
  +exe.setNewenvironment(newEnvironment);
  +exe.setEnvironment(environment);
   
  -exe.setCommandline(command);
  -try {
  -int rc = exe.execute();
  -redirector.complete();
  -if (exe.killedProcess()) {
  -throw new BuildException(Timeout: killed the 
sub-process);
  -}
  -return rc;
  -} catch (IOException e) {
  -throw new BuildException(e, getLocation());
  +exe.setCommandline(command);
  +try {
  +int rc = exe.execute();
  +redirector.complete();
  +if (exe.killedProcess()) {
  +throw new BuildException(Timeout: killed the sub-process);
   }
  +return rc;
  

Re: javac and compilerargs

2004-03-15 Thread Arnaud Vandyck
Hi Stefan,

Stefan Bodewig [EMAIL PROTECTED] writes:

 On Mon, 15 Mar 2004, Arnaud Vandyck [EMAIL PROTECTED] wrote:

 I'd like to make some changes in the
 ant-1.6.1/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
 task to change the behavior. I'd like ant NOT to pass the -C
 argument if a nested compilerarg tag exists.

 This is hard to do in a backwards compatible way.

 Honestly, I'm not sure how big our gcj user base is and how many of
 them use compilerarg to pass additional arguments, the answer could
 very well be zero.

This is not a problem. I'll try to implement it myself and if the patch
is not good for you, maybe we'll apply it only in Debian. Maybe we'll
need it in a near future... we are not sure yet.

 But if it is bigger than that, such a change would break their builds.

Isn't possible in the Gcj class to know if there is a nested
compilerarg tag and look at the arguments of this tag?

 Is there a command line argument that you'd always use when compiling
 to native code, like --main?  If this was the case, we could silently
 omit -C if compiler args have been specified and one of them started
 with --main=.

--main and maybe '-o', I don't know, but I'll ask on gcj mailing list.

 The only other solution I'd see would be a compiler specific magic
 property.  Something like build.compiler.gcj.native and we'd drop -C
 if that property was set to true.

No problem for me if everything is well documented ;-) Seems to be a
good solution. Can you point me were I have to patch such a possibility
or will you do that? (I'm not in a hurry at all, it's a possible future
project! ;-) )

Many thanks for your time and help,

-- 
~/.signature not found

Packages should build-depend on what they should build-depend.
-- Santiago Vila on debian-devel

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



RE: javac and compilerargs

2004-03-15 Thread Jan . Materne
  The only other solution I'd see would be a compiler specific magic
  property.  Something like build.compiler.gcj.native and we'd drop -C
  if that property was set to true.
 
 No problem for me if everything is well documented ;-) Seems to be a
 good solution. Can you point me were I have to patch such a 
 possibility
 or will you do that? (I'm not in a hurry at all, it's a 
 possible future
 project! ;-) )

Documentation is done by the task (see manual for javac).
E.g. the jikes adapter uses a magic property.

src/main/.../taskdefs/compiler/Jikes:

044: public boolean execute() throws BuildException {
078: // if the user has set JIKESPATH we should add the contents as
well
089:String jikesPath = System.getProperty(jikes.class.path);
080:if (jikesPath != null) {
081:classpath.append(new Path(project, jikesPath));
082:}



Jan


Re: javac and compilerargs

2004-03-15 Thread Stefan Bodewig
On Mon, 15 Mar 2004, Arnaud Vandyck [EMAIL PROTECTED] wrote:
 Stefan Bodewig [EMAIL PROTECTED] writes:

 Honestly, I'm not sure how big our gcj user base is and how many of
 them use compilerarg to pass additional arguments, the answer
 could very well be zero.
 
 This is not a problem. I'll try to implement it myself and if the
 patch is not good for you, maybe we'll apply it only in
 Debian.

zero was my answer to the size of the user base I was talking about,
not the chance of getting your patch into Ant 8-)

 Is there a command line argument that you'd always use when
 compiling to native code, like --main?  If this was the case, we
 could silently omit -C if compiler args have been specified and one
 of them started with --main=.
 
 --main and maybe '-o', I don't know, but I'll ask on gcj mailing
 list.

If you must use --main to compile native stuff and there is no way
that -C can be used together with --main, that would be a really good
indicator for Ant, wouldn't it?  The question only is whether the
assumption holds true.

The gcj list will undoubtly know.

 The only other solution I'd see would be a compiler specific magic
 property.  Something like build.compiler.gcj.native and we'd drop
 -C if that property was set to true.
 
 No problem for me if everything is well documented ;-)

I'd say the solution is second best only.  Especially since you can't
reset a property once it is set.  This would mean that you can't have
a javac tasl that uses -C and one that doesn't in the same build
process.

 Can you point me were I have to patch such a possibility

Look around the src/main/org/apache/tools/ant/taskdefs/compiler
directory.  Jikes has some jikes specific magic properties for
example.

 or will you do that?

If I'd put it towards the end of my TODO list it would likely never
get implemented ;-)

Stefan

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



Re: javac and compilerargs

2004-03-15 Thread Arnaud Vandyck
[EMAIL PROTECTED] writes:

[...]

 089: String jikesPath = System.getProperty(jikes.class.path);

Huh! I thought it would be more complex! ;-)

Thanks ;-) (but I think it'll be plan B ;-))

-- 
~/.signature not found

 asuffield a workstation is anything you can stick on somebodies desk
 and con them into using
-- in #debian-devel

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



Re: javac and compilerargs

2004-03-15 Thread Arnaud Vandyck
Stefan Bodewig [EMAIL PROTECTED] writes:

 On Mon, 15 Mar 2004, Arnaud Vandyck [EMAIL PROTECTED] wrote:
 Stefan Bodewig [EMAIL PROTECTED] writes:

 Honestly, I'm not sure how big our gcj user base is and how many of
 them use compilerarg to pass additional arguments, the answer
 could very well be zero.
 
 This is not a problem. I'll try to implement it myself and if the
 patch is not good for you, maybe we'll apply it only in
 Debian.

 zero was my answer to the size of the user base I was talking about,
 not the chance of getting your patch into Ant 8-)

:-p

snip/

Is it possible to know the value of compilerarg line=.../ when I am
in the gcj class? If yes, how?

... reading the sources is a good thing to answer your own questions!
;-) (well I found your code very clear!)

Is it OK if in the Gcj class, I do something like:

String[] argsToTest = getJavac().getCurrentCompilerArgs();

Then I think I got to test if every String begins with -o or --main?

 If I'd put it towards the end of my TODO list it would likely never
 get implemented ;-)

I hope I'll have the time and knowledge to do it ;-)

Cheers,

-- 
~/.signature not found

 asuffield a workstation is anything you can stick on somebodies desk
 and con them into using
-- in #debian-devel

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



Re: javac and compilerargs

2004-03-15 Thread Stefan Bodewig
On Mon, 15 Mar 2004, Arnaud Vandyck [EMAIL PROTECTED] wrote:

 Is it OK if in the Gcj class, I do something like:
 
 String[] argsToTest = getJavac().getCurrentCompilerArgs();

Absolutely.  The command line has been tokenized by Ant already, that
is 

compilerarg line=--main=foo -o bar/

will become three array elements --main=foo, -o and bar.

Stefan

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



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

2004-03-15 Thread peterreilly
peterreilly2004/03/15 06:36:21

  Modified:.WHATSNEW
   docs/manual/CoreTasks tar.html
   src/main/org/apache/tools/ant/taskdefs Tar.java
  Log:
  Allow setting of uid and gid in a tarfileset - in addition or in place
  of user and group.
  PR: 19120
  Reported by: Dale Sherwood
  
  Revision  ChangesPath
  1.573 +2 -0  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.572
  retrieving revision 1.573
  diff -u -r1.572 -r1.573
  --- WHATSNEW  15 Mar 2004 11:23:47 -  1.572
  +++ WHATSNEW  15 Mar 2004 14:36:20 -  1.573
  @@ -101,6 +101,8 @@
   
   * spelling fixes, occurred. Bugzilla Report 27282.
   
  +* add uid and gid to tarfileset. Bugzilla Report 19120.
  +
   Changes from Ant 1.6.0 to Ant 1.6.1
   =
   
  
  
  
  1.21  +17 -4 ant/docs/manual/CoreTasks/tar.html
  
  Index: tar.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/tar.html,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- tar.html  9 Feb 2004 21:50:05 -   1.20
  +++ tar.html  15 Mar 2004 14:36:21 -  1.21
  @@ -135,14 +135,27 @@
 /tr
 tr
   td valign=topusername/td
  -td valign=topThe username for the tar entry. This is not the same as 
the UID, which is
  - not currently set by the tar task./td
  +td valign=topThe username for the tar entry. This is not the same as 
the UID.
  + /td
   td align=center valign=topNo/td
 /tr
 tr
   td valign=topgroup/td
  -td valign=topThe groupname for the tar entry. This is not the same 
as the GID, which is
  - not currently set by the tar task./td
  +td valign=topThe groupname for the tar entry. This is not the same 
as the GID.
  + /td
  +td align=center valign=topNo/td
  +  /tr
  +  tr
  +td valign=topuid/td
  +td valign=topThe user identifier (UID) for the tar entry. This is an 
integer value
  +  and is not the same as the username. emsince Ant 1.6.2/em.
  + /td
  +td align=center valign=topNo/td
  +  /tr
  +  tr
  +td valign=topgid/td
  +td valign=topThe group identifier (GID) for the tar entry. emsince 
Ant 1.6.2/em.
  + /td
   td align=center valign=topNo/td
 /tr
 tr
  
  
  
  1.52  +38 -4 ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Tar.java  12 Mar 2004 09:09:03 -  1.51
  +++ Tar.java  15 Mar 2004 14:36:21 -  1.52
  @@ -378,6 +378,8 @@
   }
   te.setUserName(tarFileSet.getUserName());
   te.setGroupName(tarFileSet.getGroup());
  +te.setUserId(tarFileSet.getUid());
  +te.setGroupId(tarFileSet.getGid());
   
   tOut.putNextEntry(te);
   
  @@ -436,6 +438,8 @@
   
   private String userName = ;
   private String groupName = ;
  +private intuid;
  +private intgid;
   private String prefix = ;
   private String fullpath = ;
   private boolean preserveLeadingSlashes = false;
  @@ -519,8 +523,7 @@
   
   /**
* The username for the tar entry
  - * This is not the same as the UID, which is
  - * not currently set by the task.
  + * This is not the same as the UID.
* @param userName the user name for the tar entry.
*/
   public void setUserName(String userName) {
  @@ -535,9 +538,24 @@
   }
   
   /**
  + * The uid for the tar entry
  + * This is not the same as the User name.
  + * @param userName the user name for the tar entry.
  + */
  +public void setUid(int uid) {
  +this.uid = uid;
  +}
  +
  +/**
  + * @return the uid for the tar entry
  + */
  +public int getUid() {
  +return uid;
  +}
  +
  +/**
* The groupname for the tar entry; optional, default=
  - * This is not the same as the GID, which is
  - * not currently set by the task.
  + * This is not the same as the GID.
* @param groupName the group name string.
*/
   public void setGroup(String groupName) {
  @@ -549,6 +567,22 @@
*/
   public String getGroup() {
   return groupName;
  +}
  +
  +/**
  + * The GID for the tar entry; optional, default=0
  

DO NOT REPLY [Bug 19120] - Tar/TarFileSet/TarEntry uid and gid

2004-03-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=19120.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=19120

Tar/TarFileSet/TarEntry uid and gid

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2004-03-15 15:41 ---
This is now in cvs and will be part of ant 1.6.2.
Thanks for the report.

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



DO NOT REPLY [Bug 19120] - Tar/TarFileSet/TarEntry uid and gid

2004-03-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=19120.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=19120

Tar/TarFileSet/TarEntry uid and gid

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Target Milestone|--- |1.6.2

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



Re: encoding stuff

2004-03-15 Thread Dale Anson
Hi Matt,
Just this past week I ran into a problem using slightly different jdk 
versions on Solaris. One had the default character encoding as 
ISO-8859-1, the other had ISO-656-1. That was enough to break things for 
me. My solution was to use a Writer/OutputStream that allowed me to set 
the encoding type. It seems to me that jdk 1.2 used 8859-1 by default 
and it wasn't possible to change the encoding. With jdk 1.4, there are a 
number of the java.net and java.io classes that let you specify the 
encoding.

Hope this helps!
Dale
Matt Benson wrote:
Ack!  I am in the final stages of I/O redirection.  In
fact, I was about to commit my changes when I
cross-tested my last test case--transcoding--and found
that it fails on Solaris with Sun JDK 1.4.2, but
passes with Sun JDK 1.2.2.  Does anyone have any
helpful information on this phenomenon?  Input
encoding seems to be okay, but whenever I try to write
output with a particular encoding, the results are not
what I expect.  Often the resulting files are the
wrong size, but sometimes they are the right size with
the wrong content as well.  Obviously since my code is
nowhere accessible I'm not looking for specific help
(yet)... just if anyone knows of any common pitfalls
I'd love to hear about them.
Thanks,
Matt
__
Do you Yahoo!?
Yahoo! Search - Find what youre looking for faster
http://search.yahoo.com
-
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: encoding stuff

2004-03-15 Thread Matt Benson
Thanks Dale,

I am going to keep fighting this thing this week,
maybe I'll get somewhere.

-Matt

--- Dale Anson [EMAIL PROTECTED] wrote:
 Hi Matt,
 
 Just this past week I ran into a problem using
 slightly different jdk 
 versions on Solaris. One had the default character
 encoding as 
 ISO-8859-1, the other had ISO-656-1. That was enough
 to break things for 
 me. My solution was to use a Writer/OutputStream
 that allowed me to set 
 the encoding type. It seems to me that jdk 1.2 used
 8859-1 by default 
 and it wasn't possible to change the encoding. With
 jdk 1.4, there are a 
 number of the java.net and java.io classes that let
 you specify the 
 encoding.
 
 Hope this helps!
 
 Dale
 
 
 Matt Benson wrote:
 
  Ack!  I am in the final stages of I/O redirection.
  In
  fact, I was about to commit my changes when I
  cross-tested my last test case--transcoding--and
 found
  that it fails on Solaris with Sun JDK 1.4.2, but
  passes with Sun JDK 1.2.2.  Does anyone have any
  helpful information on this phenomenon?  Input
  encoding seems to be okay, but whenever I try to
 write
  output with a particular encoding, the results are
 not
  what I expect.  Often the resulting files are the
  wrong size, but sometimes they are the right size
 with
  the wrong content as well.  Obviously since my
 code is
  nowhere accessible I'm not looking for specific
 help
  (yet)... just if anyone knows of any common
 pitfalls
  I'd love to hear about them.
  
  Thanks,
  Matt
  
  __
  Do you Yahoo!?
  Yahoo! Search - Find what you’re looking for
 faster
  http://search.yahoo.com
  
 

-
  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]
 


__
Do you Yahoo!?
Yahoo! Mail - More reliable, more storage, less spam
http://mail.yahoo.com

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



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

2004-03-15 Thread peterreilly
peterreilly2004/03/15 09:26:34

  Modified:src/main/org/apache/tools/ant/util ContainerMapper.java
  Log:
  stylecheck
  
  Revision  ChangesPath
  1.2   +1 -2  
ant/src/main/org/apache/tools/ant/util/ContainerMapper.java
  
  Index: ContainerMapper.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/util/ContainerMapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerMapper.java  11 Mar 2004 19:25:48 -  1.1
  +++ ContainerMapper.java  15 Mar 2004 17:26:34 -  1.2
  @@ -21,7 +21,6 @@
   import java.util.Iterator;
   import java.util.List;
   import org.apache.tools.ant.types.Mapper;
  -import org.apache.tools.ant.util.FileNameMapper;
   
   /**
* A filenamemapper that contains other filename mappers.
  @@ -50,7 +49,7 @@
   public void addConfiguredMapper(Mapper mapper) {
   mappers.add(mapper.getImplementation());
   }
  -
  +
   /**
* Set the chained attribute.
*
  
  
  

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



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

2004-03-15 Thread peterreilly
peterreilly2004/03/15 09:33:09

  Modified:src/main/org/apache/tools/ant AntTypeDefinition.java
DirectoryScanner.java IntrospectionHelper.java
ProjectHelper.java Target.java
  Log:
  stylecheck
  
  Revision  ChangesPath
  1.12  +4 -8  ant/src/main/org/apache/tools/ant/AntTypeDefinition.java
  
  Index: AntTypeDefinition.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntTypeDefinition.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AntTypeDefinition.java9 Mar 2004 16:47:59 -   1.11
  +++ AntTypeDefinition.java15 Mar 2004 17:33:09 -  1.12
  @@ -352,17 +352,13 @@
   // is the same
   ClassLoader oldLoader = other.getClassLoader();
   ClassLoader newLoader = this.getClassLoader();
  -if (oldLoader != null
  - newLoader != null
  +return
  +newLoader != null
  + oldLoader != null
oldLoader instanceof AntClassLoader
newLoader instanceof AntClassLoader
((AntClassLoader) oldLoader).getClasspath()
  -.equals(((AntClassLoader) newLoader).getClasspath())
  -) {
  -return true;
  -} else {
  -return false;
  -}
  +.equals(((AntClassLoader) newLoader).getClasspath());
   }
   
   private String extractClassname(Class c) {
  
  
  
  1.71  +8 -8  ant/src/main/org/apache/tools/ant/DirectoryScanner.java
  
  Index: DirectoryScanner.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- DirectoryScanner.java 9 Mar 2004 16:47:59 -   1.70
  +++ DirectoryScanner.java 15 Mar 2004 17:33:09 -  1.71
  @@ -241,7 +241,7 @@
   private boolean followSymlinks = true;
   
   /** Helper. */
  -private static final FileUtils fileUtils = FileUtils.newFileUtils();
  +private static final FileUtils FILE_UTILS = FileUtils.newFileUtils();
   
   /** Whether or not everything tested so far has been included. */
   protected boolean everythingIncluded = true;
  @@ -684,14 +684,14 @@
   // we need to double check.
   try {
   File canonFile = myfile.getCanonicalFile();
  -String path = fileUtils.removeLeadingPath(canonBase,
  +String path = FILE_UTILS.removeLeadingPath(canonBase,
 canonFile);
   if (!path.equals(currentelement) || ON_VMS) {
   myfile = findFile(basedir, currentelement);
   if (myfile != null) {
   currentelement =
  -fileUtils.removeLeadingPath(basedir,
  -myfile);
  +FILE_UTILS.removeLeadingPath(basedir,
  + myfile);
   }
   }
   } catch (IOException ex) {
  @@ -704,7 +704,7 @@
   if (f.exists()) {
   // adapt currentelement to the case we've
   // actually found
  -currentelement = fileUtils.removeLeadingPath(basedir,
  +currentelement = 
FILE_UTILS.removeLeadingPath(basedir,
f);
   myfile = f;
   }
  @@ -833,7 +833,7 @@
   Vector noLinks = new Vector();
   for (int i = 0; i  newfiles.length; i++) {
   try {
  -if (fileUtils.isSymbolicLink(dir, newfiles[i])) {
  +if (FILE_UTILS.isSymbolicLink(dir, newfiles[i])) {
   String name = vpath + newfiles[i];
   File   file = new File(dir, newfiles[i]);
   if (file.isDirectory()) {
  @@ -1201,7 +1201,7 @@
* @since Ant 1.5.2
*/
   public Resource getResource(String name) {
  -File f = fileUtils.resolveFile(basedir, name);
  +File f = FILE_UTILS.resolveFile(basedir, name);
   return new Resource(name, f.exists(), f.lastModified(),
   f.isDirectory());
   }
  @@ -1346,7 +1346,7 @@
   if (pathElements.size()  0) {
   String current = (String) pathElements.remove(0);
   try {
  -if 

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

2004-03-15 Thread peterreilly
peterreilly2004/03/15 09:33:24

  Modified:src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
AntTypeDefinition.java DirectoryScanner.java
IntrospectionHelper.java ProjectHelper.java
Target.java
  Log:
  stylecheck
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.7.2.5   +4 -8  ant/src/main/org/apache/tools/ant/AntTypeDefinition.java
  
  Index: AntTypeDefinition.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntTypeDefinition.java,v
  retrieving revision 1.7.2.4
  retrieving revision 1.7.2.5
  diff -u -r1.7.2.4 -r1.7.2.5
  --- AntTypeDefinition.java9 Mar 2004 17:01:29 -   1.7.2.4
  +++ AntTypeDefinition.java15 Mar 2004 17:33:24 -  1.7.2.5
  @@ -352,17 +352,13 @@
   // is the same
   ClassLoader oldLoader = other.getClassLoader();
   ClassLoader newLoader = this.getClassLoader();
  -if (oldLoader != null
  - newLoader != null
  +return
  +newLoader != null
  + oldLoader != null
oldLoader instanceof AntClassLoader
newLoader instanceof AntClassLoader
((AntClassLoader) oldLoader).getClasspath()
  -.equals(((AntClassLoader) newLoader).getClasspath())
  -) {
  -return true;
  -} else {
  -return false;
  -}
  +.equals(((AntClassLoader) newLoader).getClasspath());
   }
   
   private String extractClassname(Class c) {
  
  
  
  1.64.2.7  +8 -8  ant/src/main/org/apache/tools/ant/DirectoryScanner.java
  
  Index: DirectoryScanner.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
  retrieving revision 1.64.2.6
  retrieving revision 1.64.2.7
  diff -u -r1.64.2.6 -r1.64.2.7
  --- DirectoryScanner.java 9 Mar 2004 17:01:29 -   1.64.2.6
  +++ DirectoryScanner.java 15 Mar 2004 17:33:24 -  1.64.2.7
  @@ -241,7 +241,7 @@
   private boolean followSymlinks = true;
   
   /** Helper. */
  -private static final FileUtils fileUtils = FileUtils.newFileUtils();
  +private static final FileUtils FILE_UTILS = FileUtils.newFileUtils();
   
   /** Whether or not everything tested so far has been included. */
   protected boolean everythingIncluded = true;
  @@ -684,14 +684,14 @@
   // we need to double check.
   try {
   File canonFile = myfile.getCanonicalFile();
  -String path = fileUtils.removeLeadingPath(canonBase,
  +String path = FILE_UTILS.removeLeadingPath(canonBase,
 canonFile);
   if (!path.equals(currentelement) || ON_VMS) {
   myfile = findFile(basedir, currentelement);
   if (myfile != null) {
   currentelement =
  -fileUtils.removeLeadingPath(basedir,
  -myfile);
  +FILE_UTILS.removeLeadingPath(basedir,
  + myfile);
   }
   }
   } catch (IOException ex) {
  @@ -704,7 +704,7 @@
   if (f.exists()) {
   // adapt currentelement to the case we've
   // actually found
  -currentelement = fileUtils.removeLeadingPath(basedir,
  +currentelement = 
FILE_UTILS.removeLeadingPath(basedir,
f);
   myfile = f;
   }
  @@ -833,7 +833,7 @@
   Vector noLinks = new Vector();
   for (int i = 0; i  newfiles.length; i++) {
   try {
  -if (fileUtils.isSymbolicLink(dir, newfiles[i])) {
  +if (FILE_UTILS.isSymbolicLink(dir, newfiles[i])) {
   String name = vpath + newfiles[i];
   File   file = new File(dir, newfiles[i]);
   if (file.isDirectory()) {
  @@ -1201,7 +1201,7 @@
* @since Ant 1.5.2
*/
   public Resource getResource(String name) {
  -File f = fileUtils.resolveFile(basedir, name);
  +File f = FILE_UTILS.resolveFile(basedir, name);
   return new Resource(name, f.exists(), f.lastModified(),
   f.isDirectory());
   }
  @@ -1346,7 +1346,7 @@
  

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

2004-03-15 Thread peterreilly
peterreilly2004/03/15 10:02:35

  Modified:src/main/org/apache/tools/ant/launch LaunchException.java
Launcher.java
   src/main/org/apache/tools/ant/taskdefs Definer.java
  Log:
  checkcheck
  
  Revision  ChangesPath
  1.7   +0 -3  
ant/src/main/org/apache/tools/ant/launch/LaunchException.java
  
  Index: LaunchException.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/launch/LaunchException.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LaunchException.java  9 Mar 2004 16:48:03 -   1.6
  +++ LaunchException.java  15 Mar 2004 18:02:35 -  1.7
  @@ -16,9 +16,6 @@
*/
   package org.apache.tools.ant.launch;
   
  -import java.io.PrintStream;
  -import java.io.PrintWriter;
  -
   /**
* Signals an error condition during launching
*
  
  
  
  1.17  +3 -3  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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Launcher.java 9 Mar 2004 16:48:03 -   1.16
  +++ Launcher.java 15 Mar 2004 18:02:35 -  1.17
  @@ -130,12 +130,12 @@
   libPathURLs.add(dirURLs[j]);
   }
   }
  -
  +
   libPathURLs.add(element.toURL());
   }
   }
   
  -URL[] libJars = (URL[])libPathURLs.toArray(new URL[0]);
  +URL[] libJars = (URL[]) libPathURLs.toArray(new URL[0]);
   
   // Now try and find JAVA_HOME
   File toolsJar = Locator.getToolsJar();
  @@ -147,7 +147,7 @@
   if (antLibDirProperty != null) {
   antLibDir = new File(antLibDirProperty);
   }
  -if ((antLibDir == null) || ! antLibDir.exists()) {
  +if ((antLibDir == null) || !antLibDir.exists()) {
   antLibDir = jarDir;
   System.setProperty(ANTLIBDIR_PROPERTY, 
antLibDir.getAbsolutePath());
   }
  
  
  
  1.52  +0 -1  ant/src/main/org/apache/tools/ant/taskdefs/Definer.java
  
  Index: Definer.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Definer.java  9 Mar 2004 16:48:04 -   1.51
  +++ Definer.java  15 Mar 2004 18:02:35 -  1.52
  @@ -29,7 +29,6 @@
   import org.apache.tools.ant.AntTypeDefinition;
   import org.apache.tools.ant.ComponentHelper;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Location;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.ProjectHelper;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  
  
  

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



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

2004-03-15 Thread peterreilly
peterreilly2004/03/15 10:03:56

  Modified:src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
LaunchException.java Launcher.java
   src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Definer.java
  Log:
  checkcheck
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.6   +0 -3  
ant/src/main/org/apache/tools/ant/launch/LaunchException.java
  
  Index: LaunchException.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/launch/LaunchException.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- LaunchException.java  9 Mar 2004 17:01:32 -   1.1.2.5
  +++ LaunchException.java  15 Mar 2004 18:03:56 -  1.1.2.6
  @@ -16,9 +16,6 @@
*/
   package org.apache.tools.ant.launch;
   
  -import java.io.PrintStream;
  -import java.io.PrintWriter;
  -
   /**
* Signals an error condition during launching
*
  
  
  
  1.5.2.12  +3 -3  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.5.2.11
  retrieving revision 1.5.2.12
  diff -u -r1.5.2.11 -r1.5.2.12
  --- Launcher.java 9 Mar 2004 17:01:32 -   1.5.2.11
  +++ Launcher.java 15 Mar 2004 18:03:56 -  1.5.2.12
  @@ -130,12 +130,12 @@
   libPathURLs.add(dirURLs[j]);
   }
   }
  -
  +
   libPathURLs.add(element.toURL());
   }
   }
   
  -URL[] libJars = (URL[])libPathURLs.toArray(new URL[0]);
  +URL[] libJars = (URL[]) libPathURLs.toArray(new URL[0]);
   
   // Now try and find JAVA_HOME
   File toolsJar = Locator.getToolsJar();
  @@ -147,7 +147,7 @@
   if (antLibDirProperty != null) {
   antLibDir = new File(antLibDirProperty);
   }
  -if ((antLibDir == null) || ! antLibDir.exists()) {
  +if ((antLibDir == null) || !antLibDir.exists()) {
   antLibDir = jarDir;
   System.setProperty(ANTLIBDIR_PROPERTY, 
antLibDir.getAbsolutePath());
   }
  
  
  
  No   revision
  No   revision
  1.44.2.7  +0 -1  ant/src/main/org/apache/tools/ant/taskdefs/Definer.java
  
  Index: Definer.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
  retrieving revision 1.44.2.6
  retrieving revision 1.44.2.7
  diff -u -r1.44.2.6 -r1.44.2.7
  --- Definer.java  9 Mar 2004 17:01:33 -   1.44.2.6
  +++ Definer.java  15 Mar 2004 18:03:56 -  1.44.2.7
  @@ -29,7 +29,6 @@
   import org.apache.tools.ant.AntTypeDefinition;
   import org.apache.tools.ant.ComponentHelper;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Location;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.ProjectHelper;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  
  
  

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



DO NOT REPLY [Bug 27641] - Ordering of targets affects processing of macro instance validation.

2004-03-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=27641.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=27641

Ordering of targets affects processing of macro instance validation.





--- Additional Comments From [EMAIL PROTECTED]  2004-03-15 18:41 ---
OK; it apparantly gets weirder. Try this (using bash+cygwin); see if you can
duplicate the problem. 

My environment:
1. Using j2ee.jar (j2sdkee 1.3.1 version) at J2EE_HOME
2. Using ant 1.6.1 at ANT_HOME

cp_ant16=$ANT_HOME\lib\ant.jar;$ANT_HOME\lib\ant-launcher.jar
export cp_00=$cp_ant16
export cp_01=$cp_ant16;$J2EE_HOME\lib\j2ee.jar

1. If I set my CLASSPATH to $cp_00 and run ant with the build script
   it fails as expected.
2. If I set my CLASSPATH to $cp_01 and run ant ... it works!
   Strange.

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



DO NOT REPLY [Bug 27680] New: - Visual Source Safe History Does Not Allow Auto Response

2004-03-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=27680.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=27680

Visual Source Safe History Does Not Allow Auto Response

   Summary: Visual Source Safe History Does Not Allow Auto Response
   Product: Ant
   Version: 1.5.2
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: Major
  Priority: Other
 Component: Optional Tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


When i run the task vsshitory on my project:
vsshistory vsspath=/MyProject recursive=true
fromLabel=MyLabel1.1
toLabel=MyLabel1.0/

I got this output:
build:
[vsshistory] ***: ss History $/MyProject -I- -V~LMyLabel1.1 -VLMyLabel1.0 -R
[vsshistory] File MyFile.java has been destroyed, and cannot be rebuilt.
[vsshistory] Continue anyway?(Y/N)N

BUILD FAILED

The point is that MyFile.java has really been destroyed, and i want History 
to continue, but i can't tell to the task [autoresponse=-I-Y] like the vssget 
task.

I look to MSVSSHISTORY.java to see that the argument -I- is hardcoded to 
the constant FLAG_AUTORESPONSE_DEF (-I-).

This cause vsshistory to exit, and the vsshistory can't be used under this 
circumstance, forcing me back to a batch file.

Please, look at this and let us set the parameter autoresponse.

Regard,
Jerome Simard.

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



Re: javac and compilerargs

2004-03-15 Thread Arnaud Vandyck
Stefan Bodewig [EMAIL PROTECTED] writes:

 On Mon, 15 Mar 2004, Arnaud Vandyck [EMAIL PROTECTED] wrote:

 Is it OK if in the Gcj class, I do something like:
 
 String[] argsToTest = getJavac().getCurrentCompilerArgs();

 Absolutely.  The command line has been tokenized by Ant already, that
 is 

 compilerarg line=--main=foo -o bar/

 will become three array elements --main=foo, -o and bar.

I did it but I'm facing other problems. I can send the patch but the
whole system is not working as I expect to do.

I'll send a mail here when I got some result.

Thanks for your informations, time and cooperation,

Cheers,

-- 
~/.signature not found

There are 3 types of guys -- the ones who hate nerds (all nerds, that
is; girls aren't let off the hook); the ones who are scared off by girls
who are slightly more intelligent than average; and the guys who are
also somewhat more intelligent than average, but are so shy that they
can't put 2 words together when they're within 20 feet of a girl.
-- Vikki Roemer on debian-curiosa

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