funkman 2004/09/15 11:26:53 Modified: catalina/src/share/org/apache/catalina/startup Tag: TOMCAT_5_0 Catalina.java Log: On shutdown use CatalinaDigester instead of Digester so the shutdown port can be taken from a system property. Revision Changes Path No revision No revision 1.28.2.1 +11 -11 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java Index: Catalina.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -r1.28 -r1.28.2.1 --- Catalina.java 25 Mar 2004 22:51:46 -0000 1.28 +++ Catalina.java 15 Sep 2004 18:26:53 -0000 1.28.2.1 @@ -1,12 +1,12 @@ /* * Copyright 1999,2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -308,7 +308,7 @@ digester.addObjectCreate("Server/Service/Connector", "org.apache.coyote.tomcat5.CoyoteConnector", "className"); - digester.addRule("Server/Service/Connector", + digester.addRule("Server/Service/Connector", new SetAllPropertiesRule()); digester.addSetNext("Server/Service/Connector", "addConnector", @@ -359,7 +359,7 @@ protected Digester createStopDigester() { // Initialize the digester - Digester digester = new Digester(); + Digester digester = new CatalinaDigester(); // Configure the rules we need for shutting down digester.addObjectCreate("Server", @@ -516,7 +516,7 @@ } - /* + /* * Load using arguments */ public void load(String args[]) { @@ -589,7 +589,7 @@ public void stop() { try { - // Remove the ShutdownHook first so that server.stop() + // Remove the ShutdownHook first so that server.stop() // doesn't get invoked twice if (useShutdownHook) { Runtime.getRuntime().removeShutdownHook(shutdownHook); @@ -647,12 +647,12 @@ if (server != null) { Catalina.this.stop(); } - + } } - - + + private static org.apache.commons.logging.Log log= org.apache.commons.logging.LogFactory.getLog( Catalina.class );
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]