From ant-dev-return-33967-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org Mon Jun 17 05:45:03 2002 Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 41125 invoked from network); 17 Jun 2002 05:45:02 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 17 Jun 2002 05:45:02 -0000 Received: (qmail 5038 invoked by uid 97); 17 Jun 2002 05:45:15 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 5000 invoked by uid 97); 17 Jun 2002 05:45:14 -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 4989 invoked by uid 97); 17 Jun 2002 05:45:13 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 17 Jun 2002 05:44:54 -0000 Message-ID: <20020617054454.24990.qmail@icarus.apache.org> From: stevel@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant AntClassLoader.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 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: For additional commands, e-mail: