tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core NamingContextListener.java
Date Sat, 10 Nov 2001 00:31:04 GMT
remm        01/11/09 16:31:04

  Modified:    catalina/src/share/org/apache/catalina/core
                        NamingContextListener.java
  Log:
  - Implement changes suggested by Craig. The global naming context now
    uses a flat structure (whereas the JNDI ENC uses a /comp/env structure).
  
  Revision  Changes    Path
  1.3       +11 -6     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
  
  Index: NamingContextListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamingContextListener.java	2001/11/10 00:01:54	1.2
  +++ NamingContextListener.java	2001/11/10 00:31:04	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
1.2 2001/11/10 00:01:54 craigmcc Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/11/10 00:01:54 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
1.3 2001/11/10 00:31:04 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/11/10 00:31:04 $
    *
    * ====================================================================
    *
  @@ -116,7 +116,7 @@
    * with each context and server.
    *
    * @author Remy Maucherat
  - * @version $Revision: 1.2 $ $Date: 2001/11/10 00:01:54 $
  + * @version $Revision: 1.3 $ $Date: 2001/11/10 00:31:04 $
    */
   
   public class NamingContextListener
  @@ -400,8 +400,13 @@
           throws NamingException {
   
           // Creating the comp subcontext
  -        compCtx = namingContext.createSubcontext("comp");
  -        envCtx = compCtx.createSubcontext("env");
  +        if (container instanceof Server) {
  +            compCtx = namingContext;
  +            envCtx = namingContext;
  +        } else {
  +            compCtx = namingContext.createSubcontext("comp");
  +            envCtx = compCtx.createSubcontext("env");
  +        }
   
           int i;
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message