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 StandardDefaultContext.java
Date Fri, 09 Nov 2001 19:35:46 GMT
remm        01/11/09 11:35:46

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardDefaultContext.java
  Log:
  - The standard default context now uses the NamingResources helper object.
  
  Revision  Changes    Path
  1.2       +82 -95    jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
  
  Index: StandardDefaultContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StandardDefaultContext.java	2001/10/16 23:15:11	1.1
  +++ StandardDefaultContext.java	2001/11/09 19:35:46	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
1.1 2001/10/16 23:15:11 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/10/16 23:15:11 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
1.2 2001/11/09 19:35:46 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/11/09 19:35:46 $
    *
    * ====================================================================
    *
  @@ -83,6 +83,8 @@
   import org.apache.catalina.deploy.ContextEjb;
   import org.apache.catalina.deploy.ContextEnvironment;
   import org.apache.catalina.deploy.ContextResource;
  +import org.apache.catalina.deploy.ContextResourceLink;
  +import org.apache.catalina.deploy.NamingResources;
   import org.apache.catalina.deploy.ResourceParams;
   import org.apache.catalina.util.StringManager;
   
  @@ -93,7 +95,7 @@
    * <CODE>override="true"</CODE>.
    *
    * @author Glenn Nielsen
  - * @version $Revision: 1.1 $ $Date: 2001/10/16 23:15:11 $
  + * @version $Revision: 1.2 $ $Date: 2001/11/09 19:35:46 $
    */
   
   public class StandardDefaultContext implements DefaultContext {
  @@ -140,18 +142,6 @@
   
   
       /**
  -     * The EJB resource references for this web application, keyed by name.
  -     */
  -    private HashMap ejbs = new HashMap();
  -
  -
  -    /**
  -     * The environment entries for this web application, keyed by name.
  -     */
  -    private HashMap envs = new HashMap();
  -
  -
  -    /**
        * The descriptive information string for this implementation.
        */
       private static final String info =
  @@ -172,36 +162,23 @@
           "org.apache.catalina.core.StandardContextMapper";
   
   
  -    /**
  -     * The context initialization parameters for this web application,
  -     * keyed by name.
  -     */
  -    private HashMap parameters = new HashMap();
  -
  -
       /**
  -     * The reloadable flag for this web application.
  +     * The associated naming resources.
        */
  -    private boolean reloadable = false;
  +    private NamingResources namingResources = new NamingResources();
   
   
       /**
  -     * The resource environment references for this web application,
  +     * The context initialization parameters for this web application,
        * keyed by name.
  -     */
  -    private HashMap resourceEnvRefs = new HashMap();
  -
  -
  -    /**
  -     * The resource references for this web application, keyed by name.
        */
  -    private HashMap resources = new HashMap();
  +    private HashMap parameters = new HashMap();
   
   
       /**
  -     * The resource parameters for this web application, keyed by name.
  +     * The reloadable flag for this web application.
        */
  -    private HashMap resourceParams = new HashMap();
  +    private boolean reloadable = false;
   
   
       /**
  @@ -546,9 +523,7 @@
        */
       public void addEjb(ContextEjb ejb) {
   
  -        synchronized (ejbs) {
  -            ejbs.put(ejb.getName(), ejb);
  -        }
  +        namingResources.addEjb(ejb);
   
       }
   
  @@ -559,9 +534,8 @@
        * @param environment New environment entry
        */
       public void addEnvironment(ContextEnvironment environment) {
  -        synchronized (envs) {
  -            envs.put(environment.getName(), environment);
  -        }
  +
  +        namingResources.addEnvironment(environment);
   
       }
   
  @@ -572,10 +546,8 @@
        * @param resourceParameters New resource parameters
        */
       public void addResourceParams(ResourceParams resourceParameters) {
  -        synchronized (resourceParams) {
  -            resourceParams.put(resourceParameters.getName(),
  -                               resourceParameters);
  -        }
  +
  +        namingResources.addResourceParams(resourceParameters);
   
       }
   
  @@ -633,9 +605,8 @@
        * @param resource New resource reference
        */
       public void addResource(ContextResource resource) {
  -        synchronized (resources) {
  -            resources.put(resource.getName(), resource);
  -        }
  +
  +        namingResources.addResource(resource);
   
       }
   
  @@ -647,9 +618,20 @@
        * @param type The resource environment reference type
        */
       public void addResourceEnvRef(String name, String type) {
  -        synchronized (resourceEnvRefs) {
  -            resourceEnvRefs.put(name, type);
  -        }
  +
  +        namingResources.addResourceEnvRef(name, type);
  +
  +    }
  +
  +
  +    /**
  +     * Add a resource link for this web application.
  +     *
  +     * @param resource New resource link
  +     */
  +    public void addResourceLink(ContextResourceLink resourceLink) {
  +
  +        namingResources.addResourceLink(resourceLink);
   
       }
   
  @@ -721,9 +703,7 @@
        */
       public ContextEjb findEjb(String name) {
   
  -        synchronized (ejbs) {
  -            return ((ContextEjb) ejbs.get(name));
  -        }
  +        return namingResources.findEjb(name);
   
       }
   
  @@ -734,10 +714,7 @@
        */
       public ContextEjb[] findEjbs() {
   
  -        synchronized (ejbs) {
  -            ContextEjb results[] = new ContextEjb[ejbs.size()];
  -            return ((ContextEjb[]) ejbs.values().toArray(results));
  -        }
  +        return namingResources.findEjbs();
   
       }
   
  @@ -750,9 +727,7 @@
        */
       public ContextEnvironment findEnvironment(String name) {
   
  -        synchronized (envs) {
  -            return ((ContextEnvironment) envs.get(name));
  -        }
  +        return namingResources.findEnvironment(name);
   
       }
   
  @@ -764,10 +739,7 @@
        */
       public ContextEnvironment[] findEnvironments() {
   
  -        synchronized (envs) {
  -            ContextEnvironment results[] = new ContextEnvironment[envs.size()];
  -            return ((ContextEnvironment[]) envs.values().toArray(results));
  -        }
  +        return namingResources.findEnvironments();
   
       }
   
  @@ -779,10 +751,7 @@
        */
       public ResourceParams[] findResourceParams() {
   
  -        synchronized (resourceParams) {
  -            ResourceParams results[] = new ResourceParams[resourceParams.size()];
  -            return ((ResourceParams[]) resourceParams.values().toArray(results));
  -        }
  +        return namingResources.findResourceParams();
   
       }
   
  @@ -836,9 +805,7 @@
        */
       public ContextResource findResource(String name) {
   
  -        synchronized (resources) {
  -            return ((ContextResource) resources.get(name));
  -        }
  +        return namingResources.findResource(name);
   
       }
   
  @@ -851,9 +818,7 @@
        */
       public String findResourceEnvRef(String name) {
   
  -        synchronized (resourceEnvRefs) {
  -            return ((String) resourceEnvRefs.get(name));
  -        }
  +        return namingResources.findResourceEnvRef(name);
   
       }
   
  @@ -865,10 +830,31 @@
        */
       public String[] findResourceEnvRefs() {
   
  -        synchronized (resourceEnvRefs) {
  -            String results[] = new String[resourceEnvRefs.size()];
  -            return ((String[]) resourceEnvRefs.keySet().toArray(results));
  -        }
  +        return namingResources.findResourceEnvRefs();
  +
  +    }
  +
  +
  +    /**
  +     * Return the resource link with the specified name, if any;
  +     * otherwise return <code>null</code>.
  +     *
  +     * @param name Name of the desired resource link
  +     */
  +    public ContextResourceLink findResourceLink(String name) {
  +
  +        return namingResources.findResourceLink(name);
  +
  +    }
  +
  +
  +    /**
  +     * Return the defined resource links for this application.  If
  +     * none have been defined, a zero-length array is returned.
  +     */
  +    public ContextResourceLink[] findResourceLinks() {
  +
  +        return namingResources.findResourceLinks();
   
       }
   
  @@ -879,10 +865,7 @@
        */
       public ContextResource[] findResources() {
   
  -        synchronized (resources) {
  -            ContextResource results[] = new ContextResource[resources.size()];
  -            return ((ContextResource[]) resources.values().toArray(results));
  -        }
  +        return namingResources.findResources();
   
       }
   
  @@ -988,9 +971,7 @@
        */
       public void removeEjb(String name) {
   
  -        synchronized (ejbs) {
  -            ejbs.remove(name);
  -        }
  +        namingResources.removeEjb(name);
   
       }
   
  @@ -1002,9 +983,7 @@
        */
       public void removeEnvironment(String name) {
   
  -        synchronized (envs) {
  -            envs.remove(name);
  -        }
  +        namingResources.removeEnvironment(name);
   
       }
   
  @@ -1066,9 +1045,7 @@
        */
       public void removeResource(String name) {
   
  -        synchronized (resources) {
  -            resources.remove(name);
  -        }
  +        namingResources.removeResource(name);
   
       }
   
  @@ -1080,9 +1057,19 @@
        */
       public void removeResourceEnvRef(String name) {
   
  -        synchronized (resourceEnvRefs) {
  -            resourceEnvRefs.remove(name);
  -        }
  +        namingResources.removeResourceEnvRef(name);
  +
  +    }
  +
  +
  +    /**
  +     * Remove any resource link with the specified name.
  +     *
  +     * @param name Name of the resource link to remove
  +     */
  +    public void removeResourceLink(String name) {
  +
  +        namingResources.removeResourceLink(name);
   
       }
   
  
  
  

--
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