You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/06/08 09:25:10 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans ContextResourceMBean.java

remm        2002/06/08 00:25:10

  Modified:    catalina/src/share/org/apache/catalina/mbeans
                        ContextResourceMBean.java
  Log:
  - Rename methods getNamingResource -> getNamingResources (missing 's'
    was breaking the JavaBeans conventions).
  
  Revision  Changes    Path
  1.6       +8 -8      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java
  
  Index: ContextResourceMBean.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ContextResourceMBean.java	29 May 2002 20:10:57 -0000	1.5
  +++ ContextResourceMBean.java	8 Jun 2002 07:25:10 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java,v 1.5 2002/05/29 20:10:57 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/05/29 20:10:57 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java,v 1.6 2002/06/08 07:25:10 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/06/08 07:25:10 $
    *
    * ====================================================================
    *
  @@ -86,7 +86,7 @@
    * <code>org.apache.catalina.deploy.ContextResource</code> component.</p>
    *
    * @author Amy Roh
  - * @version $Revision: 1.5 $ $Date: 2002/05/29 20:10:57 $
  + * @version $Revision: 1.6 $ $Date: 2002/06/08 07:25:10 $
    */
   
   public class ContextResourceMBean extends BaseModelMBean {
  @@ -161,7 +161,7 @@
           } else if ("type".equals(name)) {
               return (cr.getType());
           } else {
  -            NamingResources nr = cr.getNamingResource(); 
  +            NamingResources nr = cr.getNamingResources(); 
               if (nr == null) {
                   throw new AttributeNotFoundException
                       ("Cannot find naming resource "+cr.getName());
  @@ -233,18 +233,18 @@
               cr.setType((String)value);
           } else {
               ResourceParams rp = 
  -                cr.getNamingResource().findResourceParams(cr.getName());
  +                cr.getNamingResources().findResourceParams(cr.getName());
               if (rp != null) {
                   String valueStr = ""+value;
                   rp.addParameter(name, valueStr);
  -                cr.getNamingResource().removeResourceParams(cr.getName());
  +                cr.getNamingResources().removeResourceParams(cr.getName());
               } else {
                   rp = new ResourceParams();
                   rp.setName(cr.getName());
                   String valueStr = ""+value;
                   rp.addParameter(name, valueStr);
               }
  -            cr.getNamingResource().addResourceParams(rp);
  +            cr.getNamingResources().addResourceParams(rp);
           }
       }
       
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>