Changeset 12773

Timestamp:

07/01/10 20:57:11 (13 years ago)

Author:

astalla

Message:

Added classpath manipulation primitives: java:add-to-classpath and java:dump-classpath

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Autoload.java (modified) (1 diff)
• JavaClassLoader.java (modified) (2 diffs)
• Pathname.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Autoload.java

@@ -515 +515 @@
         autoload(PACKAGE_JAVA, "%load-java-class-from-byte-array", "RuntimeClass");
         autoload(PACKAGE_JAVA, "get-default-classloader", "JavaClassLoader");
+        autoload(PACKAGE_JAVA, "make-classloader", "JavaClassLoader");
+        autoload(PACKAGE_JAVA, "add-to-classpath", "JavaClassLoader");
+        autoload(PACKAGE_JAVA, "dump-classpath", "JavaClassLoader");
         autoload(PACKAGE_MOP, "funcallable-instance-function", "StandardGenericFunction", false);
         autoload(PACKAGE_MOP, "generic-function-name", "StandardGenericFunction", true);

trunk/abcl/src/org/armedbear/lisp/JavaClassLoader.java

@@ -40 +40 @@
 import java.util.Set;
 import java.net.URL;
-
-public class JavaClassLoader extends java.net.URLClassLoader {
+import java.net.URLClassLoader;
+
+public class JavaClassLoader extends URLClassLoader {
 
     private static JavaClassLoader persistentInstance;
@@ -169 +170 @@
     };
 
+    private static final Primitive DUMP_CLASSPATH = new pf_dump_classpath();
+    private static final class pf_dump_classpath extends Primitive 
+    {
+        pf_dump_classpath() 
+        {
+            super("dump-classpath", PACKAGE_JAVA, true, "&optional classloader");
+        }
+
+        @Override
+        public LispObject execute() {
+      return execute(new JavaObject(getCurrentClassLoader()));
+        }
+
+        @Override
+        public LispObject execute(LispObject classloader) {
+      LispObject list = NIL;
+      Object o = classloader.javaInstance();
+      while(o instanceof ClassLoader) {
+    ClassLoader cl = (ClassLoader) o;
+    list = list.push(dumpClassPath(cl));
+    o = cl.getParent();
+      }
+      return list.nreverse();
+        }
+    };
+
+    private static final Primitive ADD_TO_CLASSPATH = new pf_add_to_classpath();
+    private static final class pf_add_to_classpath extends Primitive 
+    {
+        pf_add_to_classpath() 
+        {
+            super("add-to-classpath", PACKAGE_JAVA, true, "jar-or-jars &optional (classloader (get-current-classloader))");
+        }
+
+        @Override
+        public LispObject execute(LispObject jarOrJars) {
+      return execute(jarOrJars, new JavaObject(getCurrentClassLoader()));
+        }
+
+        @Override
+        public LispObject execute(LispObject jarOrJars, LispObject classloader) {
+      Object o = classloader.javaInstance();
+      if(o instanceof JavaClassLoader) {
+    JavaClassLoader jcl = (JavaClassLoader) o;
+    if(jarOrJars instanceof Cons) {
+        while(jarOrJars != NIL) {
+      addURL(jcl, jarOrJars.car());
+      jarOrJars = jarOrJars.cdr();
+        }
+    } else {
+        addURL(jcl, jarOrJars);
+    }
+    return T;
+      } else {
+    return error(new TypeError(o + " must be an instance of " + JavaClassLoader.class.getName()));
+      }
+        }
+    };
+
+    protected static void addURL(JavaClassLoader jcl, LispObject jar) {
+  try {
+      if(jar instanceof Pathname) {
+    jcl.addURL(((Pathname) jar).toURL());
+      } else if(jar instanceof AbstractString) {
+    jcl.addURL(new Pathname(jar.toString()).toURL());
+      } else {
+    error(new TypeError(jar + " must be a pathname designator"));
+      }
+  } catch(java.net.MalformedURLException e) {
+      error(new LispError(jar + " is not a valid URL"));
+  }
+    }
+
+
+    public static LispObject dumpClassPath(ClassLoader o) {
+  if(o instanceof URLClassLoader) {
+      LispObject list = NIL;
+      for(URL u : ((URLClassLoader) o).getURLs()) {
+    list = list.push(new Pathname(u));
+      }
+      return new Cons(new JavaObject(o), list.nreverse());
+  } else {
+      return new JavaObject(o);
+  }
+    }
+
     public static ClassLoader getCurrentClassLoader() {
   LispObject classLoader = CLASSLOADER.symbolValueNoThrow();

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -2343 +2343 @@
     }
 
+    public URL toURL() throws MalformedURLException {
+  if(isURL()) {
+      return new URL(getNamestring());
+  } else {
+      return toFile().toURL();
+  }
+    }
+
+    public File toFile() {
+  if(!isURL()) {
+      return new File(getNamestring());
+  } else {
+      throw new RuntimeException(this + " does not represent a file");
+  }
+    }
+
     static {
         LispObject obj = Symbol.DEFAULT_PATHNAME_DEFAULTS.getSymbolValue();