cvs commit: jakarta-tools/ant/src/main/org/apache/tools/ant/taskdefs Javadoc2.java

[jo...@hyperreal.org]

jons        99/11/28 17:48:57

  Modified:    ant/src/main/org/apache/tools/ant/taskdefs Javadoc2.java
  Log:
  javadoc is so STUPID! if you don't pass in the current classpath,
  then it doesn't work!
  
  also in this commit is commented out source for a new
  security manager...this code isn't done yet because of issues
  with replacing the security manager requiring an updated
  java.policy file...this isn't good..we need a better solution.
  
  Revision  Changes    Path
  1.2       +17 -4     jakarta-tools/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc2.java
  
  Index: Javadoc2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tools/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc2.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Javadoc2.java	1999/11/24 01:38:51	1.1
  +++ Javadoc2.java	1999/11/29 01:48:56	1.2
  @@ -58,6 +58,7 @@
   
   import java.io.*;
   import java.util.*;
  +import java.lang.SecurityManager;
   
   /**
    * This Task makes it easy to generate javadoc 1.2 for a collection of source code.
  @@ -301,9 +302,11 @@
               argList.addElement("-doclet");
               argList.addElement(doclet);
           }
  +        argList.addElement("-classpath");
           if (classpath != null) {
  -            argList.addElement("-classpath");
               argList.addElement(classpath);
  +        } else {
  +            argList.addElement(System.getProperty("java.class.path"));
           }
           if (bootclasspath != null) {
               argList.addElement("-bootclasspath");
  @@ -418,8 +421,18 @@
           // also have to pass in a classpath specific for the project. Arg.
           // Why can't Sun make our life easy and allow us to distribute 
           // javac.jar with javadoc utility in it?
  -        com.sun.tools.javadoc.Main compiler =
  -            new com.sun.tools.javadoc.Main();
  -        compiler.main(args);
  +        
  +/*        SecurityManager saveSecurityManager = System.getSecurityManager();
  +        try {
  +
  +            System.setSecurityManager(new NoExitSecurityManager());
  +*/
  +            com.sun.tools.javadoc.Main compiler =
  +                new com.sun.tools.javadoc.Main();
  +            compiler.main(args);
  +//        } finally {
  +//            System.setSecurityManager(saveSecurityManager);
  +//        }
  +
       }
   }