From: Anthony Green Date: Thu, 17 Jun 2004 13:30:32 +0000 (+0000) Subject: Add extension directory contents to the class path. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=794c3bee303760a10e5442d23cda23b6c71ed5ea;p=gcc.git Add extension directory contents to the class path. From-SVN: r83291 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 299ec1c59ef..1ff76e27d72 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-06-17 Anthony Green + + * gnu/gcj/runtime/VMClassLoader.java (init): Add extension + directory contents to the class path. + 2004-06-15 Andrew Haley * java/lang/natSystem.cc (getenv0): Don't assume environment diff --git a/libjava/gnu/gcj/runtime/VMClassLoader.java b/libjava/gnu/gcj/runtime/VMClassLoader.java index 3eabd73d431..75d193b103c 100644 --- a/libjava/gnu/gcj/runtime/VMClassLoader.java +++ b/libjava/gnu/gcj/runtime/VMClassLoader.java @@ -57,6 +57,36 @@ public final class VMClassLoader extends java.net.URLClassLoader /* Ignore this path element */ } } + + // Add the contents of the extensions directories. + st = new StringTokenizer (System.getProperty ("java.ext.dirs"), + System.getProperty ("path.separator", ":")); + while (st.hasMoreElements ()) + { + String dirname = st.nextToken (); + try + { + File dir = new File (dirname); + if (! dirname.endsWith (File.separator)) + dirname = dirname + File.separator; + String files[] + = dir.list (new FilenameFilter () + { + public boolean accept (File dir, String name) + { + return (name.endsWith (".jar") + || name.endsWith (".zip")); + } + }); + for (int i = files.length - 1; i >= 0; i--) + addURL(new URL("file", "", -1, dirname + files[i])); + } + catch (Exception x) + { + // Just ignore any badness. + } + } + // Add core:/ to the end of the java.class.path so any resources // compiled into this executable may be found. try