conor 2003/02/18 04:50:14
Modified: src/main/org/apache/tools/ant/taskdefs/optional/javacc Tag:
ANT_15_BRANCH JavaCC.java
src/main/org/apache/tools/ant/taskdefs/optional/metamata
Tag: ANT_15_BRANCH AbstractMetamataTask.java
MParse.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.16.2.3 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -w -u -r1.16.2.2 -r1.16.2.3
--- JavaCC.java 10 Feb 2003 14:25:11 -0000 1.16.2.2
+++ JavaCC.java 18 Feb 2003 12:50:11 -0000 1.16.2.3
@@ -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
@@ -62,6 +62,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;
import java.io.File;
@@ -273,7 +274,7 @@
}
public JavaCC() {
- cmdl.setVm("java");
+ cmdl.setVm(JavaEnvUtils.getJreExecutable("java"));
cmdl.setClassname("COM.sun.labs.javacc.Main");
}
No revision
No revision
1.7.2.3 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
Index: AbstractMetamataTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -w -u -r1.7.2.2 -r1.7.2.3
--- AbstractMetamataTask.java 10 Feb 2003 14:25:15 -0000 1.7.2.2
+++ AbstractMetamataTask.java 18 Feb 2003 12:50:13 -0000 1.7.2.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,7 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.JavaEnvUtils;
/**
* Somewhat abstract framework to be used for other metama 2.0 tasks.
@@ -119,7 +120,7 @@
/** initialize the task with the classname of the task to run */
protected AbstractMetamataTask(String className) {
- cmdl.setVm("java");
+ cmdl.setVm(JavaEnvUtils.getJreExecutable("java"));
cmdl.setClassname(className);
}
1.11.2.4 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -w -u -r1.11.2.3 -r1.11.2.4
--- MParse.java 10 Feb 2003 14:25:15 -0000 1.11.2.3
+++ MParse.java 18 Feb 2003 12:50:13 -0000 1.11.2.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,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;
import java.io.File;
import java.io.IOException;
@@ -161,7 +162,7 @@
}
public MParse() {
- cmdl.setVm("java");
+ cmdl.setVm(JavaEnvUtils.getJreExecutable("java"));
cmdl.setClassname("com.metamata.jj.MParse");
}
