conor 2003/01/27 06:42:41
Modified: src/testcases/org/apache/tools/ant/taskdefs
ExecuteWatchdogTest.java
src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
Log:
Use JRE version of Java
Revision Changes Path
1.13 +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.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
--- ExecuteWatchdogTest.java 27 Jan 2003 13:49:40 -0000 1.12
+++ ExecuteWatchdogTest.java 27 Jan 2003 14:42:40 -0000 1.13
@@ -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"));
1.18 +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.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
--- ANTLR.java 27 Jan 2003 13:49:40 -0000 1.17
+++ ANTLR.java 27 Jan 2003 14:42:41 -0000 1.18
@@ -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 @@
private File workingdir = null;
public ANTLR() {
- commandline.setVm(JavaEnvUtils.getJdkExecutable("java"));
+ commandline.setVm(JavaEnvUtils.getJreExecutable("java"));
commandline.setClassname("antlr.Tool");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
