patrickl    02/01/19 16:51:54

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        SetUpContextAction.java TomcatTreeBuilder.java
  Log:
  Replace all references to the DefaultContext and StandardContext MBeans' "name" 
property with "path". This change matches the renaming of the "name" property to 
"path" in the mbeans-descriptor.xml file.
  
  Revision  Changes    Path
  1.2       +5 -5      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpContextAction.java
  
  Index: SetUpContextAction.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpContextAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetUpContextAction.java   18 Jan 2002 05:53:26 -0000      1.1
  +++ SetUpContextAction.java   20 Jan 2002 00:51:53 -0000      1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpContextAction.java,v
 1.1 2002/01/18 05:53:26 patrickl Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/01/18 05:53:26 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpContextAction.java,v
 1.2 2002/01/20 00:51:53 patrickl Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/01/20 00:51:53 $
    *
    * ====================================================================
    *
  @@ -99,7 +99,7 @@
    * a context is chosen.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.1 $ $Date: 2002/01/18 05:53:26 $
  + * @version $Revision: 1.2 $ $Date: 2002/01/20 00:51:53 $
    */
   
   public class SetUpContextAction extends Action {
  @@ -112,7 +112,7 @@
       public final static String DEBUG_PROP_NAME = "debug";
       public final static String DOC_BASE_PROP_NAME = "docBase";
       public final static String OVERRIDE_PROP_NAME = "override";
  -    public final static String PATH_PROP_NAME = "name";
  +    public final static String PATH_PROP_NAME = "path";
       public final static String RELOADABLE_PROP_NAME = "reloadable";
       public final static String USENAMING_PROP_NAME = "useNaming";
       public final static String WORKDIR_PROP_NAME = "workDir";
  
  
  
  1.8       +5 -6      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
  
  Index: TomcatTreeBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TomcatTreeBuilder.java    18 Jan 2002 05:53:26 -0000      1.7
  +++ TomcatTreeBuilder.java    20 Jan 2002 00:51:53 -0000      1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
 1.7 2002/01/18 05:53:26 patrickl Exp $
  - * $Revision: 1.7 $
  - * $Date: 2002/01/18 05:53:26 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
 1.8 2002/01/20 00:51:53 patrickl Exp $
  + * $Revision: 1.8 $
  + * $Date: 2002/01/20 00:51:53 $
    *
    * ====================================================================
    *
  @@ -91,7 +91,7 @@
    *
    * @author Jazmin Jonson
    * @author Manveen Kaur
  - * @version $Revision: 1.7 $ $Date: 2002/01/18 05:53:26 $
  + * @version $Revision: 1.8 $ $Date: 2002/01/20 00:51:53 $
    */
   
   
  @@ -305,8 +305,7 @@
               ObjectInstance contextObj = (ObjectInstance)contextItr.next();
               
               String contextName =
  -            (String)mBServer.getAttribute(contextObj.getObjectName(),
  -            "name");
  +            (String)mBServer.getAttribute(contextObj.getObjectName(), "path");
               
               encodedContextName =  
URLEncoder.encode(contextObj.getObjectName().toString());
               
  
  
  

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

Reply via email to