tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Bootstrap.java ContextConfig.java LocalStrings.properties
Date Fri, 22 Sep 2000 23:52:54 GMT
craigmcc    00/09/22 16:52:54

  Modified:    catalina/src/share/org/apache/catalina/loader
                        StandardLoader.java
               catalina/src/share/org/apache/catalina/startup
                        Bootstrap.java ContextConfig.java
                        LocalStrings.properties
  Added:       catalina/src/share/org/apache/catalina/loader
                        StandardClassLoader.java
  Log:
  Add a new classloader (used both by the bootstrap class and for webapps)
  that extends URLClassLoader instead of doing everything itself.  At the
  moment, there are two restrictions (compared to the previous
  implementation):
  
  * When checking for auto-reload, only unpacked classes in the
    WEB-INF/classes directory are checked (not JAR files in WEB-INF/lib).
  
  * Resources loaded via ClassLoader.getResourceAsStream() are not cached.
  
  This class loader will become the basis for implementing the ability to
  run web apps directly out of the WAR file, as well as supporting the new
  servlet 2.3 requirements related do JAR version checking.
  
  Revision  Changes    Path
  1.5       +10 -7     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
  
  Index: StandardLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StandardLoader.java	2000/09/21 20:06:05	1.4
  +++ StandardLoader.java	2000/09/22 23:52:50	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.4 2000/09/21 20:06:05 craigmcc Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/09/21 20:06:05 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.5 2000/09/22 23:52:50 craigmcc Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/09/22 23:52:50 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * is not present, the system class loader will be used instead.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.4 $ $Date: 2000/09/21 20:06:05 $
  + * @version $Revision: 1.5 $ $Date: 2000/09/22 23:52:50 $
    */
   
   public final class StandardLoader
  @@ -180,7 +180,8 @@
        * <code>Reloader</code> interface.
        */
       private String loaderClass =
  -	"org.apache.catalina.loader.FileClassLoader";
  +        //	"org.apache.catalina.loader.FileClassLoader";
  +	"org.apache.catalina.loader.StandardClassLoader";
   
   
       /**
  @@ -541,9 +542,11 @@
   	    classLoader = (Reloader) clazz.newInstance();
   	    */
   	    if (parentClassLoader == null)
  -	        classLoader = new FileClassLoader();
  +                //	        classLoader = new FileClassLoader();
  +	        classLoader = new StandardClassLoader();
   	    else
  -	        classLoader = new FileClassLoader(parentClassLoader);
  +                //	        classLoader = new FileClassLoader(parentClassLoader);
  +	        classLoader = new StandardClassLoader(parentClassLoader);
   	    for (int i = 0; i < repositories.length; i++)
   		classLoader.addRepository(repositories[i]);
   	    classLoader.addRestricted("org.apache.catalina.");
  
  
  
  1.1                  jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
  
  Index: StandardClassLoader.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.1 2000/09/22 23:52:50 craigmcc Exp $
   * $Revision: 1.1 $
   * $Date: 2000/09/22 23:52:50 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  
  package org.apache.catalina.loader;
  
  import java.io.File;
  import java.io.InputStream;
  import java.io.IOException;
  import java.net.MalformedURLException;
  import java.net.URL;
  import java.net.URLClassLoader;
  import java.util.Enumeration;
  import java.util.HashMap;
  
  
  /**
   * Subclass implementation of <b>java.net.URLClassLoader</b> that knows how
   * to load classes from disk directories, as well as local and remote JAR
   * files.  It also implements the <code>Reloader</code> interface, to provide
   * automatic reloading support to <code>StandardLoader</code>.
   * <p>
   * In all cases, URLs must conform to the contract specified by
   * <code>URLClassLoader</code> - any URL that ends with a "/" character is
   * assumed to represent a directory; all other URLs are assumed to be the
   * address of a JAR file.
   * <p>
   * <strong>IMPLEMENTATION NOTE</strong> - Local repositories are searched in
   * the order they are added via the initial constructor and/or any subsequent
   * calls to <code>addRepository()</code>.
   * <p>
   * <strong>IMPLEMENTATION NOTE</strong> - At present, there are no dependencies
   * from this class to any other Catalina class, so that it could be used
   * independently.
   *
   * @author Craig R. McClanahan
   * @version $Revision: 1.1 $ $Date: 2000/09/22 23:52:50 $
   */
  
  public class StandardClassLoader
      extends URLClassLoader
      implements Reloader {
  
  
      // ----------------------------------------------------------- Constructors
  
  
      /**
       * Construct a new ClassLoader with no defined repositories and no
       * parent ClassLoader.
       */
      public StandardClassLoader() {
  
          super(new URL[0]);
  
      }
  
  
      /**
       * Construct a new ClassLoader with no defined repositories and the
       * specified parent ClassLoader.
       *
       * @param parent The parent ClassLoader
       */
      public StandardClassLoader(ClassLoader parent) {
  
          super((new URL[0]), parent);
  
      }
  
  
      /**
       * Construct a new ClassLoader with the specified repositories and
       * no parent ClassLoader.
       *
       * @param repositories The initial set of repositories
       */
      public StandardClassLoader(String repositories[]) {
  
          super(convert(repositories));
          if (repositories != null) {
              for (int i = 0; i < repositories.length; i++)
                  addRepositoryInternal(repositories[i]);
          }
  
      }
  
  
      /**
       * Construct a new ClassLoader with the specified repositories and
       * parent ClassLoader.
       *
       * @param repositories The initial set of repositories
       * @param parent The parent ClassLoader
       */
      public StandardClassLoader(String repositories[], ClassLoader parent) {
  
          super(convert(repositories), parent);
          if (repositories != null) {
              for (int i = 0; i < repositories.length; i++)
                  addRepositoryInternal(repositories[i]);
          }
  
      }
  
  
      /**
       * Construct a new ClassLoader with the specified repositories and
       * parent ClassLoader.
       *
       * @param repositories The initial set of repositories
       * @param parent The parent ClassLoader
       */
      public StandardClassLoader(URL repositories[], ClassLoader parent) {
  
          super(repositories, parent);
          if (repositories != null) {
              for (int i = 0; i < repositories.length; i++)
                  addRepositoryInternal(repositories[i].toString());
          }
  
      }
  
  
      // ----------------------------------------------------- Instance Variables
  
  
      /**
       * The set of fully qualified class or resource names to which access
       * will be allowed (if they exist) by this class loader, even if the
       * class or resource name would normally be restricted.
       */
      protected String allowed[] = new String[0];
  
  
      /**
       * The cache of ClassCacheEntries for classes we have loaded locally,
       * keyed by class name.
       */
      protected HashMap classCache = new HashMap();
  
  
      /**
       * The debugging detail level of this component.
       */
      protected int debug = 0;
  
  
      /**
       * Should this class loader delegate to the parent class loader
       * <strong>before</strong> searching its own repositories (i.e. the
       * usual Java2 delegation model)?  If set to <code>false</code>,
       * this class loader will search its own repositories first, and
       * delegate to the parent only if the class or resource is not
       * found locally.
       */
      protected boolean delegate = false;
  
  
      /**
       * The list of local repositories, in the order they should be searched
       * for locally loaded classes or resources.
       */
      protected String repositories[] = new String[0];
  
  
      /**
       * The set of class name prefixes to which access should be restricted.
       * A request for a class or resource that starts with this prefix will
       * fail with an appropriate exception or <code>null</code> return value,
       * unless that specific class or resource name is on the allowed list.
       */
      protected String restricted[] = new String[0];
  
  
      /**
       * The set of class and resource name prefixes that should be allowed,
       * but only from the underlying system class loader.
       */
      protected String systems[] = { "java." };
  
  
      // ------------------------------------------------------------- Properties
  
  
      /**
       * Return the debugging detail level for this component.
       */
      public int getDebug() {
  
          return (this.debug);
  
      }
  
  
      /**
       * Set the debugging detail level for this component.
       *
       * @param debug The new debugging detail level
       */
      public void setDebug(int debug) {
  
          this.debug = debug;
  
      }
  
  
      /**
       * Return the "delegate first" flag for this class loader.
       */
      public boolean getDelegate() {
  
          return (this.delegate);
  
      }
  
  
      /**
       * Set the "delegate first" flag for this class loader.
       *
       * @param delegate The new "delegate first" flag
       */
      public void setDelegate(boolean delegate) {
  
          this.delegate = delegate;
  
      }
  
  
      // ------------------------------------------------------- Reloader Methods
  
  
      /**
       * Add a new fully qualified class or resource name to which access will be
       * allowed, even if the class or resource name would otherwise match one
       * of the restricted patterns.
       *
       * @param name Class or resource name to allow access for
       */
      public void addAllowed(String name) {
  
  	if (debug >= 1)
  	    log("addAllowed(" + name + ")");
  
  	synchronized (allowed) {
  	    String results[] = new String[allowed.length + 1];
              System.arraycopy(allowed, 0, results, 0, allowed.length);
  	    results[allowed.length] = name;
  	    allowed = results;
  	}
  
      }
  
  
      /**
       * Add a new repository to the set of places this ClassLoader can look for
       * classes to be loaded.
       *
       * @param repository Name of a source of classes to be loaded, such as a
       *  directory pathname, a JAR file pathname, or a ZIP file pathname
       *
       * @exception IllegalArgumentException if the specified repository is
       *  invalid or does not exist
       */
      public void addRepository(String repository) {
  
          if (debug >= 1)
              log("addRespository(" + repository + ")");
  
          // Add this repository to our underlying class loader
          try {
              super.addURL(new URL(repository));
          } catch (MalformedURLException e) {
              throw new IllegalArgumentException(e.toString());
          }
  
          // Add this repository to our internal list
          addRepositoryInternal(repository);
  
          ;       // FIXME: addRepository()
  
      }
  
  
      /**
       * Add a fully qualified class or resource name prefix that, if it matches
       * the name of a requested class or resource, will cause access to that
       * class or resource to fail (unless the complete name is on the allowed
       * list).
       *
       * @param prefix The restricted prefix
       */
      public void addRestricted(String prefix) {
  
  	if (debug >= 1)
  	    log("addRestricted(" + prefix + ")");
  
  	synchronized (restricted) {
  	    String results[] = new String[restricted.length + 1];
              System.arraycopy(restricted, 0, results, 0, restricted.length);
  	    results[restricted.length] = prefix;
  	    restricted = results;
  	}
  
      }
  
  
      /**
       * Add a fully qualified class or resource name prefix that, if it matches
       * the name of a requested class or resource, will cause access to that
       * class or resource to be attempted in the system class loader only
       * (bypassing the repositories defined in this class loader).  By default,
       * the <code>java.</code> prefix is defined as a system prefix.
       *
       * @param prefix The system prefix
       */
      public void addSystem(String prefix) {
  
  	if (debug >= 1)
  	    log("addSystem(" + prefix + ")");
  
  	synchronized (systems) {
  	    String results[] = new String[systems.length + 1];
              System.arraycopy(systems, 0, results, 0, systems.length);
  	    results[systems.length] = prefix;
  	    systems = results;
  	}
  
      }
  
  
      /**
       * Return a String array of the allowed class or resource name list
       * for this class loader.  If there are none, a zero-length array
       * is returned.
       */
      public String[] findAllowed() {
  
  	return (allowed);
  
      }
  
  
      /**
       * Return a String array of the current repositories for this class
       * loader.  If there are no repositories, a zero-length array is
       * returned.
       */
      public String[] findRepositories() {
  
          return (repositories);
  
      }
  
  
      /**
       * Return a String array of the restricted class or resource name prefixes
       * for this class loader.  If there are none, a zero-length array
       * is returned.
       */
      public String[] findRestricted() {
  
  	return (restricted);
  
      }
  
  
      /**
       * Return a Striong array of the sytsem class or resource name prefixes
       * for this class loader.  If there are none, a zero-length array
       * is returned.
       */
      public String[] findSystem() {
  
  	return (systems);
  
      }
  
  
      /**
       * Have one or more classes or resources been modified so that a reload
       * is appropriate?
       * <p>
       * <strong>IMPLEMENTATION NOTE</strong> - We assume that anything loaded
       * from a JAR file will never need to be reloaded unless the JAR file
       * itself has been updated.  Unpacked classes or resources loaded from
       * a directory are checked individually.
       */
      public boolean modified() {
  
          if (debug >= 2)
              log("modified()");
  
          // Build a list of the classes we currently have cached
          if (classCache.size() < 1)
              return (false);
          ClassCacheEntry entries[] = new ClassCacheEntry[0];
          synchronized (classCache) {
              entries =
                  (ClassCacheEntry[]) classCache.values().toArray(entries);
          }
  
          // Check for modifications to any of these classes
          for (int i = 0; i < entries.length; i++) {
              if (!(entries[i].origin instanceof File))
                  continue;
              File origin = (File) entries[i].origin;
              if (entries[i].lastModified != origin.lastModified()) {
                  if (debug >= 2)
                      log("  Class '" + entries[i].loadedClass.getName() +
                          "' was modified");
                  return (true);
              }
          }
  
          // No classes have been modified
          return (false);
  
      }
  
  
      // ---------------------------------------------------- ClassLoader Methods
  
  
      /**
       * Find the specified class in our local repositories, if possible.  If
       * not found, throw <code>ClassNotFoundException</code>.
       *
       * @param name Name of the class to be loaded
       *
       * @exception ClassNotFoundException if the class was not found
       */
      public Class findClass(String name) throws ClassNotFoundException {
  
          if (debug >= 3)
              log("    findClass(" + name + ")");
  
          // Ask our superclass to locate this class, if possible
          // (throws ClassNotFoundException if it is not found)
          Class clazz = null;
          try {
              clazz = super.findClass(name);
              if (clazz == null) {
                  if (debug >= 3)
                      log("    --> Returning ClassNotFoundException");
                  throw new ClassNotFoundException(name);
              }
          } catch (ClassNotFoundException e) {
              if (debug >= 3)
                  log("    --> Passing on ClassNotFoundException");
              throw e;
          }
  
          // Re-locate the class ourselves to track modifications if possible
          for (int i = 0; i < repositories.length; i++) {
              if (!repositories[i].endsWith("/"))
                  continue;
              String pathname =
                  repositories[i].substring(0, repositories[i].length() - 1);
              if (pathname.startsWith("file://"))
                  pathname = pathname.substring(7);
              else if (pathname.startsWith("file:"))
                  pathname = pathname.substring(5);
              pathname += File.separatorChar +
                  name.replace('.', File.separatorChar) + ".class";
              File file = new File(pathname);
              if (file.exists() && file.canRead()) {
                  if (debug >= 3)
                      log("    Caching from '" + file.getAbsolutePath() +
                          "' modified '" +
                          (new java.sql.Timestamp(file.lastModified())) + "'");
                  classCache.put(name, new ClassCacheEntry(clazz, file,
                                                           file.lastModified()));
              }
          }
  
          // Return the class we have located
          return (clazz);
  
      }
  
  
      /**
       * Find the specified resource in our local repository, and return a
       * <code>URL</code> refering to it, or <code>null</code> if
this resource
       * cannot be found.
       *
       * @param name Name of the resource to be found
       */
      public URL findResource(String name) {
  
          if (debug >= 3)
              log("    findResource(" + name + ")");
  
          // Check for attempts to load restricted classes
          if (restricted(name)) {
              if (debug >= 2)
                  log("  Rejecting restricted resource name");
              return (null);
          }
  
          URL url = super.findResource(name);
          if (debug >= 3) {
              if (url != null)
                  log("    --> Returning '" + url.toString() + "'");
              else
                  log("    --> Resource not found, returning null");
          }
          return (url);
  
      }
  
  
      /**
       * Return an enumeration of <code>URLs</code> representing all of the
       * resources with the given name.  If no resources with this name are
       * found, return an empty enumeration.
       *
       * @param name Name of the resources to be found
       *
       * @exception IOException if an input/output error occurs
       */
      public Enumeration findResources(String name) throws IOException {
  
          if (debug >= 3)
              log("    findResources(" + name + ")");
          return (super.findResources(name));
  
      }
  
  
      /**
       * Find the resource with the given name.  A resource is some data
       * (images, audio, text, etc.) that can be accessed by class code in a
       * way that is independent of the location of the code.  The name of a
       * resource is a "/"-separated path name that identifies the resource.
       * If the resource cannot be found, return <code>null</code>.
       * <p>
       * This method searches according to the following algorithm, returning
       * as soon as it finds the appropriate URL.  If the resource cannot be
       * found, returns <code>null</code>.
       * <ul>
       * <li>If the <code>delegate</code> property is set to <code>true</code>,
       *     call the <code>getResource()</code> method of the parent class
       *     loader, if any.</li>
       * <li>Call <code>findResource()</code> to find this resource in our
       *     locally defined repositories.</li>
       * <li>Call the <code>getResource()</code> method of the parent class
       *     loader, if any.</li>
       * </ul>
       *
       * @param name Name of the resource to return a URL for
       */
      public URL getResource(String name) {
  
          if (debug >= 2)
              log("getResource(" + name + ")");
          URL url = null;
          boolean isSystem = system(name);
  
          // (1) Delegate to parent if requested
          if (delegate || isSystem) {
              if (debug >= 3)
                  log("  Delegating to parent classloader");
              ClassLoader parent = getParent();
              if (parent == null)
                  parent = getSystemClassLoader();
              url = parent.getResource(name);
              if (url != null) {
                  if (debug >= 2)
                      log("  --> Returning '" + url.toString() + "'");
                  return (url);
              }
          }
  
          // (2) Search local repositories
          if (!isSystem) {
              if (debug >= 3)
                  log("  Searching local repositories");
              url = findResource(name);
              if (url != null) {
                  if (debug >= 2)
                      log("  --> Returning '" + url.toString() + "'");
                  return (url);
              }
          }
  
          // (3) Delegate to parent unconditionally
          ClassLoader parent = getParent();
          if (parent == null)
              parent = getSystemClassLoader();
          url = parent.getResource(name);
          if (url != null) {
              if (debug >= 2)
                  log("  --> Returning '" + url.toString() + "'");
              return (url);
          }
  
          // (4) Resource was not found
          if (debug >= 2)
              log("  --> Resource not found, returning null");
          return (null);
  
      }
  
  
      /**
       * Find the resource with the given name, and return an input stream
       * that can be used for reading it.  The search order is as described
       * for <code>getResource()</code>, after checking to see if the resource
       * data has been previously cached.  If the resource cannot be found,
       * return <code>null</code>.
       *
       * @param name Name of the resource to return an input stream for
       */
      public InputStream getResourceAsStream(String name) {
  
          if (debug >= 2)
              log("getResourceAsStream(" + name + ")");
          InputStream stream = null;
          boolean isSystem = system(name);
  
          // (0) Check for a cached copy of this resource
          stream = findLoadedResource(name);
          if (stream != null) {
              if (debug >= 2)
                  log("  --> Returning stream from cache");
              return (stream);
          }
  
          // (1) Delegate to parent if requested
          if (delegate || isSystem) {
              if (debug >= 3)
                  log("  Delegating to parent classloader");
              ClassLoader parent = getParent();
              if (parent == null)
                  parent = getSystemClassLoader();
              stream = parent.getResourceAsStream(name);
              if (stream != null) {
                  // FIXME - cache???
                  if (debug >= 2)
                      log("  --> Returning stream from parent");
                  return (stream);
              }
          }
  
          // (2) Search local repositories
          if (!isSystem) {
              if (debug >= 3)
                  log("  Searching local repositories");
              URL url = findResource(name);
              if (url != null) {
                  // FIXME - cache???
                  if (debug >= 2)
                      log("  --> Returning stream from local");
                  try {
                      return (url.openStream());
                  } catch (IOException e) {
                      log("url.openStream(" + url.toString() + ")", e);
                      return (null);
                  }
              }
          }
  
          // (3) Delegate to parent unconditionally
          if (delegate) {
              if (debug >= 3)
                  log("  Delegating to parent classloader");
              ClassLoader parent = getParent();
              if (parent == null)
                  parent = getSystemClassLoader();
              stream = parent.getResourceAsStream(name);
              if (stream != null) {
                  // FIXME - cache???
                  if (debug >= 2)
                      log("  --> Returning stream from parent");
                  return (stream);
              }
          }
  
          // (4) Resource was not found
          if (debug >= 2)
              log("  --> Resource not found, returning null");
          return (null);
  
      }
  
  
      /**
       * Load the class with the specified name.  This method searches for
       * classes in the same manner as <code>loadClass(String, boolean)</code>
       * with <code>false</code> as the second argument.
       *
       * @param name Name of the class to be loaded
       *
       * @exception ClassNotFoundException if the class was not found
       */
      public Class loadClass(String name) throws ClassNotFoundException {
  
          return (loadClass(name, false));
  
      }
  
  
      /**
       * Load the class with the specified name, searching using the following
       * algorithm until it finds and returns the class.  If the class cannot
       * be found, returns <code>ClassNotFoundException</code>.
       * <ul>
       * <li>Call <code>findLoadedClass(String)</code> to check if the
       *     class has already been loaded.  If it has, the same
       *     <code>Class</code> object is returned.</li>
       * <li>If the <code>delegate</code> property is set to <code>true</code>,
       *     call the <code>loadClass()</code> method of the parent class
       *     loader, if any.</li>
       * <li>Call <code>findClass()</code> to find this class in our locally
       *     defined repositories.</li>
       * <li>Call the <code>loadClass()</code> method of our parent
       *     class loader, if any.</li>
       * </ul>
       * If the class was found using the above steps, and the
       * <code>resolve</code> flag is <code>true</code>, this method
will then
       * call <code>resolveClass(Class)</code> on the resulting Class object.
       *
       * @param name Name of the class to be loaded
       * @param resolve If <code>true</code> then resolve the class
       *
       * @exception ClassNotFoundException if the class was not found
       */
      public Class loadClass(String name, boolean resolve)
          throws ClassNotFoundException {
  
          if (debug >= 2)
              log("loadClass(" + name + ", " + resolve + ")");
          Class clazz = null;
          boolean isSystem = system(name);
  
          // Check for attempts to load restricted classes
          if (restricted(name)) {
              if (debug >= 2)
                  log("  Rejecting restricted class name");
              throw new ClassNotFoundException("Restricted Clas: " + name);
          }
  
          // (0) Check our previously loaded class cache
          clazz = findLoadedClass(name);
          if (clazz != null) {
              if (debug >= 3)
                  log("  Returning class from cache");
              if (resolve)
                  resolveClass(clazz);
              return (clazz);
          }
  
          // (1) Delegate to our parent if requested
          if (delegate || isSystem) {
              if (debug >= 3)
                  log("  Delegating to parent classloader");
              ClassLoader parent = getParent();
              if (parent == null)
                  parent = getSystemClassLoader();
              try {
                  clazz = parent.loadClass(name);
                  if (clazz != null) {
                      if (debug >= 3)
                          log("  Loading class from parent");
                      if (resolve)
                          resolveClass(clazz);
                      return (clazz);
                  }
              } catch (ClassNotFoundException e) {
                  ;
              }
          }
  
          // (2) Search local repositories
          if (!isSystem) {
              if (debug >= 3)
                  log("  Searching local repositories");
              try {
                  clazz = findClass(name);
                  if (clazz != null) {
                      if (debug >= 3)
                          log("  Loading class from local repository");
                      if (resolve)
                          resolveClass(clazz);
                      return (clazz);
                  }
              } catch (ClassNotFoundException e) {
                  ;
              }
          }
  
          // (3) Delegate to parent unconditionally
          if (!delegate && !isSystem) {
              if (debug >= 3)
                  log("  Delegating to parent classloader");
              ClassLoader parent = getParent();
              if (parent == null)
                  parent = getSystemClassLoader();
              try {
                  clazz = parent.loadClass(name);
                  if (clazz != null) {
                      if (debug >= 3)
                          log("  Loading class from parent");
                      if (resolve)
                          resolveClass(clazz);
                      return (clazz);
                  }
              } catch (ClassNotFoundException e) {
                  ;
              }
          }
  
          // This class was not found
          throw new ClassNotFoundException(name);
  
      }
  
  
      // ------------------------------------------------------ Protected Methods
  
  
      /**
       * Add a repository to our internal array only.
       *
       * @param repository The new repository
       */
      protected void addRepositoryInternal(String repository) {
  
  	synchronized (repositories) {
  	    String results[] = new String[repositories.length + 1];
              System.arraycopy(repositories, 0, results, 0, repositories.length);
  	    results[repositories.length] = repository;
  	    repositories = results;
  	}
  
      }
  
  
      /**
       * Convert an array of String to an array of URL and return it.
       *
       * @param input The array of String to be converted
       */
      protected static URL[] convert(String input[]) {
  
          URL url[] = new URL[input.length];
          for (int i = 0; i < url.length; i++) {
              try {
                  url[i] = new URL(input[i]);
              } catch (MalformedURLException e) {
                  url[i] = null;
              }
          }
          return (url);
  
      }
  
  
      /**
       * Finds the resource with the given name if it has previously been
       * loaded and cached by this class loader, and return an input stream
       * to the resource data.  If this resource has not been cached, return
       * <code>null</code>.
       *
       * @param name Name of the resource to return
       */
      protected InputStream findLoadedResource(String name) {
  
          return (null);  // FIXME - findLoadedResource()
  
      }
  
  
      /**
       * Log a debugging output message.
       *
       * @param message Message to be logged
       */
      private void log(String message) {
  
  	System.out.println("StandardClassLoader: " + message);
  
      }
  
  
      /**
       * Log a debugging output message with an exception.
       *
       * @param message Message to be logged
       * @param throwable Exception to be logged
       */
      private void log(String message, Throwable throwable) {
  
  	System.out.println("StandardClassLoader: " + message);
  	throwable.printStackTrace(System.out);
  
      }
  
  
      /**
       * Is this a class or resource that should not be allowed to load
       * in this class loader?
       *
       * @param name Name of the class or resource to be checked
       */
      private boolean restricted(String name) {
  
  	for (int i = 0; i < allowed.length; i++) {
  	    if (name.equals(allowed[i]))
  		return (false);
  	}
  
  	for (int i = 0; i < restricted.length; i++) {
  	    if (name.startsWith(restricted[i]))
  		return (true);
  	}
  
  	return (false);
  
      }
  
  
      /**
       * Is this a class or resource that should be loaded only by the
       * system class loader?
       *
       * @param name Name of the class or resource to be checked
       */
      private boolean system(String name) {
  
          for (int i = 0; i < systems.length; i++) {
              if (name.startsWith(systems[i]))
                  return (true);
          }
          return (false);
  
      }
  
  
      // ------------------------------------------------------- Private Classes
  
  
      /**
       * The cache entry for a particular class loaded by this class loader.
       */
      private static class ClassCacheEntry {
  
          /**
  	 * The "last modified" time of the origin file at the time this class
  	 * was loaded, in milliseconds since the epoch.
  	 */
          long lastModified;
  
          /**
  	 * The actual loaded class.
  	 */
          Class loadedClass;
  
          /**
  	 * The File (for a directory) or JarFile (for a JAR) from which this
  	 * class was loaded, or <code>null</code> if loaded from the system.
  	 */
          Object origin;
  
          /**
  	 * Construct a new instance of this class.
  	 */
          public ClassCacheEntry(Class loadedClass, Object origin,
  			       long lastModified) {
  
  	    this.loadedClass = loadedClass;
  	    this.origin = origin;
  	    this.lastModified = lastModified;
  
  	}
  
      }
  
  
      /**
       * The cache entry for a particular resource loaded by this class loader.
       */
      private static class ResourceCacheEntry {
  
          /**
  	 * The "last modified" time of the origin file at the time this
  	 * resource was loaded, in milliseconds since the epoch.
  	 */
          long lastModified;
  
          /**
  	 * The actual loaded resource.
  	 */
  	byte loadedResource[];
  
          /**
  	 * The File (for a directory) or JarFile (for a JAR) from which this
  	 * resource was loaded, or <code>null</code> if loaded from the system.
  	 */
          Object origin;
  
          /**
  	 * Construct a new instance of this class.
  	 */
          public ResourceCacheEntry(byte loadedResource[], Object origin,
  				  long lastModified) {
  
  	    this.loadedResource = loadedResource;
  	    this.origin = origin;
  	    this.lastModified = lastModified;
  
  	}
  
      }
  
  
  }
  
  
  
  1.3       +25 -12    jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
  
  Index: Bootstrap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Bootstrap.java	2000/09/08 18:29:04	1.2
  +++ Bootstrap.java	2000/09/22 23:52:52	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
1.2 2000/09/08 18:29:04 craigmcc Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/09/08 18:29:04 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
1.3 2000/09/22 23:52:52 craigmcc Exp $
  + * $Revision: 1.3 $
  + * $Date: 2000/09/22 23:52:52 $
    *
    * ====================================================================
    *
  @@ -67,7 +67,10 @@
   
   import java.io.File;
   import java.lang.reflect.Method;
  -import org.apache.catalina.loader.FileClassLoader;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.ArrayList;
  +import org.apache.catalina.loader.StandardClassLoader;
   
   
   /**
  @@ -80,7 +83,7 @@
    * class path and therefore not visible to application level classes.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.2 $ $Date: 2000/09/08 18:29:04 $
  + * @version $Revision: 1.3 $ $Date: 2000/09/22 23:52:52 $
    */
   
   public final class Bootstrap {
  @@ -96,17 +99,15 @@
        */
       public static void main(String args[]) {
   
  -	// Construct a new class loader for our internal classes
  -        Bootstrap dummy = new Bootstrap();
  -	FileClassLoader loader =
  -            new FileClassLoader(dummy.getClass().getClassLoader());
  +        // Construct the "class path" for a new class loader
  +        ArrayList list = new ArrayList();
   
   	// Add the "classes" subdirectory underneath "catalina.home"
   	File classes = new File(System.getProperty("catalina.home"),
   				"classes");
   	if (classes.exists() && classes.canRead() &&
   	    classes.isDirectory()) {
  -	    loader.addRepository(classes.getAbsolutePath());
  +	    list.add(classes.getAbsolutePath() + "/");
   	}
   
   	// Add the JAR files in the "server" subdirectory as well
  @@ -121,9 +122,21 @@
   	for (int i = 0; i < filenames.length; i++) {
   	    if (!filenames[i].toLowerCase().endsWith(".jar"))
   		continue;
  -	    File file = new File(directory, filenames[i]);
  -	    loader.addRepository(file.getAbsolutePath());
  +            File file = new File(directory, filenames[i]);
  +            //	    loader.addRepository(file.getAbsolutePath());
  +            try {
  +                URL url = new URL("file", null, file.getAbsolutePath());
  +                list.add(url.toString());
  +            } catch (MalformedURLException e) {
  +                System.out.println("Cannot create URL for " +
  +                                   filenames[i]);
  +                System.exit(1);
  +            }
   	}
  +
  +        // Construct the class loader itself
  +        String array[] = (String[]) list.toArray(new String[list.size()]);
  +	StandardClassLoader loader = new StandardClassLoader(array);
   
   	// Load our startup class and call its process() method
   	try {
  
  
  
  1.15      +12 -5     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ContextConfig.java	2000/09/19 00:09:07	1.14
  +++ ContextConfig.java	2000/09/22 23:52:52	1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.14 2000/09/19 00:09:07 craigmcc Exp $
  - * $Revision: 1.14 $
  - * $Date: 2000/09/19 00:09:07 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.15 2000/09/22 23:52:52 craigmcc Exp $
  + * $Revision: 1.15 $
  + * $Date: 2000/09/22 23:52:52 $
    *
    * ====================================================================
    *
  @@ -108,7 +108,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.14 $ $Date: 2000/09/19 00:09:07 $
  + * @version $Revision: 1.15 $ $Date: 2000/09/22 23:52:52 $
    */
   
   public final class ContextConfig
  @@ -742,6 +742,7 @@
           } catch (MalformedURLException e) {
   	    ;
   	}
  +        /**
   	if ((classesURL != null) && "file".equals(classesURL.getProtocol())) {
   	    File classesFile = new File(classesURL.getFile());
   	    if (classesFile.exists() && classesFile.canRead() &&
  @@ -751,6 +752,9 @@
   		loader.addRepository(classesFile.getAbsolutePath());
   	    }
   	}
  +        **/
  +        if (classesURL != null)
  +            loader.addRepository(classesURL.toString() + "/");
   
   	// Add the WEB-INF/lib/*.jar files
   	URL libURL = null;
  @@ -759,6 +763,7 @@
   	} catch (MalformedURLException e) {
   	    ;
   	}
  +        // FIXME - This still requires disk directory!  Scan JARs if present
   	if ((libURL != null) && "file".equals(libURL.getProtocol())) {
   	    File libFile = new File(libURL.getFile());
   	    if (libFile.exists() && libFile.canRead() &&
  @@ -770,7 +775,9 @@
   		    File jarFile = new File(libFile, filenames[i]);
   		    if (debug > 0)
   		        log(" Adding '" + jarFile.getAbsolutePath() + "'");
  -		    loader.addRepository(jarFile.getAbsolutePath());
  +                    //	    loader.addRepository(jarFile.getAbsolutePath());
  +		    loader.addRepository("jar:" + libURL.toString() +
  +                                         "!/" + libFile);
   		}
   	    }
   	}
  
  
  
  1.4       +2 -0      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalStrings.properties	2000/09/09 03:20:52	1.3
  +++ LocalStrings.properties	2000/09/22 23:52:53	1.4
  @@ -1,5 +1,6 @@
   contextConfig.applicationClose=Error closing application web.xml
   contextConfig.applicationConfig=Configuration error in application web.xml
  +contextConfig.applicationDeploy=Processing application deployment descriptor
   contextConfig.applicationListener=Exception creating listener of class {0}
   contextConfig.applicationMissing=Missing application web.xml, using defaults only
   contextConfig.applicationParse=Parse error in application web.xml
  @@ -14,6 +15,7 @@
   contextConfig.certificatesConfig.error=Exception adding CertificatesValve:
   contextConfig.defaultClose=Error closing default web.xml
   contextConfig.defaultConfig=Configuration error in default web.xml
  +contextConfig.defaultDeploy=Processing defaults deployment descriptor
   contextConfig.defaultLoader=Configuring default Loader
   contextConfig.defaultManager=Configuring default Manager
   contextConfig.defaultMissing=Missing default web.xml, using application web.xml only
  
  
  

Mime
View raw message