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: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
