Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 36779 invoked from network); 3 Dec 2002 09:15:14 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 3 Dec 2002 09:15:14 -0000 Received: (qmail 8273 invoked by uid 97); 3 Dec 2002 09:16:25 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 8256 invoked by uid 97); 3 Dec 2002 09:16:24 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 8241 invoked by uid 97); 3 Dec 2002 09:16:24 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 3 Dec 2002 09:15:02 -0000 Message-ID: <20021203091502.87319.qmail@icarus.apache.org> From: bodewig@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/util JavaEnvUtils.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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 null. */ public void addSystemPackageRoot(String packageRoot) { - systemPackages.addElement(packageRoot + "."); + systemPackages.addElement(packageRoot + + (packageRoot.endsWith(".") ? "" : ".")); } /** @@ -529,7 +530,8 @@ * Should not be null. */ 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: For additional commands, e-mail: