diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index add82be07..90cefac82 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -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 @@ -111,7 +111,7 @@ public class ANTLR extends Task { private File workingdir = null; public ANTLR() { - commandline.setVm(JavaEnvUtils.getJdkExecutable("java")); + commandline.setVm(JavaEnvUtils.getJreExecutable("java")); commandline.setClassname("antlr.Tool"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java index aab1a69a9..65bc880bd 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java @@ -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 @@ public class ExecuteWatchdogTest extends TestCase { 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"));