tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java
Date Mon, 01 Jan 2001 02:07:24 GMT
costin      00/12/31 18:07:24

  Modified:    src/etc  server.xml
               src/share/org/apache/tomcat/modules/aaa
                        AccessInterceptor.java
               src/share/org/apache/tomcat/modules/config
                        DefaultCMSetter.java LoaderInterceptor11.java
                        LoaderInterceptor12.java PolicyInterceptor.java
                        RelativePathFix.java
               src/share/org/apache/tomcat/modules/generators
                        ErrorHandler.java StaticInterceptor.java
               src/share/org/apache/tomcat/startup EmbededTomcat.java
  Log:
  Fixed import statements.
  
  Revision  Changes    Path
  1.59      +25 -21    jakarta-tomcat/src/etc/server.xml
  
  Index: server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- server.xml	2000/12/29 01:34:40	1.58
  +++ server.xml	2001/01/01 02:07:23	1.59
  @@ -99,13 +99,15 @@
   
         <!-- ==================== Interceptors ==================== -->
           <ContextInterceptor 
  -            className="org.apache.tomcat.context.DefaultCMSetter" />
  +            className="org.apache.tomcat.modules.config.DefaultCMSetter" />
   
           <!-- 
  -         ContextInterceptor className="org.apache.tomcat.context.LogEvents" 
  +         ContextInterceptor 
  +            className="org.apache.tomcat.modules.loggers.LogEvents" 
            -->
           
  -        <ContextInterceptor className="org.apache.tomcat.context.AutoSetup" />
  +        <ContextInterceptor 
  +            className="org.apache.tomcat.modules.config.AutoSetup" />
   
           <ContextInterceptor 
               className="org.apache.tomcat.facade.WebXmlReader" />
  @@ -113,21 +115,21 @@
           <!-- Uncomment out if you have JDK1.2 and want to implement
   	     the Java SecurityManager
           <ContextInterceptor 
  -            className="org.apache.tomcat.context.PolicyInterceptor" />
  +            className="org.apache.tomcat.modules.config.PolicyInterceptor" />
           -->
   
           <!-- For JDK1.2 and URLClassLoader 
           <ContextInterceptor 
  -            className="org.apache.tomcat.context.LoaderInterceptor12" />
  +            className="org.apache.tomcat.modules.config.LoaderInterceptor12" />
           -->
   
           <ContextInterceptor 
  -            className="org.apache.tomcat.context.LoaderInterceptor11" />
  +            className="org.apache.tomcat.modules.config.LoaderInterceptor11" />
   
           <!-- Default Error handler 
             -->
           <ContextInterceptor 
  -            className="org.apache.tomcat.context.ErrorHandler" />
  +            className="org.apache.tomcat.modules.generators.ErrorHandler" />
   
   
           <ContextInterceptor 
  @@ -137,26 +139,27 @@
           <!-- Session interceptor will extract the session id from cookies and 
                deal with URL rewriting ( by fixing the URL )
             -->
  -        <RequestInterceptor className="SessionId" />
  +        <RequestInterceptor 
  +            className="org.apache.tomcat.modules.session.SessionId" />
   
           <!-- Find the container ( context and prefix/extension map ) 
                for a request.
             -->
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.SimpleMapper1" 
  +            className="org.apache.tomcat.modules.mappers.SimpleMapper1" 
               debug="0" />
   
           <!-- fix the context class loader, other JDK1.2 specific code
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.Jdk12Interceptor" 
  +            className="org.apache.tomcat.modules.mappers.Jdk12Interceptor" 
               debug="0" />
             -->
   
           <!-- Non-standard invoker, for backward compat. ( /servlet/* )
             -->
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.InvokerInterceptor" 
  -            debug="0" />
  +           className="org.apache.tomcat.modules.generators.InvokerInterceptor" 
  +           debug="0" />
   
           <!-- "jsp" handler 
             -->
  @@ -167,30 +170,31 @@
           <!-- "default" handler - static files and dirs
             -->
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.StaticInterceptor" 
  +            className="org.apache.tomcat.modules.generators.StaticInterceptor" 
               debug="0" listings="true" />
           
   	<!-- Handle reloads - will be moved to per/context
             -->
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.ReloadInterceptor" 
  +            className="org.apache.tomcat.modules.mappers.ReloadInterceptor" 
               debug="0" />
   
           <!-- Plug a session manager. You can plug in more advanced session
                modules.
             -->
  -        <RequestInterceptor className="SimpleSessionStore" />
  +        <RequestInterceptor 
  +	    className="org.apache.tomcat.modules.session.SimpleSessionStore" />
   
           <!-- Check if the request requires an authenticated role.
             -->
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.AccessInterceptor" 
  +            className="org.apache.tomcat.modules.aaa.AccessInterceptor" 
               debug="0" />
   
           <!-- Implements BASIC and FORM autorization
             -->
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.CredentialsInterceptor" 
  +            className="org.apache.tomcat.modules.aaa.CredentialsInterceptor" 
               debug="0" />
   
           <!-- Check permissions using the simple xml file. You can 
  @@ -198,7 +202,7 @@
                uncomment below to have a global tomcat Realm.
             -->
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.SimpleRealm" 
  +            className="org.apache.tomcat.modules.aaa.SimpleRealm" 
               filename="conf/users/global-users.xml"
               debug="0" />
   
  @@ -219,7 +223,7 @@
           -->
           <!--
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.JDBCRealm" 
  +            className="org.apache.tomcat.modules.aaa.JDBCRealm" 
               debug="99" 
   	    driverName="sun.jdbc.odbc.JdbcOdbcDriver" 
   	    connectionURL="jdbc:odbc:TOMCAT" 
  @@ -305,7 +309,7 @@
               debug="0" 
   	    reloadable="true" > 
              <RequestInterceptor 
  -              className="org.apache.tomcat.request.SimpleRealm" 
  +              className="org.apache.tomcat.modules.aaa.SimpleRealm" 
                 filename="conf/users/example-users.xml"
                 debug="0" />
               <Logger name="example_tc_log" 
  @@ -332,7 +336,7 @@
                    reloadable="true" 
                    trusted="false" > 
           <RequestInterceptor 
  -            className="org.apache.tomcat.request.SimpleRealm" 
  +            className="org.apache.tomcat.modules.aaa.SimpleRealm" 
               filename="conf/users/admin-users.xml"
               debug="0" />
           </Context>
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java
  
  Index: AccessInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AccessInterceptor.java	2001/01/01 02:01:29	1.1
  +++ AccessInterceptor.java	2001/01/01 02:07:23	1.2
  @@ -60,7 +60,6 @@
   package org.apache.tomcat.modules.aaa;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.session.*;
   import org.apache.tomcat.util.*;
   import java.util.*;
   import java.io.*;
  
  
  
  1.2       +1 -2      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/DefaultCMSetter.java
  
  Index: DefaultCMSetter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/DefaultCMSetter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultCMSetter.java	2001/01/01 01:58:38	1.1
  +++ DefaultCMSetter.java	2001/01/01 02:07:23	1.2
  @@ -60,13 +60,12 @@
   package org.apache.tomcat.modules.aaa;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.request.*;
  -import org.apache.tomcat.util.*;
   import java.io.*;
   import java.net.*;
   import java.util.*;
   import java.security.*;
   
  +import org.apache.tomcat.util.*;
   import org.apache.tomcat.util.log.*;
   
   // don't extend - replace !
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java
  
  Index: LoaderInterceptor11.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoaderInterceptor11.java	2001/01/01 01:58:38	1.1
  +++ LoaderInterceptor11.java	2001/01/01 02:07:23	1.2
  @@ -60,7 +60,6 @@
   package org.apache.tomcat.modules.config;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.request.*;
   import org.apache.tomcat.util.*;
   import org.apache.tomcat.util.depend.*;
   import java.io.*;
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor12.java
  
  Index: LoaderInterceptor12.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor12.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoaderInterceptor12.java	2001/01/01 01:58:38	1.1
  +++ LoaderInterceptor12.java	2001/01/01 02:07:23	1.2
  @@ -60,7 +60,6 @@
   package org.apache.tomcat.modules.config;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.request.*;
   import org.apache.tomcat.util.*;
   import org.apache.tomcat.util.depend.*;
   import java.io.*;
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
  
  Index: PolicyInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PolicyInterceptor.java	2001/01/01 01:58:38	1.1
  +++ PolicyInterceptor.java	2001/01/01 02:07:23	1.2
  @@ -60,7 +60,6 @@
   package org.apache.tomcat.modules.config;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.request.*;
   import org.apache.tomcat.util.*;
   import java.io.*;
   import java.net.*;
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/RelativePathFix.java
  
  Index: RelativePathFix.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/RelativePathFix.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RelativePathFix.java	2000/12/04 21:11:56	1.1
  +++ RelativePathFix.java	2001/01/01 02:07:23	1.2
  @@ -61,7 +61,6 @@
   package org.apache.tomcat.modules.config;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.request.*;
   import org.apache.tomcat.util.*;
   import java.io.*;
   import java.net.*;
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java
  
  Index: ErrorHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ErrorHandler.java	2001/01/01 01:58:38	1.1
  +++ ErrorHandler.java	2001/01/01 02:07:24	1.2
  @@ -60,7 +60,6 @@
   package org.apache.tomcat.modules.generators;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.request.*;
   import org.apache.tomcat.util.*;
   import java.io.*;
   import java.net.*;
  
  
  
  1.2       +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java
  
  Index: StaticInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StaticInterceptor.java	2001/01/01 02:01:30	1.1
  +++ StaticInterceptor.java	2001/01/01 02:07:24	1.2
  @@ -59,7 +59,6 @@
   package org.apache.tomcat.modules.generators;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.request.*;
   import org.apache.tomcat.util.*;
   import org.apache.tomcat.util.http.*;
   import java.io.*;
  
  
  
  1.41      +1 -4      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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- EmbededTomcat.java	2001/01/01 01:58:39	1.40
  +++ EmbededTomcat.java	2001/01/01 02:07:24	1.41
  @@ -4,11 +4,8 @@
   import java.io.*;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.request.*;
  -import org.apache.tomcat.modules.server.*;
  -import org.apache.tomcat.modules.session.*;
  -import org.apache.tomcat.context.*;
   import org.apache.tomcat.util.log.*;
  +import org.apache.tomcat.modules.server.*;
   import java.security.*;
   import java.util.*;
   
  
  
  

Mime
View raw message