cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java

[craigmcc]

craigmcc    01/03/24 13:12:26

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  Create JNDI entries for EJB references, resource references, and resource
  environment references in the "java:comp/env" context, rather than in the
  "java:comp" context.  This is compatible with the requirements of the J2EE
  specification.
  
  Revision  Changes    Path
  1.46      +10 -10    
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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- StandardContext.java      2001/03/22 19:19:51     1.45
  +++ StandardContext.java      2001/03/24 21:12:25     1.46
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.45 2001/03/22 19:19:51 remm Exp $
  - * $Revision: 1.45 $
  - * $Date: 2001/03/22 19:19:51 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.46 2001/03/24 21:12:25 craigmcc Exp $
  + * $Revision: 1.46 $
  + * $Date: 2001/03/24 21:12:25 $
    *
    * ====================================================================
    *
  @@ -140,7 +140,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.45 $ $Date: 2001/03/22 19:19:51 $
  + * @version $Revision: 1.46 $ $Date: 2001/03/24 21:12:25 $
    */
   
   public class StandardContext
  @@ -3387,8 +3387,8 @@
               // Adding the additional parameters, if any
               addAdditionalParameters(ref, ejb.getName());
               try {
  -                createSubcontexts(compCtx, ejb.getName());
  -                compCtx.bind(ejb.getName(), ref);
  +                createSubcontexts(envCtx, ejb.getName());
  +                envCtx.bind(ejb.getName(), ref);
               } catch (NamingException e) {
                   log(sm.getString("standardContext.bindFailed", e));
               }
  @@ -3407,8 +3407,8 @@
               // Adding the additional parameters, if any
               addAdditionalParameters(ref, resource.getName());
               try {
  -                createSubcontexts(compCtx, resource.getName());
  -                compCtx.bind(resource.getName(), ref);
  +                createSubcontexts(envCtx, resource.getName());
  +                envCtx.bind(resource.getName(), ref);
               } catch (NamingException e) {
                   log(sm.getString("standardContext.bindFailed", e));
               }
  @@ -3426,8 +3426,8 @@
               // Adding the additional parameters, if any
               addAdditionalParameters(ref, key);
               try {
  -                createSubcontexts(compCtx, key);
  -                compCtx.bind(key, ref);
  +                createSubcontexts(envCtx, key);
  +                envCtx.bind(key, ref);
               } catch (NamingException e) {
                   log(sm.getString("standardContext.bindFailed", e));
               }