Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 95202 invoked from network); 27 Jan 2003 14:47:22 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 27 Jan 2003 14:47:22 -0000 Received: (qmail 5160 invoked by uid 97); 27 Jan 2003 14:48:45 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 5142 invoked by uid 97); 27 Jan 2003 14:48:44 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 5118 invoked by uid 97); 27 Jan 2003 14:48:43 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 27 Jan 2003 14:47:12 -0000 Message-ID: <20030127144712.27778.qmail@icarus.apache.org> From: conor@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N conor 2003/01/27 06:47:12 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 CVS HEAD changes Revision Changes Path No revision No revision 1.11.2.2 +2 -2 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.2.1 retrieving revision 1.11.2.2 diff -u -w -u -r1.11.2.1 -r1.11.2.2 --- ExecuteWatchdogTest.java 27 Jan 2003 13:58:57 -0000 1.11.2.1 +++ ExecuteWatchdogTest.java 27 Jan 2003 14:47:11 -0000 1.11.2.2 @@ -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 @@ -108,7 +108,7 @@ private Process getProcess(int timetorun) throws Exception { String[] cmdArray = { - JavaEnvUtils.getJdkExecutable("java"), "-classpath", TEST_CLASSPATH, + JavaEnvUtils.getJreExecutable("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.7 +2 -2 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.6 retrieving revision 1.10.2.7 diff -u -w -u -r1.10.2.6 -r1.10.2.7 --- ANTLR.java 27 Jan 2003 13:58:57 -0000 1.10.2.6 +++ ANTLR.java 27 Jan 2003 14:47:12 -0000 1.10.2.7 @@ -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 @@ -118,7 +118,7 @@ private File workingdir = null; public ANTLR() { - commandline.setVm(JavaEnvUtils.getJdkExecutable("java")); + commandline.setVm(JavaEnvUtils.getJreExecutable("java")); commandline.setClassname("antlr.Tool"); } -- To unsubscribe, e-mail: For additional commands, e-mail: