ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/util JavaEnvUtils.java
Date Tue, 10 Dec 2002 16:21:20 GMT
bodewig     2002/12/10 08:21:20

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant Tag: ANT_15_BRANCH
                        AntClassLoader.java
               src/main/org/apache/tools/ant/util Tag: ANT_15_BRANCH
                        JavaEnvUtils.java
  Log:
  Merge classloader fix from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.104 +4 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.103
  retrieving revision 1.263.2.104
  diff -u -r1.263.2.103 -r1.263.2.104
  --- WHATSNEW	27 Nov 2002 17:01:37 -0000	1.263.2.103
  +++ WHATSNEW	10 Dec 2002 16:21:19 -0000	1.263.2.104
  @@ -38,6 +38,10 @@
   
   * the errorsbeginat attribute of the <http> condition didn't work.
   
  +* Ant will try to force loading of certain packages like com.sun.*
  +  from the system classloader.  The packages are determined by the
  +  version of the JVM running Ant.
  +
   Other changes:
   --------------
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.7  +1 -4      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.6
  retrieving revision 1.52.2.7
  diff -u -r1.52.2.6 -r1.52.2.7
  --- AntClassLoader.java	4 Dec 2002 17:02:27 -0000	1.52.2.6
  +++ AntClassLoader.java	10 Dec 2002 16:21:19 -0000	1.52.2.7
  @@ -319,10 +319,7 @@
               this.parent = parent;
           }
           this.parentFirst = parentFirst;
  -        //TODO: turn on
  -        //addJavaLibraries();        
  -        addSystemPackageRoot("java");
  -        addSystemPackageRoot("javax");
  +        addJavaLibraries();
       }
   
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.7   +9 -10     jakarta-ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
  
  Index: JavaEnvUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java,v
  retrieving revision 1.3.2.6
  retrieving revision 1.3.2.7
  diff -u -r1.3.2.6 -r1.3.2.7
  --- JavaEnvUtils.java	3 Dec 2002 09:15:02 -0000	1.3.2.6
  +++ JavaEnvUtils.java	10 Dec 2002 16:21:20 -0000	1.3.2.7
  @@ -97,7 +97,7 @@
       /** Version constant for Java 1.4 */
       public static final String JAVA_1_4 = "1.4";
   
  -    /** array of packages in the runtime */ 
  +    /** array of packages in the runtime */
       private static Vector jrePackages;
   
   
  @@ -185,7 +185,7 @@
               jExecutable = findInDir(javaHome + "/sh", command);
           }
   
  -        if (jExecutable == null) { 
  +        if (jExecutable == null) {
               jExecutable = findInDir(javaHome + "/bin", command);
           }
   
  @@ -225,7 +225,7 @@
               jExecutable = findInDir(javaHome + "/../sh", command);
           }
   
  -        if (jExecutable == null) { 
  +        if (jExecutable == null) {
               jExecutable = findInDir(javaHome + "/../bin", command);
           }
   
  @@ -284,7 +284,7 @@
                   jrePackages.addElement("org.w3c.dom");
                   jrePackages.addElement("org.xml.sax");
                   // fall through
  -            case 13:    
  +            case 13:
                   jrePackages.addElement("org.omg");
                   jrePackages.addElement("com.sun.corba");
                   jrePackages.addElement("com.sun.jndi");
  @@ -295,12 +295,12 @@
                   jrePackages.addElement("sunw.io");
                   jrePackages.addElement("sunw.util");
                   // fall through
  -            case 12:    
  +            case 12:
                   jrePackages.addElement("com.sun.java");
                   jrePackages.addElement("com.sun.image");
                   // are there any here that we forgot?
                   // fall through
  -            case 11:    
  +            case 11:
               default:
                   //things like sun.reflection, sun.misc, sun.net
                   jrePackages.addElement("sun");
  @@ -311,8 +311,7 @@
       }
   
       /**
  -     * testing helper method; kept here for unification of changes.
  -     * @return
  +     * Testing helper method; kept here for unification of changes.
        */
       public static Vector getJrePackageTestCases() {
           Vector tests=new Vector();
  @@ -354,9 +353,9 @@
           return tests;
       }
       /**
  -     * get a vector of strings of packages built into 
  +     * get a vector of strings of packages built into
        * that platforms runtime jar(s)
  -     * @return list of packages 
  +     * @return list of packages
        */
       public static Vector getJrePackages() {
           if(jrePackages==null) {
  
  
  

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


Mime
View raw message