ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
Date Mon, 27 Jan 2003 13:58:58 GMT
conor       2003/01/27 05:58:58

  Modified:    src/testcases/org/apache/tools/ant/taskdefs Tag:
                        ANT_15_BRANCH ExecuteWatchdogTest.java
               src/main/org/apache/tools/ant/taskdefs/optional Tag:
                        ANT_15_BRANCH ANTLR.java
  Log:
  Merge from HEAD
  
  PR:	15998
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1  +1 -1      jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
  
  Index: ExecuteWatchdogTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -w -u -r1.11 -r1.11.2.1
  --- ExecuteWatchdogTest.java	23 Apr 2002 10:30:12 -0000	1.11
  +++ ExecuteWatchdogTest.java	27 Jan 2003 13:58:57 -0000	1.11.2.1
  @@ -108,7 +108,7 @@
   
       private Process getProcess(int timetorun) throws Exception {
           String[] cmdArray = {
  -            "java", "-classpath", TEST_CLASSPATH,
  +            JavaEnvUtils.getJdkExecutable("java"), "-classpath", TEST_CLASSPATH,
               TimeProcess.class.getName(), String.valueOf(timetorun)
           };
           //System.out.println("Testing with classpath: " + System.getProperty("java.class.path"));
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.6  +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  
  Index: ANTLR.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
  retrieving revision 1.10.2.5
  retrieving revision 1.10.2.6
  diff -u -w -u -r1.10.2.5 -r1.10.2.6
  --- ANTLR.java	26 Jul 2002 21:47:47 -0000	1.10.2.5
  +++ ANTLR.java	27 Jan 2003 13:58:57 -0000	1.10.2.6
  @@ -68,6 +68,7 @@
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.util.JavaEnvUtils;
   
   /**
    *  Invokes the ANTLR Translator generator on a grammar file. 
  @@ -117,7 +118,7 @@
       private File workingdir = null;
   
       public ANTLR() {
  -        commandline.setVm("java");
  +        commandline.setVm(JavaEnvUtils.getJdkExecutable("java"));
           commandline.setClassname("antlr.Tool");
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message