Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 29080 invoked from network); 11 Sep 2010 10:17:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Sep 2010 10:17:34 -0000 Received: (qmail 65637 invoked by uid 500); 11 Sep 2010 10:17:33 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 65080 invoked by uid 500); 11 Sep 2010 10:17:30 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 65070 invoked by uid 99); 11 Sep 2010 10:17:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Sep 2010 10:17:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Sep 2010 10:17:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3117A23888FE; Sat, 11 Sep 2010 10:17:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r996114 - in /tomcat/trunk/java/org/apache/catalina/startup: EngineRuleSet.java HostRuleSet.java Date: Sat, 11 Sep 2010 10:17:08 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100911101708.3117A23888FE@eris.apache.org> Author: markt Date: Sat Sep 11 10:17:07 2010 New Revision: 996114 URL: http://svn.apache.org/viewvc?rev=996114&view=rev Log: Revert r996112. At least some of that config is required. Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=996114&r1=996113&r2=996114&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sat Sep 11 10:17:07 2010 @@ -94,6 +94,10 @@ public class EngineRuleSet extends RuleS "org.apache.catalina.core.StandardEngine", "className"); digester.addSetProperties(prefix + "Engine"); + digester.addRule(prefix + "Engine", + new LifecycleListenerRule + ("org.apache.catalina.startup.EngineConfig", + "engineConfigClass")); digester.addSetNext(prefix + "Engine", "setContainer", "org.apache.catalina.Container"); Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=996114&r1=996113&r2=996114&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Sat Sep 11 10:17:07 2010 @@ -96,6 +96,10 @@ public class HostRuleSet extends RuleSet digester.addSetProperties(prefix + "Host"); digester.addRule(prefix + "Host", new CopyParentClassLoaderRule()); + digester.addRule(prefix + "Host", + new LifecycleListenerRule + ("org.apache.catalina.startup.HostConfig", + "hostConfigClass")); digester.addSetNext(prefix + "Host", "addChild", "org.apache.catalina.Container"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org