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, 03 Dec 2002 09:15:02 GMT
bodewig     2002/12/03 01:15:02

  Modified:    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 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.5  +4 -2      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.4
  retrieving revision 1.52.2.5
  diff -u -r1.52.2.4 -r1.52.2.5
  --- AntClassLoader.java	22 Aug 2002 17:19:47 -0000	1.52.2.4
  +++ AntClassLoader.java	3 Dec 2002 09:15:02 -0000	1.52.2.5
  @@ -516,7 +516,8 @@
        *                    Should not be <code>null</code>.
        */
       public void addSystemPackageRoot(String packageRoot) {
  -        systemPackages.addElement(packageRoot + ".");
  +        systemPackages.addElement(packageRoot 
  +                                  + (packageRoot.endsWith(".") ? "" : "."));
       }
   
       /**
  @@ -529,7 +530,8 @@
        *                    Should not be <code>null</code>.
        */
       public void addLoaderPackageRoot(String packageRoot) {
  -        loaderPackages.addElement(packageRoot + ".");
  +        loaderPackages.addElement(packageRoot
  +                                  + (packageRoot.endsWith(".") ? "" : "."));
       }
   
       /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.6   +5 -5      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.5
  retrieving revision 1.3.2.6
  diff -u -r1.3.2.5 -r1.3.2.6
  --- JavaEnvUtils.java	4 Jul 2002 14:54:43 -0000	1.3.2.5
  +++ JavaEnvUtils.java	3 Dec 2002 09:15:02 -0000	1.3.2.6
  @@ -82,7 +82,7 @@
   
       /** Version of currently running VM. */
       private static String javaVersion;
  -    
  +
       /** floating version of the JVM */
       private static int javaVersionNumber;
   
  @@ -99,7 +99,7 @@
   
       /** array of packages in the runtime */ 
       private static Vector jrePackages;
  -    
  +
   
       static {
   
  @@ -266,12 +266,12 @@
           }
           return executable;
       }
  -        
  +
       /**
        * demand creation of the package list.
        * When you add a new package, add a new test below
        */
  -     
  +
       private static void buildJrePackages() {
           jrePackages=new Vector();
           switch(javaVersionNumber) {
  @@ -303,7 +303,7 @@
               case 11:    
               default:
                   //things like sun.reflection, sun.misc, sun.net
  -                jrePackages.addElement("sun.");
  +                jrePackages.addElement("sun");
                   jrePackages.addElement("java");
                   jrePackages.addElement("javax");
                   break;
  
  
  

--
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