Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5960] trunk/sandbox/wierzbicki/jlr_experiment/src/org/ python/core/packagecache
|
From: <fwi...@us...> - 2009-01-22 20:21:09
|
Revision: 5960
http://jython.svn.sourceforge.net/jython/?rev=5960&view=rev
Author: fwierzbicki
Date: 2009-01-22 20:20:59 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Make PackageManager an interface and combine the impl into SysPackageManager.
Modified Paths:
--------------
trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/PackageManager.java
trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java
Removed Paths:
-------------
trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/CachedJarsPackageManager.java
trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/PathPackageManager.java
Deleted: trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/CachedJarsPackageManager.java
===================================================================
--- trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/CachedJarsPackageManager.java 2009-01-22 19:50:18 UTC (rev 5959)
+++ trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/CachedJarsPackageManager.java 2009-01-22 20:20:59 UTC (rev 5960)
@@ -1,596 +0,0 @@
-// Copyright (c) Corporation for National Research Initiatives
-// Copyright 2000 Samuele Pedroni
-
-package org.python.core.packagecache;
-
-import org.python.core.Options;
-import org.python.util.Generic;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.AccessControlException;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-/**
- * Abstract package manager that gathers info about statically known classes
- * from a set of jars. This info can be eventually cached. Off-the-shelf this
- * class offers a local file-system based cache impl.
- */
-public abstract class CachedJarsPackageManager extends PackageManager {
-
- /**
- * Message log method - hook. This default impl does nothing.
- *
- * @param msg message text
- */
- protected void message(String msg) {
- }
-
- /**
- * Warning log method - hook. This default impl does nothing.
- *
- * @param warn warning text
- */
- protected void warning(String warn) {
- }
-
- /**
- * Comment log method - hook. This default impl does nothing.
- *
- * @param msg message text
- */
- protected void comment(String msg) {
- }
-
- /**
- * Debug log method - hook. This default impl does nothing.
- *
- * @param msg message text
- */
- protected void debug(String msg) {
- }
-
- /**
- * Filter class/pkg by name helper method - hook. The default impl. is used
- * by {@link #addJarToPackages} in order to filter out classes whose name
- * contains '$' (e.g. inner classes,...). Should be used or overriden by
- * derived classes too. Also to be used in {@link #doDir}.
- *
- * @param name class/pkg name
- * @param pkg if true, name refers to a pkg
- * @return true if name must be filtered out
- */
- protected boolean filterByName(String name, boolean pkg) {
- return name.indexOf('$') != -1;
- }
-
- /**
- * Filter class by access perms helper method - hook. The default impl. is
- * used by {@link #addJarToPackages} in order to filter out non-public
- * classes. Should be used or overriden by derived classes too. Also to be
- * used in {@link #doDir}. Access perms can be read with
- * {@link #checkAccess}.
- *
- * @param name class name
- * @param acc class access permissions as int
- * @return true if name must be filtered out
- */
- protected boolean filterByAccess(String name, int acc) {
- return (acc & Modifier.PUBLIC) != Modifier.PUBLIC;
- }
-
- private boolean indexModified;
-
- private Map<String,JarXEntry> jarfiles;
-
- private static String listToString(List<String> list) {
- int n = list.size();
- StringBuilder ret = new StringBuilder();
- for (int i = 0; i < n; i++) {
- ret.append(list.get(i));
- if (i < n - 1) {
- ret.append(",");
- }
- }
- return ret.toString();
- }
-
- // Add a single class from zipFile to zipPackages
- // Only add valid, public classes
- private void addZipEntry(Map<String, List<String>[]> zipPackages, ZipEntry entry,
- ZipInputStream zip) throws IOException {
- String name = entry.getName();
- // System.err.println("entry: "+name);
- if (!name.endsWith(".class")) {
- return;
- }
-
- char sep = '/';
- int breakPoint = name.lastIndexOf(sep);
- if (breakPoint == -1) {
- breakPoint = name.lastIndexOf('\\');
- sep = '\\';
- }
-
- String packageName;
- if (breakPoint == -1) {
- packageName = "";
- } else {
- packageName = name.substring(0, breakPoint).replace(sep, '.');
- }
-
- String className = name.substring(breakPoint + 1, name.length() - 6);
-
- if (filterByName(className, false)) {
- return;
- }
-
- List<String>[] vec = zipPackages.get(packageName);
- if (vec == null) {
- vec = new List[] { Generic.list(), Generic.list() };
- zipPackages.put(packageName, vec);
- }
- int access = checkAccess(zip);
- if ((access != -1) && !filterByAccess(name, access)) {
- vec[0].add(className);
- } else {
- vec[1].add(className);
- }
- }
-
- // Extract all of the packages in a single jarfile
- private Map<String, String> getZipPackages(InputStream jarin) throws IOException {
- Map<String, List<String>[]> zipPackages = Generic.map();
-
- ZipInputStream zip = new ZipInputStream(jarin);
-
- ZipEntry entry;
- while ((entry = zip.getNextEntry()) != null) {
- addZipEntry(zipPackages, entry, zip);
- zip.closeEntry();
- }
-
- // Turn each vector into a comma-separated String
- Map<String, String> transformed = Generic.map();
- for (String key : zipPackages.keySet()) {
- List<String>[] vec = zipPackages.get(key);
- String classes = listToString(vec[0]);
- if (vec[1].size() > 0) {
- classes += '@' + listToString(vec[1]);
- }
- transformed.put(key, classes);
- }
-
- return transformed;
- }
-
- /**
- * Gathers classes info from jar specified by jarurl URL. Eventually just
- * using previously cached info. Eventually updated info is not cached.
- * Persistent cache storage access goes through inOpenCacheFile() and
- * outCreateCacheFile().
- */
- public void addJarToPackages(java.net.URL jarurl) {
- addJarToPackages(jarurl, null, false);
- }
-
- /**
- * Gathers classes info from jar specified by jarurl URL. Eventually just
- * using previously cached info. Eventually updated info is (re-)cached if
- * param cache is true. Persistent cache storage access goes through
- * inOpenCacheFile() and outCreateCacheFile().
- */
- public void addJarToPackages(URL jarurl, boolean cache) {
- addJarToPackages(jarurl, null, cache);
- }
-
- /**
- * Gathers classes info from jar specified by File jarfile. Eventually just
- * using previously cached info. Eventually updated info is not cached.
- * Persistent cache storage access goes through inOpenCacheFile() and
- * outCreateCacheFile().
- */
- public void addJarToPackages(File jarfile) {
- addJarToPackages(null, jarfile, false);
- }
-
- /**
- * Gathers classes info from jar specified by File jarfile. Eventually just
- * using previously cached info. Eventually updated info is (re-)cached if
- * param cache is true. Persistent cache storage access goes through
- * inOpenCacheFile() and outCreateCacheFile().
- */
- public void addJarToPackages(File jarfile, boolean cache) {
- addJarToPackages(null, jarfile, cache);
- }
-
- private void addJarToPackages(URL jarurl, File jarfile, boolean cache) {
- try {
- boolean caching = this.jarfiles != null;
-
- URLConnection jarconn = null;
- boolean localfile = true;
-
- if (jarfile == null) {
- jarconn = jarurl.openConnection();
- // This is necessary because 'file:' url-connections
- // return always 0 through getLastModified (bug?).
- // And in order to handle localfiles (from urls too)
- // uniformly.
- if (jarconn.getURL().getProtocol().equals("file")) {
- // ??pending: need to use java2 URLDecoder.decode?
- String jarfilename = jarurl.getFile();
- jarfilename = jarfilename.replace('/', File.separatorChar);
- jarfile = new File(jarfilename);
- } else {
- localfile = false;
- }
- }
-
- if (localfile && !jarfile.exists()) {
- return;
- }
-
- Map<String, String> zipPackages = null;
-
- long mtime = 0;
- String jarcanon = null;
- JarXEntry entry = null;
- boolean brandNew = false;
-
- if (caching) {
-
- if (localfile) {
- mtime = jarfile.lastModified();
- jarcanon = jarfile.getCanonicalPath();
- } else {
- mtime = jarconn.getLastModified();
- jarcanon = jarurl.toString();
- }
-
- entry = this.jarfiles.get(jarcanon);
-
- if ((entry == null || !(new File(entry.cachefile).exists()))
- && cache) {
- message("processing new jar, '" + jarcanon + "'");
-
- String jarname;
- if (localfile) {
- jarname = jarfile.getName();
- } else {
- jarname = jarurl.getFile();
- int slash = jarname.lastIndexOf('/');
- if (slash != -1)
- jarname = jarname.substring(slash + 1);
- }
- jarname = jarname.substring(0, jarname.length() - 4);
-
- entry = new JarXEntry(jarname);
- this.jarfiles.put(jarcanon, entry);
-
- brandNew = true;
- }
-
- if (mtime != 0 && entry != null && entry.mtime == mtime) {
- zipPackages = readCacheFile(entry, jarcanon);
- }
-
- }
-
- if (zipPackages == null) {
- caching = caching && cache;
-
- if (caching) {
- this.indexModified = true;
- if (entry.mtime != 0) {
- message("processing modified jar, '" + jarcanon + "'");
- }
- entry.mtime = mtime;
- }
-
- InputStream jarin;
- if (jarconn == null) {
- jarin = new BufferedInputStream(
- new FileInputStream(jarfile));
- } else {
- jarin = jarconn.getInputStream();
- }
-
- zipPackages = getZipPackages(jarin);
-
- if (caching) {
- writeCacheFile(entry, jarcanon, zipPackages, brandNew);
- }
- }
-
- addPackages(zipPackages, jarcanon);
- } catch (IOException ioe) {
- // silently skip any bad directories
- warning("skipping bad jar, '"
- + (jarfile != null ? jarfile.toString() : jarurl.toString())
- + "'");
- }
-
- }
-
- private void addPackages(Map<String,String> zipPackages, String jarfile) {
- for (Entry<String,String> entry : zipPackages.entrySet()) {
- String pkg = entry.getKey();
- String classes = entry.getValue();
-
- int idx = classes.indexOf('@');
- if (idx >= 0 && Options.respectJavaAccessibility) {
- classes = classes.substring(0, idx);
- }
-
- makeJavaPackage(pkg, classes, jarfile);
- }
- }
-
- // Read in cache file storing package info for a single .jar
- // Return null and delete this cachefile if it is invalid
- private Map<String, String> readCacheFile(JarXEntry entry, String jarcanon) {
- String cachefile = entry.cachefile;
- long mtime = entry.mtime;
-
- debug("reading cache, '" + jarcanon + "'");
-
- try {
- DataInputStream istream = inOpenCacheFile(cachefile);
- String old_jarcanon = istream.readUTF();
- long old_mtime = istream.readLong();
- if ((!old_jarcanon.equals(jarcanon)) || (old_mtime != mtime)) {
- comment("invalid cache file: " + cachefile + ", " + jarcanon
- + ":" + old_jarcanon + ", " + mtime + ":" + old_mtime);
- deleteCacheFile(cachefile);
- return null;
- }
- Map<String, String> packs = Generic.map();
- try {
- while (true) {
- String packageName = istream.readUTF();
- String classes = istream.readUTF();
- packs.put(packageName, classes);
- }
- } catch (EOFException eof) {
- ;
- }
- istream.close();
-
- return packs;
- } catch (IOException ioe) {
- // if (cachefile.exists()) cachefile.delete();
- return null;
- }
- }
-
- // Write a cache file storing package info for a single .jar
- private void writeCacheFile(JarXEntry entry, String jarcanon,
- Map<String,String> zipPackages, boolean brandNew) {
- try {
- DataOutputStream ostream = outCreateCacheFile(entry, brandNew);
- ostream.writeUTF(jarcanon);
- ostream.writeLong(entry.mtime);
- comment("rewriting cachefile for '" + jarcanon + "'");
-
- for (String packageName : zipPackages.keySet()) {
- String classes = zipPackages.get(packageName);
- ostream.writeUTF(packageName);
- ostream.writeUTF(classes);
- }
- ostream.close();
- } catch (IOException ioe) {
- warning("can't write cache file for '" + jarcanon + "'");
- }
- }
-
- /**
- * Initializes cache. Eventually reads back cache index. Index persistent
- * storage is accessed through inOpenIndex().
- */
- protected void initCache() {
- this.indexModified = false;
- this.jarfiles = Generic.map();
-
- try {
- DataInputStream istream = inOpenIndex();
- if (istream == null) {
- return;
- }
-
- try {
- while (true) {
- String jarcanon = istream.readUTF();
- String cachefile = istream.readUTF();
- long mtime = istream.readLong();
- this.jarfiles.put(jarcanon, new JarXEntry(cachefile, mtime));
- }
- } catch (EOFException eof) {
- ;
- }
- istream.close();
- } catch (IOException ioe) {
- warning("invalid index file");
- }
-
- }
-
- /**
- * Write back cache index. Index persistent storage is accessed through
- * outOpenIndex().
- */
- public void saveCache() {
- if (jarfiles == null || !indexModified) {
- return;
- }
-
- indexModified = false;
-
- comment("writing modified index file");
-
- try {
- DataOutputStream ostream = outOpenIndex();
- for (Entry<String,JarXEntry> entry : jarfiles.entrySet()) {
- String jarcanon = entry.getKey();
- JarXEntry xentry = entry.getValue();
- ostream.writeUTF(jarcanon);
- ostream.writeUTF(xentry.cachefile);
- ostream.writeLong(xentry.mtime);
- }
- ostream.close();
- } catch (IOException ioe) {
- warning("can't write index file");
- }
- }
-
- // hooks for changing cache storage
-
- /**
- * To pass a cachefile id by ref. And for internal use. See
- * outCreateCacheFile
- */
- public static class JarXEntry extends Object {
- /** cachefile id */
- public String cachefile;
-
- public long mtime;
-
- public JarXEntry(String cachefile) {
- this.cachefile = cachefile;
- }
-
- public JarXEntry(String cachefile, long mtime) {
- this.cachefile = cachefile;
- this.mtime = mtime;
- }
-
- }
-
- /**
- * Open cache index for reading from persistent storage - hook. Must Return
- * null if this is absent. This default impl is part of the off-the-shelf
- * local file-system cache impl. Can be overriden.
- */
- protected DataInputStream inOpenIndex() throws IOException {
- File indexFile = new File(this.cachedir, "packages.idx");
-
- if (!indexFile.exists()) {
- return null;
- }
-
- DataInputStream istream = new DataInputStream(new BufferedInputStream(
- new FileInputStream(indexFile)));
-
- return istream;
- }
-
- /**
- * Open cache index for writing back to persistent storage - hook. This
- * default impl is part of the off-the-shelf local file-system cache impl.
- * Can be overriden.
- */
- protected DataOutputStream outOpenIndex() throws IOException {
- File indexFile = new File(this.cachedir, "packages.idx");
-
- return new DataOutputStream(new BufferedOutputStream(
- new FileOutputStream(indexFile)));
- }
-
- /**
- * Open cache file for reading from persistent storage - hook. This default
- * impl is part of the off-the-shelf local file-system cache impl. Can be
- * overriden.
- */
- protected DataInputStream inOpenCacheFile(String cachefile)
- throws IOException {
- return new DataInputStream(new BufferedInputStream(new FileInputStream(
- cachefile)));
- }
-
- /**
- * Delete (invalidated) cache file from persistent storage - hook. This
- * default impl is part of the off-the-shelf local file-system cache impl.
- * Can be overriden.
- */
- protected void deleteCacheFile(String cachefile) {
- new File(cachefile).delete();
- }
-
- /**
- * Create/open cache file for rewriting back to persistent storage - hook.
- * If create is false, cache file is supposed to exist and must be opened
- * for rewriting, entry.cachefile is a valid cachefile id. If create is
- * true, cache file must be created. entry.cachefile is a flat jarname to be
- * used to produce a valid cachefile id (to be put back in entry.cachefile
- * on exit). This default impl is part of the off-the-shelf local
- * file-system cache impl. Can be overriden.
- */
- protected DataOutputStream outCreateCacheFile(JarXEntry entry,
- boolean create) throws IOException {
- File cachefile = null;
-
- if (create) {
- int index = 1;
- String suffix = "";
- String jarname = entry.cachefile;
- while (true) {
- cachefile = new File(this.cachedir, jarname + suffix + ".pkc");
- // System.err.println("try cachefile: "+cachefile);
- if (!cachefile.exists()) {
- break;
- }
- suffix = "$" + index;
- index += 1;
- }
- entry.cachefile = cachefile.getCanonicalPath();
- } else
- cachefile = new File(entry.cachefile);
-
- return new DataOutputStream(new BufferedOutputStream(
- new FileOutputStream(cachefile)));
- }
-
- // for default cache (local fs based) impl
-
- private File cachedir;
-
- /**
- * Initialize off-the-shelf (default) local file-system cache impl. Must be
- * called before {@link #initCache}. cachedir is the cache repository
- * directory, this is eventually created. Returns true if dir works.
- */
- protected boolean useCacheDir(File aCachedir1) {
- if (aCachedir1 == null) {
- return false;
- }
- try {
- if(!aCachedir1.isDirectory() && aCachedir1.mkdirs() == false) {
- warning("can't create package cache dir, '" + aCachedir1 + "'");
- return false;
- }
- } catch(AccessControlException ace) {
- warning("The java security manager isn't allowing access to the package cache dir, '" + aCachedir1 + "'");
- return false;
- }
-
- this.cachedir = aCachedir1;
-
- return true;
- }
-
-}
Modified: trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/PackageManager.java
===================================================================
--- trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/PackageManager.java 2009-01-22 19:50:18 UTC (rev 5959)
+++ trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/PackageManager.java 2009-01-22 20:20:59 UTC (rev 5960)
@@ -11,37 +11,17 @@
import java.io.EOFException;
-/**
- * Abstract package manager.
- */
-public abstract class PackageManager extends Object {
+public interface PackageManager {
- public PyJavaPackage topLevelPackage;
+ Class findClass(String pkg, String name, String reason);
- public PackageManager() {
- this.topLevelPackage = new PyJavaPackage("", this);
- }
+ Class findClass(String pkg, String name);
- abstract public Class findClass(String pkg, String name, String reason);
+ void notifyPackageImport(String pkg, String name);
- public Class findClass(String pkg, String name) {
- return findClass(pkg, name, "java class");
- }
+ boolean packageExists(String pkg, String name);
- public void notifyPackageImport(String pkg, String name) {
- }
-
/**
- * Dynamically check if pkg.name exists as java pkg in the controlled
- * hierarchy. Should be overriden.
- *
- * @param pkg parent pkg name
- * @param name candidate name
- * @return true if pkg exists
- */
- public abstract boolean packageExists(String pkg, String name);
-
- /**
* Reports the specified package content names. Should be overriden. Used by
* {@link PyJavaPackage#__dir__} and {@link PyJavaPackage#fillDir}.
*
@@ -50,8 +30,7 @@
* @param instantiate if true then instatiate reported names in package dict
* @param exclpkgs exclude packages (just when instantiate is false)
*/
- public abstract PyList doDir(PyJavaPackage jpkg, boolean instantiate,
- boolean exclpkgs);
+ PyList doDir(PyJavaPackage jpkg, boolean instantiate, boolean exclpkgs);
/**
* Append a directory to the list of directories searched for java packages
@@ -59,7 +38,7 @@
*
* @param dir A directory.
*/
- public abstract void addDirectory(java.io.File dir);
+ void addDirectory(java.io.File dir);
/**
* Append a directory to the list of directories searched for java packages
@@ -67,7 +46,7 @@
*
* @param dir A directory name.
*/
- public abstract void addJarDir(String dir, boolean cache);
+ void addJarDir(String dir, boolean cache);
/**
* Append a jar file to the list of locations searched for java packages and
@@ -75,78 +54,11 @@
*
* @param jarfile A directory name.
*/
- public abstract void addJar(String jarfile, boolean cache);
+ void addJar(String jarfile, boolean cache);
- /**
- * Basic helper implementation of {@link #doDir}. It merges information
- * from jpkg {@link PyJavaPackage#clsSet} and {@link PyJavaPackage#__dict__}.
- */
- protected PyList basicDoDir(PyJavaPackage jpkg, boolean instantiate,
- boolean exclpkgs) {
- PyStringMap dict = jpkg.__dict__;
- PyStringMap cls = jpkg.clsSet;
+ PyObject lookupName(String name);
- if (!instantiate) {
- PyList ret = cls.keys();
-
- PyList dictKeys = dict.keys();
-
- for (int i = 0; i < dictKeys.__len__(); i++) {
- PyObject name = dictKeys.pyget(i);
- if (!cls.has_key(name)) {
- if (exclpkgs && dict.get(name) instanceof PyJavaPackage)
- continue;
- ret.append(name);
- }
- }
-
- return ret;
- }
-
-
- for (PyObject pyname : cls.keys().asIterable()) {
- if (!dict.has_key(pyname)) {
- String name = pyname.toString();
- jpkg.addClass(name, Py.findClass(jpkg.__name__ + "." + name));
- }
- }
-
- return dict.keys();
- }
-
/**
- * Helper merging list2 into list1. Returns list1.
- */
- protected PyList merge(PyList list1, PyList list2) {
- for (int i = 0; i < list2.__len__(); i++) {
- PyObject name = list2.pyget(i);
- list1.append(name);
- }
-
- return list1;
- }
-
- public PyObject lookupName(String name) {
- PyObject top = this.topLevelPackage;
- do {
- int dot = name.indexOf('.');
- String firstName = name;
- String lastName = null;
- if (dot != -1) {
- firstName = name.substring(0, dot);
- lastName = name.substring(dot + 1, name.length());
- }
- firstName = firstName.intern();
- top = top.__findattr__(firstName);
- if (top == null)
- return null;
- // ??pending: test for jpkg/jclass?
- name = lastName;
- } while (name != null);
- return top;
- }
-
- /**
* Creates package/updates statically known classes info. Uses
* {@link PyJavaPackage#addPackage(java.lang.String, java.lang.String) },
* {@link PyJavaPackage#addPlaceholders}.
@@ -156,85 +68,5 @@
* @param jarfile involved jarfile; can be null
* @return created/updated package
*/
- public PyJavaPackage makeJavaPackage(String name, String classes,
- String jarfile) {
- PyJavaPackage p = this.topLevelPackage;
- if (name.length() != 0)
- p = p.addPackage(name, jarfile);
-
- if (classes != null)
- p.addPlaceholders(classes);
-
- return p;
- }
-
- /**
- * Check that a given stream is a valid Java .class file. And return its
- * access permissions as an int.
- */
- static protected int checkAccess(java.io.InputStream cstream)
- throws java.io.IOException {
- java.io.DataInputStream istream = new java.io.DataInputStream(cstream);
-
- try {
- int magic = istream.readInt();
- if (magic != 0xcafebabe) {
- return -1;
- }
- } catch (EOFException eof) {
- //Empty or 1 byte file.
- return -1;
- }
- //int minor =
- istream.readShort();
- //int major =
- istream.readShort();
-
- // Check versions???
- // System.out.println("magic: "+magic+", "+major+", "+minor);
- int nconstants = istream.readShort();
- for (int i = 1; i < nconstants; i++) {
- int cid = istream.readByte();
- // System.out.println(""+i+" : "+cid);
- switch (cid) {
- case 7:
- istream.skipBytes(2);
- break;
- case 9:
- case 10:
- case 11:
- istream.skipBytes(4);
- break;
- case 8:
- istream.skipBytes(2);
- break;
- case 3:
- case 4:
- istream.skipBytes(4);
- break;
- case 5:
- case 6:
- istream.skipBytes(8);
- i++;
- break;
- case 12:
- istream.skipBytes(4);
- break;
- case 1:
- // System.out.println("utf: "+istream.readUTF()+";");
- int slength = istream.readUnsignedShort();
- istream.skipBytes(slength);
- break;
- default:
- // System.err.println("unexpected cid: "+cid+", "+i+", "+
- // nconstants);
- // for (int j=0; j<10; j++)
- // System.err.print(", "+istream.readByte());
- // System.err.println();
- return -1;
- }
- }
- return istream.readShort();
- }
-
+ PyJavaPackage makeJavaPackage(String name, String classes, String jarfile);
}
Deleted: trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/PathPackageManager.java
===================================================================
--- trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/PathPackageManager.java 2009-01-22 19:50:18 UTC (rev 5959)
+++ trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/PathPackageManager.java 2009-01-22 20:20:59 UTC (rev 5960)
@@ -1,237 +0,0 @@
-// Copyright (c) Corporation for National Research Initiatives
-// Copyright 2000 Samuele Pedroni
-
-package org.python.core.packagecache;
-
-import org.python.core.imp;
-import org.python.core.Py;
-import org.python.core.PyJavaPackage;
-import org.python.core.PyList;
-import org.python.core.PyString;
-import org.python.core.util.RelativeFile;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
-/**
- * Path package manager. Gathering classes info dynamically from a set of
- * directories in path {@link #searchPath}, and statically from a set of jars,
- * like {@link CachedJarsPackageManager}.
- */
-public abstract class PathPackageManager extends CachedJarsPackageManager {
-
- public PyList searchPath;
-
- public PathPackageManager() {
- this.searchPath = new PyList();
- }
-
- /**
- * Helper for {@link #packageExists(java.lang.String,java.lang.String)}.
- * Scans for package pkg.name the directories in path.
- */
- protected boolean packageExists(PyList path, String pkg, String name) {
- String child = pkg.replace('.', File.separatorChar) + File.separator
- + name;
-
- for (int i = 0; i < path.__len__(); i++) {
- String dir = path.pyget(i).__str__().toString();
-
- File f = new RelativeFile(dir, child);
- if (f.isDirectory() && imp.caseok(f, name)) {
- /*
- * Figure out if we have a directory a mixture of python and
- * java or just an empty directory (which means Java) or a
- * directory with only Python source (which means Python).
- */
- PackageExistsFileFilter m = new PackageExistsFileFilter();
- f.listFiles(m);
- boolean exists = m.packageExists();
- if (exists) {
- Py.writeComment("import", "java package as '"
- + f.getAbsolutePath() + "'");
- }
- return exists;
- }
- }
- return false;
- }
-
- class PackageExistsFileFilter implements FilenameFilter {
- private boolean java;
-
- private boolean python;
-
- public boolean accept(File dir, String name) {
- if(name.endsWith(".py") || name.endsWith("$py.class") || name.endsWith("$_PyInner.class")) {
- python = true;
- }else if (name.endsWith(".class")) {
- java = true;
- }
- return false;
- }
-
- public boolean packageExists() {
- if (this.python && !this.java) {
- return false;
- }
- return true;
- }
- }
-
- /**
- * Helper for {@link #doDir(PyJavaPackage,boolean,boolean)}. Scans for
- * package jpkg content over the directories in path. Add to ret the founded
- * classes/pkgs. Filter out classes using {@link #filterByName},{@link #filterByAccess}.
- */
- protected void doDir(PyList path, PyList ret, PyJavaPackage jpkg,
- boolean instantiate, boolean exclpkgs) {
- String child = jpkg.__name__.replace('.', File.separatorChar);
-
- for (int i = 0; i < path.__len__(); i++) {
- String dir = path.pyget(i).__str__().toString();
- if (dir.length() == 0) {
- dir = null;
- }
-
- File childFile = new File(dir, child);
-
- String[] list = childFile.list();
- if (list == null) {
- continue;
- }
-
- doList: for (int j = 0; j < list.length; j++) {
- String jname = list[j];
-
- File cand = new File(childFile, jname);
-
- int jlen = jname.length();
-
- boolean pkgCand = false;
-
- if (cand.isDirectory()) {
- if (!instantiate && exclpkgs) {
- continue;
- }
- pkgCand = true;
- } else {
- if (!jname.endsWith(".class")) {
- continue;
- }
- jlen -= 6;
- }
-
- jname = jname.substring(0, jlen);
- PyString name = new PyString(jname);
-
- if (filterByName(jname, pkgCand)) {
- continue;
- }
-
- // for opt maybe we should some hash-set for ret
- if (jpkg.__dict__.has_key(name) || jpkg.clsSet.has_key(name)
- || ret.__contains__(name)) {
- continue;
- }
-
- if (!Character.isJavaIdentifierStart(jname.charAt(0))) {
- continue;
- }
-
- for (int k = 1; k < jlen; k++) {
- if (!Character.isJavaIdentifierPart(jname.charAt(k))) {
- continue doList;
- }
- }
-
- if (!pkgCand) {
- try {
- int acc = checkAccess(new BufferedInputStream(
- new FileInputStream(cand)));
- if ((acc == -1) || filterByAccess(jname, acc)) {
- continue;
- }
- } catch (IOException e) {
- continue;
- }
- }
-
- if (instantiate) {
- if (pkgCand) {
- jpkg.addPackage(jname);
- } else {
- jpkg.addClass(jname, Py.findClass(jpkg.__name__ + "." + jname));
- }
- }
-
- ret.append(name);
-
- }
- }
-
- }
-
- /**
- * Add directory dir (if exists) to {@link #searchPath}.
- */
- public void addDirectory(File dir) {
- try {
- if (dir.getPath().length() == 0) {
- this.searchPath.append(Py.EmptyString);
- } else {
- this.searchPath.append(new PyString(dir.getCanonicalPath()));
- }
- } catch (IOException e) {
- warning("skipping bad directory, '" + dir + "'");
- }
- }
-
- // ??pending:
- // Uses simply split and not a StringTokenizer+trim to adhere to
- // sun jvm parsing of classpath.
- // E.g. "a;" is parsed by sun jvm as a, ""; the latter is interpreted
- // as cwd. jview trims and cwd is per default in classpath.
- // The logic here should work for both(...). Need to distinguish?
- // This code does not avoid duplicates in searchPath.
- // Should cause no problem (?).
-
- /**
- * Adds "classpath" entry. Calls {@link #addDirectory} if path refers to a
- * dir, {@link #addJarToPackages(java.io.File, boolean)} with param cache
- * true if path refers to a jar.
- */
- public void addClassPath(String path) {
- PyList paths = new PyString(path).split(java.io.File.pathSeparator);
-
- for (int i = 0; i < paths.__len__(); i++) {
- String entry = paths.pyget(i).toString();
- if (entry.endsWith(".jar") || entry.endsWith(".zip")) {
- addJarToPackages(new File(entry), true);
- } else {
- File dir = new File(entry);
- if (entry.length() == 0 || dir.isDirectory()) {
- addDirectory(dir);
- }
- }
- }
- }
-
- public PyList doDir(PyJavaPackage jpkg, boolean instantiate,
- boolean exclpkgs) {
- PyList basic = basicDoDir(jpkg, instantiate, exclpkgs);
- PyList ret = new PyList();
-
- doDir(this.searchPath, ret, jpkg, instantiate, exclpkgs);
-
- return merge(basic, ret);
- }
-
- public boolean packageExists(String pkg, String name) {
- return packageExists(this.searchPath, pkg, name);
- }
-
-}
Modified: trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java
===================================================================
--- trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java 2009-01-22 19:50:18 UTC (rev 5959)
+++ trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java 2009-01-22 20:20:59 UTC (rev 5960)
@@ -3,20 +3,55 @@
package org.python.core.packagecache;
+import org.python.core.imp;
import org.python.core.Py;
import org.python.core.PyJavaPackage;
import org.python.core.PyList;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyStringMap;
import org.python.core.PySystemState;
+import org.python.core.util.RelativeFile;
import java.util.Properties;
import java.util.StringTokenizer;
import java.io.*;
+import org.python.core.Options;
+import org.python.util.Generic;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.AccessControlException;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+
/**
* System package manager. Used by org.python.core.PySystemState.
*/
-public class SysPackageManager extends PathPackageManager {
+public class SysPackageManager implements PackageManager {
+ /* from PathPackageManager constructor */
+ public PyList searchPath;
+
+ /* from old PackageManager */
+ public PyJavaPackage topLevelPackage;
+
protected void message(String msg) {
Py.writeMessage("*sys-package-mgr*", msg);
}
@@ -34,6 +69,12 @@
}
public SysPackageManager(File cachedir, Properties registry) {
+ /* from PathPackageManager constructor */
+ this.searchPath = new PyList();
+
+ /* from old PackageManager constructor */
+ this.topLevelPackage = new PyJavaPackage("", this);
+
if (useCacheDir(cachedir)) {
initCache();
findAllPackages(registry);
@@ -119,7 +160,7 @@
}
public Class findClass(String pkg, String name) {
- Class c = super.findClass(pkg, name);
+ Class c = findClass(pkg, name, "java class");
if (c != null) {
Py.writeComment("import", "'" + name + "' as java class");
}
@@ -149,6 +190,14 @@
return merge(basic, ret);
}
+ /**
+ * Dynamically check if pkg.name exists as java pkg in the controlled
+ * hierarchy. Should be overriden.
+ *
+ * @param pkg parent pkg name
+ * @param name candidate name
+ * @return true if pkg exists
+ */
public boolean packageExists(String pkg, String name) {
if (packageExists(this.searchPath, pkg, name)) {
return true;
@@ -164,4 +213,888 @@
return false;
}
+
+ /**
+ * Helper for {@link #packageExists(java.lang.String,java.lang.String)}.
+ * Scans for package pkg.name the directories in path.
+ */
+ protected boolean packageExists(PyList path, String pkg, String name) {
+ String child = pkg.replace('.', File.separatorChar) + File.separator
+ + name;
+
+ for (int i = 0; i < path.__len__(); i++) {
+ String dir = path.pyget(i).__str__().toString();
+
+ File f = new RelativeFile(dir, child);
+ if (f.isDirectory() && imp.caseok(f, name)) {
+ /*
+ * Figure out if we have a directory a mixture of python and
+ * java or just an empty directory (which means Java) or a
+ * directory with only Python source (which means Python).
+ */
+ PackageExistsFileFilter m = new PackageExistsFileFilter();
+ f.listFiles(m);
+ boolean exists = m.packageExists();
+ if (exists) {
+ Py.writeComment("import", "java package as '"
+ + f.getAbsolutePath() + "'");
+ }
+ return exists;
+ }
+ }
+ return false;
+ }
+
+ class PackageExistsFileFilter implements FilenameFilter {
+ private boolean java;
+
+ private boolean python;
+
+ public boolean accept(File dir, String name) {
+ if(name.endsWith(".py") || name.endsWith("$py.class") || name.endsWith("$_PyInner.class")) {
+ python = true;
+ }else if (name.endsWith(".class")) {
+ java = true;
+ }
+ return false;
+ }
+
+ public boolean packageExists() {
+ if (this.python && !this.java) {
+ return false;
+ }
+ return true;
+ }
+ }
+
+ /**
+ * Helper for {@link #doDir(PyJavaPackage,boolean,boolean)}. Scans for
+ * package jpkg content over the directories in path. Add to ret the founded
+ * classes/pkgs. Filter out classes using {@link #filterByName},{@link #filterByAccess}.
+ */
+ protected void doDir(PyList path, PyList ret, PyJavaPackage jpkg,
+ boolean instantiate, boolean exclpkgs) {
+ String child = jpkg.__name__.replace('.', File.separatorChar);
+
+ for (int i = 0; i < path.__len__(); i++) {
+ String dir = path.pyget(i).__str__().toString();
+ if (dir.length() == 0) {
+ dir = null;
+ }
+
+ File childFile = new File(dir, child);
+
+ String[] list = childFile.list();
+ if (list == null) {
+ continue;
+ }
+
+ doList: for (int j = 0; j < list.length; j++) {
+ String jname = list[j];
+
+ File cand = new File(childFile, jname);
+
+ int jlen = jname.length();
+
+ boolean pkgCand = false;
+
+ if (cand.isDirectory()) {
+ if (!instantiate && exclpkgs) {
+ continue;
+ }
+ pkgCand = true;
+ } else {
+ if (!jname.endsWith(".class")) {
+ continue;
+ }
+ jlen -= 6;
+ }
+
+ jname = jname.substring(0, jlen);
+ PyString name = new PyString(jname);
+
+ if (filterByName(jname, pkgCand)) {
+ continue;
+ }
+
+ // for opt maybe we should some hash-set for ret
+ if (jpkg.__dict__.has_key(name) || jpkg.clsSet.has_key(name)
+ || ret.__contains__(name)) {
+ continue;
+ }
+
+ if (!Character.isJavaIdentifierStart(jname.charAt(0))) {
+ continue;
+ }
+
+ for (int k = 1; k < jlen; k++) {
+ if (!Character.isJavaIdentifierPart(jname.charAt(k))) {
+ continue doList;
+ }
+ }
+
+ if (!pkgCand) {
+ try {
+ int acc = checkAccess(new BufferedInputStream(
+ new FileInputStream(cand)));
+ if ((acc == -1) || filterByAccess(jname, acc)) {
+ continue;
+ }
+ } catch (IOException e) {
+ continue;
+ }
+ }
+
+ if (instantiate) {
+ if (pkgCand) {
+ jpkg.addPackage(jname);
+ } else {
+ jpkg.addClass(jname, Py.findClass(jpkg.__name__ + "." + jname));
+ }
+ }
+
+ ret.append(name);
+
+ }
+ }
+
+ }
+
+ /**
+ * Add directory dir (if exists) to {@link #searchPath}.
+ */
+ public void addDirectory(File dir) {
+ try {
+ if (dir.getPath().length() == 0) {
+ this.searchPath.append(Py.EmptyString);
+ } else {
+ this.searchPath.append(new PyString(dir.getCanonicalPath()));
+ }
+ } catch (IOException e) {
+ warning("skipping bad directory, '" + dir + "'");
+ }
+ }
+
+ // ??pending:
+ // Uses simply split and not a StringTokenizer+trim to adhere to
+ // sun jvm parsing of classpath.
+ // E.g. "a;" is parsed by sun jvm as a, ""; the latter is interpreted
+ // as cwd. jview trims and cwd is per default in classpath.
+ // The logic here should work for both(...). Need to distinguish?
+ // This code does not avoid duplicates in searchPath.
+ // Should cause no problem (?).
+
+ /**
+ * Adds "classpath" entry. Calls {@link #addDirectory} if path refers to a
+ * dir, {@link #addJarToPackages(java.io.File, boolean)} with param cache
+ * true if path refers to a jar.
+ */
+ public void addClassPath(String path) {
+ PyList paths = new PyString(path).split(java.io.File.pathSeparator);
+
+ for (int i = 0; i < paths.__len__(); i++) {
+ String entry = paths.pyget(i).toString();
+ if (entry.endsWith(".jar") || entry.endsWith(".zip")) {
+ addJarToPackages(new File(entry), true);
+ } else {
+ File dir = new File(entry);
+ if (entry.length() == 0 || dir.isDirectory()) {
+ addDirectory(dir);
+ }
+ }
+ }
+ }
+
+ //Copied from CachedJarsPackageManager
+ /**
+ * Filter class/pkg by name helper method - hook. The default impl. is used
+ * by {@link #addJarToPackages} in order to filter out classes whose name
+ * contains '$' (e.g. inner classes,...). Should be used or overriden by
+ * derived classes too. Also to be used in {@link #doDir}.
+ *
+ * @param name class/pkg name
+ * @param pkg if true, name refers to a pkg
+ * @return true if name must be filtered out
+ */
+ protected boolean filterByName(String name, boolean pkg) {
+ return name.indexOf('$') != -1;
+ }
+
+ /**
+ * Filter class by access perms helper method - hook. The default impl. is
+ * used by {@link #addJarToPackages} in order to filter out non-public
+ * classes. Should be used or overriden by derived classes too. Also to be
+ * used in {@link #doDir}. Access perms can be read with
+ * {@link #checkAccess}.
+ *
+ * @param name class name
+ * @param acc class access permissions as int
+ * @return true if name must be filtered out
+ */
+ protected boolean filterByAccess(String name, int acc) {
+ return (acc & Modifier.PUBLIC) != Modifier.PUBLIC;
+ }
+
+ private boolean indexModified;
+
+ private Map<String,JarXEntry> jarfiles;
+
+ private static String listToString(List<String> list) {
+ int n = list.size();
+ StringBuilder ret = new StringBuilder();
+ for (int i = 0; i < n; i++) {
+ ret.append(list.get(i));
+ if (i < n - 1) {
+ ret.append(",");
+ }
+ }
+ return ret.toString();
+ }
+
+ // Add a single class from zipFile to zipPackages
+ // Only add valid, public classes
+ private void addZipEntry(Map<String, List<String>[]> zipPackages, ZipEntry entry,
+ ZipInputStream zip) throws IOException {
+ String name = entry.getName();
+ // System.err.println("entry: "+name);
+ if (!name.endsWith(".class")) {
+ return;
+ }
+
+ char sep = '/';
+ int breakPoint = name.lastIndexOf(sep);
+ if (breakPoint == -1) {
+ breakPoint = name.lastIndexOf('\\');
+ sep = '\\';
+ }
+
+ String packageName;
+ if (breakPoint == -1) {
+ packageName = "";
+ } else {
+ packageName = name.substring(0, breakPoint).replace(sep, '.');
+ }
+
+ String className = name.substring(breakPoint + 1, name.length() - 6);
+
+ if (filterByName(className, false)) {
+ return;
+ }
+
+ List<String>[] vec = zipPackages.get(packageName);
+ if (vec == null) {
+ vec = new List[] { Generic.list(), Generic.list() };
+ zipPackages.put(packageName, vec);
+ }
+ int access = checkAccess(zip);
+ if ((access != -1) && !filterByAccess(name, access)) {
+ vec[0].add(className);
+ } else {
+ vec[1].add(className);
+ }
+ }
+
+ // Extract all of the packages in a single jarfile
+ private Map<String, String> getZipPackages(InputStream jarin) throws IOException {
+ Map<String, List<String>[]> zipPackages = Generic.map();
+
+ ZipInputStream zip = new ZipInputStream(jarin);
+
+ ZipEntry entry;
+ while ((entry = zip.getNextEntry()) != null) {
+ addZipEntry(zipPackages, entry, zip);
+ zip.closeEntry();
+ }
+
+ // Turn each vector into a comma-separated String
+ Map<String, String> transformed = Generic.map();
+ for (String key : zipPackages.keySet()) {
+ List<String>[] vec = zipPackages.get(key);
+ String classes = listToString(vec[0]);
+ if (vec[1].size() > 0) {
+ classes += '@' + listToString(vec[1]);
+ }
+ transformed.put(key, classes);
+ }
+
+ return transformed;
+ }
+
+ /**
+ * Gathers classes info from jar specified by jarurl URL. Eventually just
+ * using previously cached info. Eventually updated info is not cached.
+ * Persistent cache storage access goes through inOpenCacheFile() and
+ * outCreateCacheFile().
+ */
+ public void addJarToPackages(java.net.URL jarurl) {
+ addJarToPackages(jarurl, null, false);
+ }
+
+ /**
+ * Gathers classes info from jar specified by jarurl URL. Eventually just
+ * using previously cached info. Eventually updated info is (re-)cached if
+ * param cache is true. Persistent cache storage access goes through
+ * inOpenCacheFile() and outCreateCacheFile().
+ */
+ public void addJarToPackages(URL jarurl, boolean cache) {
+ addJarToPackages(jarurl, null, cache);
+ }
+
+ /**
+ * Gathers classes info from jar specified by File jarfile. Eventually just
+ * using previously cached info. Eventually updated info is not cached.
+ * Persistent cache storage access goes through inOpenCacheFile() and
+ * outCreateCacheFile().
+ */
+ public void addJarToPackages(File jarfile) {
+ addJarToPackages(null, jarfile, false);
+ }
+
+ /**
+ * Gathers classes info from jar specified by File jarfile. Eventually just
+ * using previously cached info. Eventually updated info is (re-)cached if
+ * param cache is true. Persistent cache storage access goes through
+ * inOpenCacheFile() and outCreateCacheFile().
+ */
+ public void addJarToPackages(File jarfile, boolean cache) {
+ addJarToPackages(null, jarfile, cache);
+ }
+
+ private void addJarToPackages(URL jarurl, File jarfile, boolean cache) {
+ try {
+ boolean caching = this.jarfiles != null;
+
+ URLConnection jarconn = null;
+ boolean localfile = true;
+
+ if (jarfile == null) {
+ jarconn = jarurl.openConnection();
+ // This is necessary because 'file:' url-connections
+ // return always 0 through getLastModified (bug?).
+ // And in order to handle localfiles (from urls too)
+ // uniformly.
+ if (jarconn.getURL().getProtocol().equals("file")) {
+ // ??pending: need to use java2 URLDecoder.decode?
+ String jarfilename = jarurl.getFile();
+ jarfilename = jarfilename.replace('/', File.separatorChar);
+ jarfile = new File(jarfilename);
+ } else {
+ localfile = false;
+ }
+ }
+
+ if (localfile && !jarfile.exists()) {
+ return;
+ }
+
+ Map<String, String> zipPackages = null;
+
+ long mtime = 0;
+ String jarcanon = null;
+ JarXEntry entry = null;
+ boolean brandNew = false;
+
+ if (caching) {
+
+ if (localfile) {
+ mtime = jarfile.lastModified();
+ jarcanon = jarfile.getCanonicalPath();
+ } else {
+ mtime = jarconn.getLastModified();
+ jarcanon = jarurl.toString();
+ }
+
+ entry = this.jarfiles.get(jarcanon);
+
+ if ((entry == null || !(new File(entry.cachefile).exists()))
+ && cache) {
+ message("processing new jar, '" + jarcanon + "'");
+
+ String jarname;
+ if (localfile) {
+ jarname = jarfile.getName();
+ } else {
+ jarname = jarurl.getFile();
+ int slash = jarname.lastIndexOf('/');
+ if (slash != -1)
+ jarname = jarname.substring(slash + 1);
+ }
+ jarname = jarname.substring(0, jarname.length() - 4);
+
+ entry = new JarXEntry(jarname);
+ this.jarfiles.put(jarcanon, entry);
+
+ brandNew = true;
+ }
+
+ if (mtime != 0 && entry != null && entry.mtime == mtime) {
+ zipPackages = readCacheFile(entry, jarcanon);
+ }
+
+ }
+
+ if (zipPackages == null) {
+ caching = caching && cache;
+
+ if (caching) {
+ this.indexModified = true;
+ if (entry.mtime != 0) {
+ message("processing modified jar, '" + jarcanon + "'");
+ }
+ entry.mtime = mtime;
+ }
+
+ InputStream jarin;
+ if (jarconn == null) {
+ jarin = new BufferedInputStream(
+ new FileInputStream(jarfile));
+ } else {
+ jarin = jarconn.getInputStream();
+ }
+
+ zipPackages = getZipPackages(jarin);
+
+ if (caching) {
+ writeCacheFile(entry, jarcanon, zipPackages, brandNew);
+ }
+ }
+
+ addPackages(zipPackages, jarcanon);
+ } catch (IOException ioe) {
+ // silently skip any bad directories
+ warning("skipping bad jar, '"
+ + (jarfile != null ? jarfile.toString() : jarurl.toString())
+ + "'");
+ }
+
+ }
+
+ private void addPackages(Map<String,String> zipPackages, String jarfile) {
+ for (Entry<String,String> entry : zipPackages.entrySet()) {
+ String pkg = entry.getKey();
+ String classes = entry.getValue();
+
+ int idx = classes.indexOf('@');
+ if (idx >= 0 && Options.respectJavaAccessibility) {
+ classes = classes.substring(0, idx);
+ }
+
+ makeJavaPackage(pkg, classes, jarfile);
+ }
+ }
+
+ // Read in cache file storing package info for a single .jar
+ // Return null and delete this cachefile if it is invalid
+ private Map<String, String> readCacheFile(JarXEntry entry, String jarcanon) {
+ String cachefile = entry.cachefile;
+ long mtime = entry.mtime;
+
+ debug("reading cache, '" + jarcanon + "'");
+
+ try {
+ DataInputStream istream = inOpenCacheFile(cachefile);
+ String old_jarcanon = istream.readUTF();
+ long old_mtime = istream.readLong();
+ if ((!old_jarcanon.equals(jarcanon)) || (old_mtime != mtime)) {
+ comment("invalid cache file: " + cachefile + ", " + jarcanon
+ + ":" + old_jarcanon + ", " + mtime + ":" + old_mtime);
+ deleteCacheFile(cachefile);
+ return null;
+ }
+ Map<String, String> packs = Generic.map();
+ try {
+ while (true) {
+ String packageName = istream.readUTF();
+ String classes = istream.readUTF();
+ packs.put(packageName, classes);
+ }
+ } catch (EOFException eof) {
+ ;
+ }
+ istream.close();
+
+ return packs;
+ } catch (IOException ioe) {
+ // if (cachefile.exists()) cachefile.delete();
+ return null;
+ }
+ }
+
+ // Write a cache file storing package info for a single .jar
+ private void writeCacheFile(JarXEntry entry, String jarcanon,
+ Map<String,String> zipPackages, boolean brandNew) {
+ try {
+ DataOutputStream ostream = outCreateCacheFile(entry, brandNew);
+ ostream.writeUTF(jarcanon);
+ ostream.writeLong(entry.mtime);
+ comment("rewriting cachefile for '" + jarcanon + "'");
+
+ for (String packageName : zipPackages.keySet()) {
+ String classes = zipPackages.get(packageName);
+ ostream.writeUTF(packageName);
+ ostream.writeUTF(classes);
+ }
+ ostream.close();
+ } catch (IOException ioe) {
+ warning("can't write cache file for '" + jarcanon + "'");
+ }
+ }
+
+ /**
+ * Initializes cache. Eventually r...
[truncated message content] |
