cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java Context.java ContextManager.java Handler.java OutputBuffer.java Request.java Response.java ServerSession.java TomcatException.java package.html

2004-02-24 Thread billbarker 
billbarker2004/02/24 22:45:07

  Modified:src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java Context.java ContextManager.java
Handler.java OutputBuffer.java Request.java
Response.java ServerSession.java
TomcatException.java package.html
  Log:
  Update to Apache License v2.0.
  
  Revision  ChangesPath
  1.54  +14 -58
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- BaseInterceptor.java  21 Aug 2002 03:58:59 -  1.53
  +++ BaseInterceptor.java  25 Feb 2004 06:45:07 -  1.54
  @@ -1,62 +1,18 @@
  -/*
  - * 
  +/*   
  + *  Copyright 1999-2004 The Apache Sofware Foundation.
*
  - * 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 [EMAIL PROTECTED]
  - *
  - * 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]
  - *
  - */ 
  -
  + *  Licensed under the Apache License, Version 2.0 (the License);
  + *  you may not use this file except in compliance with the License.
  + *  You may obtain a copy of the License at
  + *
  + *  http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *  Unless required by applicable law or agreed to in writing, software
  + *  distributed under the License is distributed on an AS IS BASIS,
  + *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
  + */
   
   package org.apache.tomcat.core;
   
  
  
  
  1.57  +14 -57jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- Container.java21 Aug 2002 03:58:59 -  1.56
  +++ Container.java

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java

2002-08-20 Thread billbarker 

billbarker2002/08/20 20:58:59

  Modified:src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java
  Log:
  API changes to allow for saving session across Context reloading.
  
  Revision  ChangesPath
  1.53  +8 -0  
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- BaseInterceptor.java  5 Jun 2002 03:39:15 -   1.52
  +++ BaseInterceptor.java  21 Aug 2002 03:58:59 -  1.53
  @@ -472,7 +472,15 @@
throws TomcatException
   {
   }
  +/** Reload notification - called whenever a full reload is done.
  + This can be used to serialize sessions, log the event,
  + clone any resource that was class-loader dependent.
   
  + */
  +public void copyContext(Request req, Context oldC, Context newC)
  + throws  TomcatException
  +{
  +}
   //  Container ( or Location ) hooks ---
   
   /** Notify that certain properties are defined for a URL pattern.
  
  
  
  1.56  +3 -1  jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- Container.java5 Jun 2002 03:39:15 -   1.55
  +++ Container.java21 Aug 2002 03:58:59 -  1.56
  @@ -417,7 +417,8 @@
   public static final int H_engineInit=16;
   public static final int H_preInitCheck=17;
   public static final int H_postInitCheck=18;
  -public static final int H_COUNT=19;
  +public static final int H_copyContext=19;
  +public static final int H_COUNT=20;
   
   private Hooks hooks=new Hooks();
   private BaseInterceptor hooksCache[][]=null;
  @@ -443,6 +444,7 @@
hooks.registerHook( engineInit, H_engineInit );
hooks.registerHook( preInitCheck, H_preInitCheck );
hooks.registerHook( postInitCheck, H_postInitCheck );
  + hooks.registerHook( copyContext, H_copyContext );
   }
   
   public Hooks getHooks() {
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java

2002-06-04 Thread billbarker 

billbarker2002/06/04 20:39:15

  Modified:src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java
  Log:
  Adding the preInitCheck and postInitCheck methods to the API.
  
  As discussed on tomcat-dev.
  
  Revision  ChangesPath
  1.52  +14 -0 
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- BaseInterceptor.java  17 Aug 2001 04:02:54 -  1.51
  +++ BaseInterceptor.java  5 Jun 2002 03:39:15 -   1.52
  @@ -547,6 +547,20 @@
   {
   }
   
  +/** Setup before calling init.
  + */
  +public int preInitCheck( Request req, Handler sw )
  + throws TomcatException
  +{
  + return 0;
  +}
  +
  +
  +public int postInitCheck( Request req, Handler sw )
  + throws TomcatException
  +{
  + return 0;
  +}
   /** Servlet Destroy  notification
*/
   public void preServletDestroy( Context ctx, Handler sw )
  
  
  
  1.55  +5 -1  jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Container.java30 Apr 2002 04:37:28 -  1.54
  +++ Container.java5 Jun 2002 03:39:15 -   1.55
  @@ -415,7 +415,9 @@
   public static final int H_getInfo=14;
   public static final int H_setInfo=15;
   public static final int H_engineInit=16;
  -public static final int H_COUNT=17;
  +public static final int H_preInitCheck=17;
  +public static final int H_postInitCheck=18;
  +public static final int H_COUNT=19;
   
   private Hooks hooks=new Hooks();
   private BaseInterceptor hooksCache[][]=null;
  @@ -439,6 +441,8 @@
hooks.registerHook( getInfo, H_getInfo );
hooks.registerHook( setInfo, H_setInfo );
hooks.registerHook( engineInit, H_engineInit );
  + hooks.registerHook( preInitCheck, H_preInitCheck );
  + hooks.registerHook( postInitCheck, H_postInitCheck );
   }
   
   public Hooks getHooks() {
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java Handler.java OutputBuffer.java Request.java Response.java ServerSession.java

2001-08-16 Thread costin 

costin  01/08/16 21:02:55

  Modified:src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java Handler.java OutputBuffer.java
Request.java Response.java ServerSession.java
  Log:
  Same thing. Some fields were package, changed them to private.
  
  Now the core is consistent ( I hope ), at least from methods declaration
  point of view.
  
  Revision  ChangesPath
  1.51  +1 -1  
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- BaseInterceptor.java  2001/08/03 02:40:20 1.50
  +++ BaseInterceptor.java  2001/08/17 04:02:54 1.51
  @@ -567,7 +567,7 @@
debug=d;
   }
   
  -public final void setContextManager( ContextManager cm ) {
  +public void setContextManager( ContextManager cm ) {
this.cm=cm;
this.ct=cm.getContainer();
   }
  
  
  
  1.53  +15 -15jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Container.java2001/08/03 02:41:29 1.52
  +++ Container.java2001/08/17 04:02:54 1.53
  @@ -101,7 +101,7 @@
   private ContextManager contextM;
   
   // The webapp including this container, if any
  -Context context;
  +private Context context;
   
   // The type of the mapping
   public static final int UNKNOWN_MAP=0;
  @@ -109,14 +109,14 @@
   public static final int PREFIX_MAP=2;
   public static final int EXTENSION_MAP=3;
   public static final int DEFAULT_MAP=4;
  -int mapType=0;
  +private int mapType=0;
   
   
   // Common map parameters ( path prefix, ext, etc)
  -String transport;
  -String path;
  -String proto;
  -String vhosts[];
  +private String transport;
  +private String path;
  +private String proto;
  +private String vhosts[];
   
   // Container attributes - it's better to use
   // notes, as the access time is much smaller
  @@ -124,16 +124,16 @@
   
   /** The handler associated with this container.
*/
  -Handler handler;
  -String handlerName;
  +private Handler handler;
  +private String handlerName;
   
   /** Security constraints associated with this Container
*/
  -String roles[]=null;
  +private String roles[]=null;
   
  -String methods[]=null;
  +private String methods[]=null;
   
  -boolean special=false;
  +private boolean special=false;
   
   public Container() {
initHooks();
  @@ -417,9 +417,9 @@
   public static final int H_engineInit=16;
   public static final int H_COUNT=17;
   
  -Hooks hooks=new Hooks();
  -BaseInterceptor hooksCache[][]=null;
  -BaseInterceptor allHooksCache[]=null;
  +private Hooks hooks=new Hooks();
  +private BaseInterceptor hooksCache[][]=null;
  +private BaseInterceptor allHooksCache[]=null;
   
   private void initHooks() {
hooks.registerHook( postReadRequest, H_postReadRequest );
  @@ -536,7 +536,7 @@
   }
   
   // debug
  -public static final int dL=0;
  +private static final int dL=0;
   private void debug( String s ) {
System.out.println(Container:  + s );
   }
  
  
  
  1.41  +7 -7  jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java
  
  Index: Handler.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Handler.java  2001/08/03 02:47:32 1.40
  +++ Handler.java  2001/08/17 04:02:54 1.41
  @@ -126,8 +126,8 @@
   // Debug
   protected int debug=0;
   protected Log logger=null;
  -Handler next;
  -Handler prev;
  +protected Handler next;
  +protected Handler prev;
   
   
   private Object notes[]=new Object[ContextManager.MAX_NOTES];
  @@ -174,11 +174,11 @@
this.state=i;
   }
   
  -public final String getName() {
  +public String getName() {
return name;
   }
   
  -public final void setName(String handlerName) {
  +public void setName(String handlerName) {
   this.name=handlerName;
   }
   
  @@ -330,18 +330,18 @@
   
   /** Debug level for this handler.
*/
  -public final void setDebug( int d ) {
  +public void setDebug( int d ) {

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java ContextManager.java

2001-06-28 Thread costin 

costin  01/06/28 00:43:14

  Modified:src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java ContextManager.java
  Log:
  Added an extra comment about the return value for registerHooks,
  avoid the call to introspection by using the return value, use the
  default in ContextManager to avoid config issues ( when server.xml is
  not used ).
  
  I did a small review of the initialziation code, in order to make
  sure we respect the original goal of flexibility in the way tomcat is
  configured - and we don't depend at the core level on any particular
  configuration mechanism.
  
  The decoupling of Hook from introspection allow tomcat to reduce even further
  the requirements on the VM ( since many embedded VMs do not support
  introspection )
  
  Revision  ChangesPath
  1.47  +2 -1  
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- BaseInterceptor.java  2001/05/26 17:45:18 1.46
  +++ BaseInterceptor.java  2001/06/28 07:43:00 1.47
  @@ -619,9 +619,10 @@
*
*  Most modules are added to the Hooks automatically. A module
*  overriding this method has full control over this process.
  + *  If OK is returned, no other processing is done ( i.e. no introspection,
  + *  we assume the module set up the right hooks )
*/
   public int registerHooks(Hooks h, ContextManager cm, Context ctx) {
return DECLINED;
   }
  -
   }
  
  
  
  1.51  +2 -3  jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- Container.java2001/05/26 17:45:18 1.50
  +++ Container.java2001/06/28 07:43:03 1.51
  @@ -441,9 +441,8 @@
   public void addInterceptor( BaseInterceptor bi ) {
bi.setContext( getContext() );
   
  - if( Hooks.hasHook( bi, registerHooks ) ) {
  - bi.registerHooks( hooks, contextM, context );
  - } else {
  + int status=bi.registerHooks( hooks, contextM, context );
  + if( status!=BaseInterceptor.OK ) {
hooks.addModule( bi );
}
hooksCache=null;
  
  
  
  1.182 +1 -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.181
  retrieving revision 1.182
  diff -u -r1.181 -r1.182
  --- ContextManager.java   2001/06/21 13:04:43 1.181
  +++ ContextManager.java   2001/06/28 07:43:05 1.182
  @@ -195,7 +195,7 @@
   
   /** Private workspace for this server
*/
  -private String workDir;
  +private String workDir=work;
   
   /** The base directory where this instance runs.
*  It can be different from the install directory to

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java

2001-05-26 Thread costin 

costin  01/05/26 10:45:19

  Modified:src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java
  Log:
  Added postReadRequest hook, will be used to decode the request and
  do additional pre-processing ( session id extraction, etc ) - same as in
  the apache's hook with the same name.
  
  Revision  ChangesPath
  1.46  +16 -0 
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- BaseInterceptor.java  2001/03/09 23:47:39 1.45
  +++ BaseInterceptor.java  2001/05/26 17:45:18 1.46
  @@ -108,6 +108,21 @@
   }
   
   //  Request notifications 
  +
  +/**
  + *  Called immediately after the request has been received, before
  + *  any mapping.
  + *
  + *  This allows modules to alter the request before it is mapped, and
  + *  implement decoding/encoding, detect charsets, etc.
  + *  The request URI and (some) headers will be available.
  + * 
  + *  Similar with Apache's post_read_request
  + */
  +public int postReadRequest(Request request ) {
  + return 0;
  +}
  +
   
   /** Handle mappings inside a context.
*  You are required to respect the mappings in web.xml.
  @@ -115,6 +130,7 @@
   public int requestMap(Request request ) {
return 0;
   }
  +
   /** Will detect the context path for a request.
*  It need to set: context, contextPath, lookupPath
*
  
  
  
  1.50  +19 -17jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Container.java2001/03/08 03:51:26 1.49
  +++ Container.java2001/05/26 17:45:18 1.50
  @@ -388,29 +388,31 @@
   
   
   //  Interceptors 
  -public static final int H_requestMap=0;
  -public static final int H_contextMap=1;
  -public static final int H_authenticate=2;
  -public static final int H_authorize=3;
  -public static final int H_preService=4;
  -public static final int H_beforeBody=5;
  -public static final int H_findSession=6;
  -public static final int H_sessionState=7;
  -public static final int H_beforeCommit=8;
  -public static final int H_afterBody=9;
  -public static final int H_postService=10;
  -public static final int H_postRequest=11;
  -public static final int H_handleError=12;
  -public static final int H_getInfo=13;
  -public static final int H_setInfo=14;
  -public static final int H_engineInit=15;
  -public static final int H_COUNT=16;
  +public static final int H_postReadRequest=0;
  +public static final int H_requestMap=1;
  +public static final int H_contextMap=2;
  +public static final int H_authenticate=3;
  +public static final int H_authorize=4;
  +public static final int H_preService=5;
  +public static final int H_beforeBody=6;
  +public static final int H_findSession=7;
  +public static final int H_sessionState=8;
  +public static final int H_beforeCommit=9;
  +public static final int H_afterBody=10;
  +public static final int H_postService=11;
  +public static final int H_postRequest=12;
  +public static final int H_handleError=13;
  +public static final int H_getInfo=14;
  +public static final int H_setInfo=15;
  +public static final int H_engineInit=16;
  +public static final int H_COUNT=17;
   
   Hooks hooks=new Hooks();
   BaseInterceptor hooksCache[][]=null;
   BaseInterceptor allHooksCache[]=null;
   
   private void initHooks() {
  + hooks.registerHook( postReadRequest, H_postReadRequest );
hooks.registerHook( requestMap, H_requestMap );
hooks.registerHook( contextMap, H_contextMap );
hooks.registerHook( authenticate, H_authenticate );

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java

2001-02-05 Thread costin 

costin  01/02/05 22:40:07

  Modified:src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java
  Log:
  A small change in Container/BaseInterceptor regarding module add.
  The "registerHooks" needs access to the ContextManager and Context ( for
  local interceptors ) to do anything usefull.
  
  ( the method was added last year to allow modules full control over how
  they are added to the server, including ordering. It is not used so far,
  but if we run into ordering problems with the modules that will be the
  solution. )
  
  Revision  ChangesPath
  1.41  +1 -1  
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- BaseInterceptor.java  2001/02/03 05:43:18 1.40
  +++ BaseInterceptor.java  2001/02/06 06:40:06 1.41
  @@ -587,7 +587,7 @@
*  Most modules are added to the Hooks automatically. A module
*  overriding this method has full control over this process.
*/
  -public int registerHooks(Hooks h) {
  +public int registerHooks(Hooks h, ContextManager cm, Context ctx) {
return DECLINED;
   }
   
  
  
  
  1.46  +1 -1  jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Container.java2001/02/01 04:47:12 1.45
  +++ Container.java2001/02/06 06:40:06 1.46
  @@ -422,7 +422,7 @@
bi.setContext( getContext() );
   
if( Hooks.hasHook( bi, "registerHooks" ) ) {
  - bi.registerHooks( hooks );
  + bi.registerHooks( hooks, contextM, context );
} else {
hooks.addModule( bi );
}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java

2001-02-01 Thread costin 

costin  01/01/31 20:47:12

  Modified:src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java
  Log:
  Fix cutpaste bug, all modules were called to handleError instead of
  just the ones that implemented the hook.
  
  Added few comments in BaseInterceptor. ( related with the fix in ContextManager
  that will follow for startup order and war expansion )
  
  Revision  ChangesPath
  1.39  +8 -0  
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- BaseInterceptor.java  2001/01/28 19:49:19 1.38
  +++ BaseInterceptor.java  2001/02/01 04:47:12 1.39
  @@ -294,6 +294,9 @@
*
*  This hook will be called before the interceptor is initialized
*  ( using engineInit hook )
  + *
  + *  An interceptor can add/remove other interceptors or applications,
  + *  or alter the ordering of hooks, or change/set server properties.
* 
*  @param cm  the server
*  @param ctx not null if this is a local interceptor
  @@ -344,12 +347,17 @@
   {
   }
   
  +/** Notify that the server is ready and able to process requests
  + */
   public  void engineStart(ContextManager cm )
throws TomcatException
   {
   }
   
   
  +/** Notify that the server is disabled and shoulnd't process more
  + * requests
  + */
   public  void engineStop(ContextManager cm )
throws TomcatException
   {
  
  
  
  1.45  +1 -1  jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Container.java2001/01/01 00:17:23 1.44
  +++ Container.java2001/02/01 04:47:12 1.45
  @@ -408,7 +408,7 @@
hooks.registerHook( "postService", H_postService );
hooks.registerHook( "postRequest", H_postRequest );
hooks.registerHook( "handleError", H_handleError );
  - hooks.registerHook( "engineInit", H_handleError );
  + hooks.registerHook( "engineInit", H_engineInit );
   }
   
   public Hooks getHooks() {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]