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/mbeans MBeanUtils.java
Date Wed, 23 Jan 2002 17:44:55 GMT
remm        02/01/23 09:44:55

  Modified:    catalina/src/share/org/apache/catalina/mbeans
                        MBeanUtils.java
  Log:
  - Remove dependency on the WarpConnector.
  
  Revision  Changes    Path
  1.14      +4 -13     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- MBeanUtils.java	22 Jan 2002 23:46:01 -0000	1.13
  +++ MBeanUtils.java	23 Jan 2002 17:44:55 -0000	1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.13 2002/01/22 23:46:01 amyroh Exp $
  - * $Revision: 1.13 $
  - * $Date: 2002/01/22 23:46:01 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.14 2002/01/23 17:44:55 remm Exp $
  + * $Revision: 1.14 $
  + * $Date: 2002/01/23 17:44:55 $
    *
    * ====================================================================
    *
  @@ -96,7 +96,6 @@
   import org.apache.catalina.UserDatabase;
   import org.apache.catalina.Valve;
   import org.apache.catalina.connector.http.HttpConnector;
  -import org.apache.catalina.connector.warp.WarpConnector;
   import org.apache.catalina.valves.ValveBase;
   import org.apache.commons.modeler.ManagedBean;
   import org.apache.commons.modeler.Registry;
  @@ -107,7 +106,7 @@
    *
    * @author Craig R. McClanahan
    * @author Amy Roh
  - * @version $Revision: 1.13 $ $Date: 2002/01/22 23:46:01 $
  + * @version $Revision: 1.14 $ $Date: 2002/01/23 17:44:55 $
    */
   
   public class MBeanUtils {
  @@ -606,14 +605,6 @@
                                     httpConnector.getService().getName() +
                                     ",port=" + httpConnector.getPort() +
                                     ",address=" + httpConnector.getAddress());
  -            return (name);
  -        } else if (connector instanceof WarpConnector) {
  -            WarpConnector warpConnector = (WarpConnector) connector;
  -            name = new ObjectName(domain + ":type=Connector" +
  -                                  ",service=" +
  -                                  warpConnector.getService().getName() +
  -                                  ",port=" + warpConnector.getPort() +
  -                                  ",address=" + warpConnector.getAddress());
               return (name);
           } else {
               throw new MalformedObjectNameException
  
  
  

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