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 ContextConfig.java LocalStrings.properties
Date Fri, 13 Oct 2000 23:33:27 GMT
craigmcc    00/10/13 16:33:27

  Modified:    catalina/src/share/org/apache/catalina/core
                        LocalStrings.properties StandardContext.java
               catalina/src/share/org/apache/catalina/loader
                        StandardLoader.java
               catalina/src/share/org/apache/catalina/session
                        ManagerBase.java StandardSession.java
               catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java LocalStrings.properties
  Log:
  Refactor the startup processing so that saving sessions across automatic
  context reloads, and normal shutdown/startup of the server.  Previously
  there were cases where you would not see the session information restored
  correctly.
  
  NOTE:  There are still issues with the timing of when application event
  listeners are initialized versus when session restoration occurs.  These
  will be addressed shortly.
  
  NOTE:  If you have saved session information from a previous version of
  Tomcat 4.0, you will not be able to reload it with this version - the
  format of serialized sessions has changed slightly.  To avoid any
  problems, simply delete the $CATALINA_HOME/work directory before starting
  this version of Tomcat 4.0.
  
  Revision  Changes    Path
  1.14      +3 -0      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- LocalStrings.properties	2000/10/13 16:54:43	1.13
  +++ LocalStrings.properties	2000/10/13 23:33:25	1.14
  @@ -22,6 +22,9 @@
   interceptorValve.notStarted=InterceptorValve has not yet been started
   standardContext.alreadyStarted=Context has already been started
   standardContext.applicationListener=Error configuring application listener of class {0}
  +standardContext.defaultLoader=Configuring default Loader
  +standardContext.defaultManager=Configuring default Manager
  +standardContext.defaultResources=Configuring default Resources
   standardContext.filterMap.either=Filter mapping must specify either a <url-pattern>
or a <servlet-name>
   standardContext.filterMap.name=Filter mapping specifies an unknown filter name {0}
   standardContext.filterMap.pattern=Invalid <url-pattern> {0} in filter mapping
  
  
  
  1.19      +24 -4     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- StandardContext.java	2000/10/07 20:08:42	1.18
  +++ StandardContext.java	2000/10/13 23:33:25	1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.18 2000/10/07 20:08:42 craigmcc Exp $
  - * $Revision: 1.18 $
  - * $Date: 2000/10/07 20:08:42 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.19 2000/10/13 23:33:25 craigmcc Exp $
  + * $Revision: 1.19 $
  + * $Date: 2000/10/13 23:33:25 $
    *
    * ====================================================================
    *
  @@ -98,6 +98,9 @@
   import org.apache.catalina.deploy.LoginConfig;
   import org.apache.catalina.deploy.SecurityCollection;
   import org.apache.catalina.deploy.SecurityConstraint;
  +import org.apache.catalina.loader.StandardLoader;
  +import org.apache.catalina.resources.FileResources;
  +import org.apache.catalina.session.StandardManager;
   import org.apache.catalina.util.CharsetMapper;
   import org.apache.catalina.util.RequestUtil;
   
  @@ -108,7 +111,7 @@
    * requests directed to a particular servlet.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.18 $ $Date: 2000/10/07 20:08:42 $
  + * @version $Revision: 1.19 $ $Date: 2000/10/13 23:33:25 $
    */
   
   public final class StandardContext
  @@ -2390,6 +2393,23 @@
   	// Create context attributes that will be required
   	postWelcomeFiles();
   	postWorkDirectory();
  +
  +        // Add missing components as necessary
  +        if (getResources() == null) {   // (1) Required by Loader
  +            if (debug >= 1)
  +                log(sm.getString("standardContext.defaultResources"));
  +            setResources(new FileResources());
  +        }
  +        if (getLoader() == null) {      // (2) Required by Manager
  +            if (debug >= 1)
  +                log(sm.getString("standardContext.defaultLoader"));
  +            setLoader(new StandardLoader(getParentClassLoader()));
  +        }
  +        if (getManager() == null) {     // (3) After prerequisites
  +            if (debug >= 1)
  +                log(sm.getString("standardContext.defaultManager"));
  +            setManager(new StandardManager());
  +        }
   
   	// Standard container startup
   	super.start();
  
  
  
  1.10      +115 -5    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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StandardLoader.java	2000/10/07 19:13:46	1.9
  +++ StandardLoader.java	2000/10/13 23:33:26	1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.9 2000/10/07 19:13:46 craigmcc Exp $
  - * $Revision: 1.9 $
  - * $Date: 2000/10/07 19:13:46 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.10 2000/10/13 23:33:26 craigmcc Exp $
  + * $Revision: 1.10 $
  + * $Date: 2000/10/13 23:33:26 $
    *
    * ====================================================================
    *
  @@ -70,6 +70,7 @@
   import java.beans.PropertyChangeSupport;
   import java.io.File;
   import java.io.IOException;
  +import java.net.MalformedURLException;
   import java.net.URL;
   import java.net.URLClassLoader;
   import javax.servlet.ServletContext;
  @@ -82,6 +83,7 @@
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Loader;
   import org.apache.catalina.Logger;
  +import org.apache.catalina.Resources;
   import org.apache.catalina.util.LifecycleSupport;
   import org.apache.catalina.util.StringManager;
   
  @@ -99,7 +101,7 @@
    * is not present, the system class loader will be used instead.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.9 $ $Date: 2000/10/07 19:13:46 $
  + * @version $Revision: 1.10 $ $Date: 2000/10/13 23:33:26 $
    */
   
   public final class StandardLoader
  @@ -433,12 +435,16 @@
   
           if (debug >= 1)
   	    log(sm.getString("standardLoader.addRepository", repository));
  +        for (int i = 0; i < repositories.length; i++) {
  +            if (repository.equals(repositories[i]))
  +                return;
  +        }
   	String results[] = new String[repositories.length + 1];
   	for (int i = 0; i < repositories.length; i++)
   	    results[i] = repositories[i];
   	results[repositories.length] = repository;
   	repositories = results;
  -	if (started) {
  +	if (started && (classLoader != null)) {
   	    classLoader.addRepository(repository);
   	    setClassPath();
   	}
  @@ -537,6 +543,9 @@
   	lifecycle.fireLifecycleEvent(START_EVENT, null);
   	started = true;
   
  +        // Configure our context repositories if appropriate
  +        setRepositories();
  +
   	// Construct a class loader based on our current repositories list
   	try {
   	    if (parentClassLoader == null)
  @@ -553,6 +562,9 @@
   	    throw new LifecycleException("start: ", t);
   	}
   
  +        // Validate that all required packages are actually available
  +        validatePackages();
  +
   	// Set up context attributes if appropriate
   	setClassLoader();
   	setClassPath();
  @@ -770,6 +782,64 @@
   
   
       /**
  +     * Configure the repositories for our class loader, based on the
  +     * associated Context.
  +     */
  +    private void setRepositories() {
  +
  +        if (!(container instanceof Context))
  +            return;
  +	Resources resources = ((Context) container).getResources();
  +
  +	// Add the WEB-INF/classes subdirectory
  +	URL classesURL = null;
  +	try {
  +	    classesURL = resources.getResource("/WEB-INF/classes");
  +        } catch (MalformedURLException e) {
  +	    classesURL = null;
  +	}
  +        if (classesURL != null) {
  +            // Work around JDK 1.3 problem on Windows
  +            String classesURLString = classesURL.toString();
  +            while (true) {
  +                int index = classesURLString.indexOf("\\.\\");
  +                if (index < 0)
  +                    break;
  +                classesURLString = classesURLString.substring(0, index) +
  +                    '\\' + classesURLString.substring(index + 3);
  +            }
  +            addRepository(classesURLString + "/");
  +        }
  +
  +	// Add the WEB-INF/lib/*.jar files
  +	URL libURL = null;
  +	try {
  +	    libURL = resources.getResource("/WEB-INF/lib");
  +	} catch (MalformedURLException e) {
  +	    libURL = null;
  +	}
  +        // 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() &&
  +	        libFile.isDirectory()) {
  +		String filenames[] = libFile.list();
  +		for (int i = 0; i < filenames.length; i++) {
  +		    if (!filenames[i].endsWith(".jar"))
  +		        continue;
  +		    File jarFile = new File(libFile, filenames[i]);
  +		    if (debug > 0)
  +		        log(" Adding '" + "file: " +
  +                            jarFile.getAbsolutePath() + "'");
  +                    addRepository("file:" + jarFile.getAbsolutePath());
  +		}
  +	    }
  +	}
  +
  +    }
  +
  +
  +    /**
        * Sleep for the duration specified by the <code>checkInterval</code>
        * property.
        */
  @@ -837,6 +907,46 @@
   	}
   
   	thread = null;
  +
  +    }
  +
  +
  +    /**
  +     * Validate that the required optional packages for this application
  +     * are actually present.
  +     *
  +     * @exception LifecycleException if a required package is not available
  +     */
  +    private void validatePackages() throws LifecycleException {
  +
  +        ClassLoader classLoader = getClassLoader();
  +        if (classLoader instanceof StandardClassLoader) {
  +
  +            Extension available[] =
  +                ((StandardClassLoader) classLoader).findAvailable();
  +            Extension required[] =
  +                ((StandardClassLoader) classLoader).findRequired();
  +            if (debug >= 1)
  +                log("Optional Packages:  available=" +
  +                    available.length + ", required=" +
  +                    required.length);
  +
  +            for (int i = 0; i < required.length; i++) {
  +                if (debug >= 1)
  +                    log("Checking for required package " + required[i]);
  +                boolean found = false;
  +                for (int j = 0; j < available.length; j++) {
  +                    if (available[j].isCompatibleWith(required[i])) {
  +                        found = true;
  +                        break;
  +                    }
  +                }
  +                if (!found)
  +                    throw new LifecycleException
  +                        ("Missing optional package " + required[i]);
  +            }
  +
  +        }
   
       }
   
  
  
  
  1.2       +5 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java
  
  Index: ManagerBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ManagerBase.java	2000/08/11 23:39:15	1.1
  +++ ManagerBase.java	2000/10/13 23:33:26	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
1.1 2000/08/11 23:39:15 craigmcc Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/08/11 23:39:15 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
1.2 2000/10/13 23:33:26 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/10/13 23:33:26 $
    *
    * ====================================================================
    *
  @@ -86,7 +86,7 @@
    * be subclassed to create more sophisticated Manager implementations.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.1 $ $Date: 2000/08/11 23:39:15 $
  + * @version $Revision: 1.2 $ $Date: 2000/10/13 23:33:26 $
    */
   
   public abstract class ManagerBase implements Manager {
  @@ -697,3 +697,4 @@
   
   
   }
  +
  
  
  
  1.5       +10 -7     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java
  
  Index: StandardSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StandardSession.java	2000/10/07 19:13:50	1.4
  +++ StandardSession.java	2000/10/13 23:33:26	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.4 2000/10/07 19:13:50 craigmcc Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/10/07 19:13:50 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.5 2000/10/13 23:33:26 craigmcc Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/10/13 23:33:26 $
    *
    * ====================================================================
    *
  @@ -108,7 +108,7 @@
    * @author Craig R. McClanahan
    * @author Sean Legassick
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  - * @version $Revision: 1.4 $ $Date: 2000/10/07 19:13:50 $
  + * @version $Revision: 1.5 $ $Date: 2000/10/13 23:33:26 $
    */
   
   final class StandardSession
  @@ -957,25 +957,28 @@
   
   	// Deserialize the scalar instance variables (except Manager)
   	creationTime = ((Long) stream.readObject()).longValue();
  -	id = (String) stream.readObject();
   	lastAccessedTime = ((Long) stream.readObject()).longValue();
   	maxInactiveInterval = ((Integer) stream.readObject()).intValue();
   	isNew = ((Boolean) stream.readObject()).booleanValue();
   	isValid = ((Boolean) stream.readObject()).booleanValue();
   	thisAccessedTime = ((Long) stream.readObject()).longValue();
   	principal = null;	// Transient only
  +        setId((String) stream.readObject());
   
   	// Deserialize the attribute count and attribute values
   	if (attributes == null)
   	    attributes = new HashMap();
   	int n = ((Integer) stream.readObject()).intValue();
  +        boolean isValidSave = isValid;
  +        isValid = true;
   	for (int i = 0; i < n; i++) {
   	    String name = (String) stream.readObject();
   	    Object value = (Object) stream.readObject();
   	    if ((value instanceof String) && (value.equals(NOT_SERIALIZED)))
   		continue;
  -	    attributes.put(name, value);	// No multithread access
  +            setAttribute(name, value);
   	}
  +        isValid = isValidSave;
   
       }
   
  @@ -1003,12 +1006,12 @@
   
   	// Write the scalar instance variables (except Manager)
   	stream.writeObject(new Long(creationTime));
  -	stream.writeObject(id);
   	stream.writeObject(new Long(lastAccessedTime));
   	stream.writeObject(new Integer(maxInactiveInterval));
   	stream.writeObject(new Boolean(isNew));
   	stream.writeObject(new Boolean(isValid));
   	stream.writeObject(new Long(thisAccessedTime));
  +	stream.writeObject(id);
   
   	// Accumulate the names of serializable and non-serializable attributes
   	String keys[] = keys();
  
  
  
  1.24      +4 -134    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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ContextConfig.java	2000/10/09 23:30:41	1.23
  +++ ContextConfig.java	2000/10/13 23:33:27	1.24
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.23 2000/10/09 23:30:41 craigmcc Exp $
  - * $Revision: 1.23 $
  - * $Date: 2000/10/09 23:30:41 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.24 2000/10/13 23:33:27 craigmcc Exp $
  + * $Revision: 1.24 $
  + * $Date: 2000/10/13 23:33:27 $
    *
    * ====================================================================
    *
  @@ -96,7 +96,6 @@
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleListener;
  -import org.apache.catalina.Loader;
   import org.apache.catalina.Logger;
   import org.apache.catalina.Pipeline;
   import org.apache.catalina.Resources;
  @@ -107,10 +106,6 @@
   import org.apache.catalina.deploy.LoginConfig;
   import org.apache.catalina.deploy.SecurityConstraint;
   import org.apache.catalina.loader.Extension;
  -import org.apache.catalina.loader.StandardClassLoader;
  -import org.apache.catalina.loader.StandardLoader;
  -import org.apache.catalina.resources.FileResources;
  -import org.apache.catalina.session.StandardManager;
   import org.apache.catalina.util.StringManager;
   import org.apache.catalina.util.xml.SaxContext;
   import org.apache.catalina.util.xml.XmlAction;
  @@ -124,7 +119,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.23 $ $Date: 2000/10/09 23:30:41 $
  + * @version $Revision: 1.24 $ $Date: 2000/10/13 23:33:27 $
    */
   
   public final class ContextConfig
  @@ -786,105 +781,6 @@
   
   
       /**
  -     * Configure the repositories for the Loader associated with
  -     * this Context.
  -     */
  -    private void loaderConfig() {
  -
  -	if (debug > 0)
  -	    log("Configuring class loader repositories");
  -
  -	// Identify the components we will need
  -	// FIXME - dependency on StandardLoader versus Loader?
  -	StandardLoader loader = null;
  -	try {
  -	    loader = (StandardLoader) context.getLoader();
  -        } catch (ClassCastException e) {
  -	    ;
  -        }
  -	if (loader == null)
  -	    return;
  -	Resources resources = context.getResources();
  -
  -	// Add the WEB-INF/classes subdirectory
  -	URL classesURL = null;
  -	try {
  -	    classesURL = resources.getResource("/WEB-INF/classes");
  -        } catch (MalformedURLException e) {
  -	    ;
  -	}
  -        if (classesURL != null) {
  -            // Work around JDK 1.3 problem on Windows
  -            String classesURLString = classesURL.toString();
  -            while (true) {
  -                int index = classesURLString.indexOf("\\.\\");
  -                if (index < 0)
  -                    break;
  -                classesURLString = classesURLString.substring(0, index) +
  -                    '\\' + classesURLString.substring(index + 3);
  -            }
  -            loader.addRepository(classesURLString + "/");
  -        }
  -
  -	// Add the WEB-INF/lib/*.jar files
  -	URL libURL = null;
  -	try {
  -	    libURL = resources.getResource("/WEB-INF/lib");
  -	} 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() &&
  -	        libFile.isDirectory()) {
  -		String filenames[] = libFile.list();
  -		for (int i = 0; i < filenames.length; i++) {
  -		    if (!filenames[i].endsWith(".jar"))
  -		        continue;
  -		    File jarFile = new File(libFile, filenames[i]);
  -		    if (debug > 0)
  -		        log(" Adding '" + "file: " +
  -                            jarFile.getAbsolutePath() + "'");
  -                    loader.addRepository("file:" + jarFile.getAbsolutePath());
  -		}
  -	    }
  -	}
  -
  -        // Validate the required and available optional packages
  -        ClassLoader classLoader = loader.getClassLoader();
  -        if (classLoader instanceof StandardClassLoader) {
  -
  -            Extension available[] =
  -                ((StandardClassLoader) classLoader).findAvailable();
  -            Extension required[] =
  -                ((StandardClassLoader) classLoader).findRequired();
  -            if (debug >= 1)
  -                log("Optional Packages:  available=" +
  -                    available.length + ", required=" +
  -                    required.length);
  -
  -            for (int i = 0; i < required.length; i++) {
  -                if (debug >= 1)
  -                    log("Checking for required package " + required[i]);
  -                boolean found = false;
  -                for (int j = 0; j < available.length; j++) {
  -                    if (available[j].isCompatibleWith(required[i])) {
  -                        found = true;
  -                        break;
  -                    }
  -                }
  -                if (!found)
  -                    throw new IllegalStateException
  -                        ("start:  Missing extension " + required[i]);
  -            }
  -
  -        }
  -
  -    }
  -
  -
  -    /**
        * Log a message on the Logger associated with our Context (if any)
        *
        * @param message Message to be logged
  @@ -1041,34 +937,9 @@
   	    log(sm.getString("contextConfig.start"));
           ok = true;
   
  -	// Add missing Loader component if necessary
  -	if (context.getLoader() == null) {
  -	    if (debug > 0)
  -		log(sm.getString("contextConfig.defaultLoader"));
  -	    context.setLoader
  -	      (new StandardLoader(context.getParentClassLoader()));
  -	}
  -
  -	// Add missing Manager component if necessary
  -	if (context.getManager() == null) {
  -	    if (debug > 0)
  -		log(sm.getString("contextConfig.defaultManager"));
  -	    context.setManager(new StandardManager());
  -	}
  -
  -	// Add missing Resources component if necessary
  -	if (context.getResources() == null) {
  -	    if (debug > 0)
  -		log(sm.getString("contextConfig.defaultResources"));
  -	    context.setResources(new FileResources());
  -	}
  -
           // Configure the Permissions for this Context (if necessary)
           permissionsConfig();
   
  -	// Configure the Loader for this Context
  -	loaderConfig();
  -
   	// Process the default and application web.xml files
   	XmlMapper mapper = createWebMapper();
   	defaultConfig(mapper);
  @@ -1087,7 +958,6 @@
               authenticatorConfig();
   
   	// Configure the application event listeners for this Context
  -	// PREREQUISITE:  class loader has been configured
           if (ok)
               listenerConfig();
   
  
  
  
  1.9       +0 -7      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LocalStrings.properties	2000/10/04 23:03:05	1.8
  +++ LocalStrings.properties	2000/10/13 23:33:27	1.9
  @@ -1,6 +1,5 @@
   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,17 +13,11 @@
   contextConfig.cce=Lifecycle event data object {0} is not a Context
   contextConfig.certificatesConfig.added=Added certificates -> request attribute Valve
   contextConfig.certificatesConfig.error=Exception adding CertificatesValve:
  -contextConfig.charsetMapper=Configuring Locale to character set mapper
  -contextConfig.charsetMapperError=Error configuring Locale to character set mapper
   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
   contextConfig.defaultParse=Parse error in default web.xml
   contextConfig.defaultPosition=Occurred at line {0} column {1}
  -contextConfig.defaultResources=Configuring default Resources
   contextConfig.start=ContextConfig: Processing START
   contextConfig.stop=ContextConfig: Processing STOP
   contextConfig.unavailable=Marking this application unavailable due to previous error(s)
  
  
  

Mime
View raw message