tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java
Date Sun, 27 Aug 2000 21:03:34 GMT
costin      00/08/27 14:03:34

  Modified:    src/share/org/apache/tomcat/context LoaderInterceptor11.java
                        LoaderInterceptor12.java
               src/share/org/apache/tomcat/core Context.java
                        ContextManager.java
               src/share/org/apache/tomcat/startup EmbededTomcat.java
  Log:
  Fixed the build - removed deps on loader and all deprecated code that
  supported ServletLoader.
  
  Remember this is a development branch, let me know if anything gets broken.
  
  Revision  Changes    Path
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/context/LoaderInterceptor11.java
  
  Index: LoaderInterceptor11.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/LoaderInterceptor11.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoaderInterceptor11.java	2000/08/17 16:51:47	1.1
  +++ LoaderInterceptor11.java	2000/08/27 21:03:30	1.2
  @@ -71,7 +71,6 @@
   import java.security.*;
   
   import org.apache.tomcat.logging.*;
  -import org.apache.tomcat.loader.*;
   /**
    * Set class loader based on WEB-INF/classes, lib.
    * Use with JDK1.1.
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/context/LoaderInterceptor12.java
  
  Index: LoaderInterceptor12.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/LoaderInterceptor12.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoaderInterceptor12.java	2000/08/27 20:41:12	1.1
  +++ LoaderInterceptor12.java	2000/08/27 21:03:30	1.2
  @@ -71,7 +71,6 @@
   import java.security.*;
   
   import org.apache.tomcat.logging.*;
  -import org.apache.tomcat.loader.*;
   
   /**
    * Set class loader based on WEB-INF/classes, lib.
  
  
  
  1.114     +6 -17     jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
  
  Index: Context.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- Context.java	2000/08/27 20:37:29	1.113
  +++ Context.java	2000/08/27 21:03:32	1.114
  @@ -746,8 +746,8 @@
        *  is used, you shouldn't cache the result
        */
       public final ClassLoader getClassLoader() {
  -	if( servletL!=null) // backward compat
  -	    return servletL.getClassLoader();
  +	// 	if( servletL!=null) // backward compat
  +	// 	    return servletL.getClassLoader();
   	return classLoader;
       }
   
  @@ -757,8 +757,8 @@
   
       // temp. properties until reloading is separated.
       public boolean shouldReload() {
  -	if( servletL!=null) // backward compat
  -	    return servletL.shouldReload();
  +	// 	if( servletL!=null) // backward compat
  +	// 	    return servletL.shouldReload();
   	if( dependM != null )
   	    return dependM.shouldReload();
   	return reload;
  @@ -769,8 +769,8 @@
       }
   
       public void reload() {
  -	if( servletL!=null) // backward compat
  -	    servletL.reload();
  +	// 	if( servletL!=null) // backward compat
  +	// 	    servletL.reload();
   	Enumeration sE=servlets.elements();
   	while( sE.hasMoreElements() ) {
   	    try {
  @@ -808,17 +808,6 @@
   	return dependM;
       }
       
  -    // deprecated
  -    private org.apache.tomcat.loader.AdaptiveServletLoader servletL;
  -
  -    public void setServletLoader(org.apache.tomcat.loader.AdaptiveServletLoader loader
) {
  -	this.servletL=loader;
  -    }
  -
  -    private org.apache.tomcat.loader.AdaptiveServletLoader getServletLoader() {
  -	return servletL;
  -    }
  -
       /* -------------------- Utils  -------------------- */
       public void setDebug( int level ) {
   	if (level!=debug)
  
  
  
  1.123     +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- ContextManager.java	2000/08/24 21:14:08	1.122
  +++ ContextManager.java	2000/08/27 21:03:32	1.123
  @@ -62,7 +62,6 @@
   
   import org.apache.tomcat.core.*;
   import org.apache.tomcat.context.*;
  -import org.apache.tomcat.loader.*;
   import org.apache.tomcat.request.*;
   import org.apache.tomcat.util.*;
   import org.apache.tomcat.logging.*;
  
  
  
  1.19      +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- EmbededTomcat.java	2000/08/27 20:37:32	1.18
  +++ EmbededTomcat.java	2000/08/27 21:03:33	1.19
  @@ -340,7 +340,7 @@
   	addContextInterceptor( polI );
   	polI.setDebug(0);
           
  -	LoaderInterceptor loadI=new LoaderInterceptor();
  +	LoaderInterceptor12 loadI=new LoaderInterceptor12();
   	addContextInterceptor( loadI );
   
   	DefaultCMSetter defaultCMI=new DefaultCMSetter();
  
  
  

Mime
View raw message