remm        2002/06/23 13:35:30

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  - Don't remove resources on stop (only the resources specified in web.xml would
    get added back).
  
  Revision  Changes    Path
  1.66      +16 -4     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- ContextConfig.java        16 May 2002 21:08:26 -0000      1.65
  +++ ContextConfig.java        23 Jun 2002 20:35:30 -0000      1.66
  @@ -722,16 +722,20 @@
           }
   
           // Removing Ejbs
  +        /*
           ContextEjb[] contextEjbs = context.findEjbs();
           for (i = 0; i < contextEjbs.length; i++) {
               context.removeEjb(contextEjbs[i].getName());
           }
  +        */
   
           // Removing environments
  +        /*
           ContextEnvironment[] contextEnvironments = context.findEnvironments();
           for (i = 0; i < contextEnvironments.length; i++) {
               context.removeEnvironment(contextEnvironments[i].getName());
           }
  +        */
   
           // Removing errors pages
           ErrorPage[] errorPages = context.findErrorPages();
  @@ -758,10 +762,12 @@
           }
   
           // Removing local ejbs
  +        /*
           ContextLocalEjb[] contextLocalEjbs = context.findLocalEjbs();
           for (i = 0; i < contextLocalEjbs.length; i++) {
               context.removeLocalEjb(contextLocalEjbs[i].getName());
           }
  +        */
   
           // Removing Mime mappings
           String[] mimeMappings = context.findMimeMappings();
  @@ -776,23 +782,29 @@
           }
   
           // Removing resource env refs
  +        /*
           String[] resourceEnvRefs = context.findResourceEnvRefs();
           for (i = 0; i < resourceEnvRefs.length; i++) {
               context.removeResourceEnvRef(resourceEnvRefs[i]);
           }
  +        */
   
           // Removing resource links
  +        /*
           ContextResourceLink[] contextResourceLinks = 
               context.findResourceLinks();
           for (i = 0; i < contextResourceLinks.length; i++) {
               context.removeResourceLink(contextResourceLinks[i].getName());
           }
  +        */
   
           // Removing resources
  +        /*
           ContextResource[] contextResources = context.findResources();
           for (i = 0; i < contextResources.length; i++) {
               context.removeResource(contextResources[i].getName());
           }
  +        */
   
           // Removing sercurity role
           String[] securityRoles = context.findSecurityRoles();
  
  
  

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

Reply via email to