tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java MapperListener.java
Date Tue, 22 Apr 2003 17:11:35 GMT
costin      2003/04/22 10:11:34

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardHost.java
               catalina/src/share/org/apache/coyote/tomcat5
                        CoyoteConnector.java MapperListener.java
  Log:
  revert the engine name.
  
  Amy - I'm really sorry for missunderstanding your proposal, I tought
  you wanted to have multiple engines - with different names, but still
  use the domain.
  
  Adding the name= to the engine object name will make a lot of things very complicated.
  
  I'll start debugging the admin/ and try to undo your changes ( tonight - I have
  a lot of work for today ). If you could undo them quickly, it would be great.
  
  Is it very difficult to have the engine name==domain.
  
  Revision  Changes    Path
  1.12      +2 -2      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
  
  Index: StandardHost.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StandardHost.java	19 Apr 2003 21:16:11 -0000	1.11
  +++ StandardHost.java	22 Apr 2003 17:11:34 -0000	1.12
  @@ -1056,7 +1056,7 @@
               try {
                   // Register with the Engine
                   ObjectName serviceName=new ObjectName(domain + 
  -                                        ":type=Engine,name="+parent.getName());
  +                                        ":type=Engine");
                   
                   if( mserver.isRegistered( serviceName )) {
                       log.info("Registering with the Engine");
  
  
  
  1.3       +2 -2      jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CoyoteConnector.java	20 Apr 2003 10:13:11 -0000	1.2
  +++ CoyoteConnector.java	22 Apr 2003 17:11:34 -0000	1.3
  @@ -1240,7 +1240,7 @@
   
           if( this.domain != null ) {
               mapperListener.setDomain( domain );
  -            mapperListener.setEngine( service.getContainer().getName() );
  +            //mapperListener.setEngine( service.getContainer().getName() );
               mapperListener.init();
               try {
                   Registry.getRegistry().registerComponent
  
  
  
  1.3       +1 -1      jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/MapperListener.java
  
  Index: MapperListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/MapperListener.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MapperListener.java	20 Apr 2003 10:13:11 -0000	1.2
  +++ MapperListener.java	22 Apr 2003 17:11:34 -0000	1.3
  @@ -272,7 +272,7 @@
           throws Exception
       {
           ObjectName engineName = new ObjectName
  -            (domain + ":type=Engine,name=" + engine);
  +            (domain + ":type=Engine");
           if ( ! mBeanServer.isRegistered(engineName)) return;
           String defaultHost = 
               (String) mBeanServer.getAttribute(engineName, "defaultHost");
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message