Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 53647 invoked from network); 20 Apr 2003 10:13:20 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 20 Apr 2003 10:13:20 -0000 Received: (qmail 11327 invoked by uid 97); 20 Apr 2003 10:15:29 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 11320 invoked from network); 20 Apr 2003 10:15:29 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 20 Apr 2003 10:15:29 -0000 Received: (qmail 52808 invoked by uid 500); 20 Apr 2003 10:13:13 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 52797 invoked by uid 500); 20 Apr 2003 10:13:13 -0000 Received: (qmail 52794 invoked from network); 20 Apr 2003 10:13:13 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 20 Apr 2003 10:13:13 -0000 Received: (qmail 91644 invoked by uid 1135); 20 Apr 2003 10:13:12 -0000 Date: 20 Apr 2003 10:13:12 -0000 Message-ID: <20030420101312.91643.qmail@icarus.apache.org> From: remm@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java MapperListener.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N remm 2003/04/20 03:13:11 Modified: catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java MapperListener.java Log: - Fix default host init in the mapper. Revision Changes Path 1.2 +2 -1 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CoyoteConnector.java 19 Apr 2003 18:49:10 -0000 1.1 +++ CoyoteConnector.java 20 Apr 2003 10:13:11 -0000 1.2 @@ -1240,6 +1240,7 @@ if( this.domain != null ) { mapperListener.setDomain( domain ); + mapperListener.setEngine( service.getContainer().getName() ); mapperListener.init(); try { Registry.getRegistry().registerComponent 1.2 +16 -7 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MapperListener.java 19 Apr 2003 18:49:10 -0000 1.1 +++ MapperListener.java 20 Apr 2003 10:13:11 -0000 1.2 @@ -110,6 +110,7 @@ // It should be null - and fail if not set private String domain="*"; + private String engine="*"; // ----------------------------------------------------------- Constructors @@ -132,6 +133,14 @@ this.domain = domain; } + public String getEngine() { + return engine; + } + + public void setEngine(String engine) { + this.engine = engine; + } + /** * Initialize associated mapper. */ @@ -141,8 +150,7 @@ mBeanServer = Registry.getServer(); - // FIXME - registerHosts(null); + registerEngine(); // Query hosts String onStr = domain + ":type=Host,*"; @@ -260,13 +268,14 @@ // ------------------------------------------------------ Protected Methods - private void registerHosts(ObjectName objectName) + private void registerEngine() throws Exception { - ObjectName engineName=new ObjectName(domain + ":type=Engine"); - if( ! mBeanServer.isRegistered(engineName)) return; - //if (container instanceof Engine) { - String defaultHost = (String)mBeanServer.getAttribute(engineName, "defaultHost"); + ObjectName engineName = new ObjectName + (domain + ":type=Engine,name=" + engine); + if ( ! mBeanServer.isRegistered(engineName)) return; + String defaultHost = + (String) mBeanServer.getAttribute(engineName, "defaultHost"); // This should probablt be called later if( defaultHost != null ) { mapper.setDefaultHostName(defaultHost); --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org