Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 354B0188D7 for ; Sun, 22 Nov 2015 16:02:54 +0000 (UTC) Received: (qmail 34942 invoked by uid 500); 22 Nov 2015 16:02:53 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 34868 invoked by uid 500); 22 Nov 2015 16:02:53 -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 34858 invoked by uid 99); 22 Nov 2015 16:02:53 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Nov 2015 16:02:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 49E141A0B80 for ; Sun, 22 Nov 2015 16:02:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id r4pRf1uSoKbE for ; Sun, 22 Nov 2015 16:02:52 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 6BFC8429AA for ; Sun, 22 Nov 2015 16:02:52 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id DC9B3E0163 for ; Sun, 22 Nov 2015 16:02:51 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id DB0463A0046 for ; Sun, 22 Nov 2015 16:02:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1715638 - /tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Date: Sun, 22 Nov 2015 16:02:51 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151122160251.DB0463A0046@svn01-us-west.apache.org> Author: markt Date: Sun Nov 22 16:02:51 2015 New Revision: 1715638 URL: http://svn.apache.org/viewvc?rev=1715638&view=rev Log: Service.setContainer() now expects an Engine Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.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=1715638&r1=1715637&r2=1715638&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sun Nov 22 16:02:51 2015 @@ -93,7 +93,7 @@ public class EngineRuleSet extends RuleS "engineConfigClass")); digester.addSetNext(prefix + "Engine", "setContainer", - "org.apache.catalina.Container"); + "org.apache.catalina.Engine"); //Cluster configuration start digester.addObjectCreate(prefix + "Engine/Cluster", --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org