stefano 00/03/03 06:15:42
Modified: src/main/org/apache/tools/ant/taskdefs Javadoc.java
Log:
called "javadoc" directly to avoid classpath problems that bugged many cocoon
devs (it didn't happen to me because was setting tools.jar in my
autoexec.bat... now I have a clean classpath and everything works fine on both
1.2 and 1.1
Revision Changes Path
1.7 +7 -16
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Javadoc.java 2000/02/13 18:20:00 1.6
+++ Javadoc.java 2000/03/03 14:15:42 1.7
@@ -79,9 +79,6 @@
public class Javadoc extends Exec {
- private static final String JAVADOC1 = "sun.tools.javadoc.Main";
- private static final String JAVADOC2 = "com.sun.tools.javadoc.Main";
-
private String sourcePath = null;
private File destDir = null;
private File overviewFile = null;
@@ -261,9 +258,9 @@
argList.addElement("-sourcepath");
argList.addElement(sourcePath);
}
- } else {
+ } else {
argList.addElement("-classpath");
- argList.addElement(sourcePath +
+ argList.addElement(sourcePath +
System.getProperty("path.separator") + classpath);
}
@@ -411,14 +408,8 @@
project.log("Javadoc execution", project.MSG_INFO);
StringBuffer b = new StringBuffer();
- b.append("java ");
- if (javadoc1) {
- b.append(JAVADOC1);
- } else {
- b.append(JAVADOC2);
- }
- b.append(" ");
-
+ b.append("javadoc ");
+
Enumeration e = argList.elements();
while (e.hasMoreElements()) {
String arg = (String) e.nextElement();
@@ -431,7 +422,7 @@
}
if (e.hasMoreElements()) b.append(" ");
}
-
+
run(b.toString());
}
@@ -554,10 +545,10 @@
}
/**
- * This is a java comment and string stripper reader that filters
+ * This is a java comment and string stripper reader that filters
* these lexical tokens out for purposes of simple Java parsing.
* (if you have more complex Java parsing needs, use a real lexer).
- * Since this class heavily relies on the single char read function,
+ * Since this class heavily relies on the single char read function,
* you are reccomended to make it work on top of a buffered reader.
*/
class JavaReader extends FilterReader {
