stevel      2002/06/16 22:44:54

  Modified:    src/main/org/apache/tools/ant Tag: ANT_15_BRANCH
                        AntClassLoader.java
  Log:
  This is the second half of the patch; it is turned off until I can write the tests to verify it. But since I had to jump through hoops to retrieve this off a deceased laptop, I felt it was time to commit it.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.3  +17 -0     jakarta-ant/src/main/org/apache/tools/ant/AntClassLoader.java
  
  Index: AntClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
  retrieving revision 1.52.2.2
  retrieving revision 1.52.2.3
  diff -u -r1.52.2.2 -r1.52.2.3
  --- AntClassLoader.java	30 May 2002 02:56:23 -0000	1.52.2.2
  +++ AntClassLoader.java	17 Jun 2002 05:44:54 -0000	1.52.2.3
  @@ -71,6 +71,7 @@
   import java.net.MalformedURLException;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.LoaderUtils;
  +import org.apache.tools.ant.util.JavaEnvUtils;
   
   /**
    * Used to load classes within ant with a different claspath from
  @@ -318,6 +319,8 @@
               this.parent = parent;
           }
           this.parentFirst = parentFirst;
  +        //TODO: turn on
  +        //addJavaLibraries();        
           addSystemPackageRoot("java");
           addSystemPackageRoot("javax");
       }
  @@ -1175,4 +1178,18 @@
        */
       public void messageLogged(BuildEvent event) {
       }
  +    
  +    /**
  +     * add any libraries that come with different java versions
  +     * here
  +     */
  +    private void addJavaLibraries() {
  +        Vector packages=JavaEnvUtils.getJrePackages();
  +        Enumeration e=packages.elements();
  +        while(e.hasMoreElements()) {
  +            String packageName=(String)e.nextElement();
  +            addSystemPackageRoot(packageName);
  +        }
  +    }
  +    
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>