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 F30C71093E for ; Thu, 18 Apr 2013 02:56:23 +0000 (UTC) Received: (qmail 82592 invoked by uid 500); 18 Apr 2013 02:56:23 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 82403 invoked by uid 500); 18 Apr 2013 02:56:22 -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 82358 invoked by uid 99); 18 Apr 2013 02:56:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Apr 2013 02:56:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 18 Apr 2013 02:56:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 383B723889F7 for ; Thu, 18 Apr 2013 02:56:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1469144 - /tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Date: Thu, 18 Apr 2013 02:56:01 -0000 To: dev@tomcat.apache.org From: kfujino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130418025601.383B723889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kfujino Date: Thu Apr 18 02:56:00 2013 New Revision: 1469144 URL: http://svn.apache.org/r1469144 Log: Add support for Host#xmlBase. Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1469144&r1=1469143&r2=1469144&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Thu Apr 18 02:56:00 2013 @@ -168,9 +168,7 @@ public class FarmWarDeployer extends Clu } } - configBase = new File(engine.getCatalinaBase(), "conf"); - configBase = new File(configBase, engine.getName()); - configBase = new File(configBase, hostname); + configBase = host.getConfigBaseFile(); // Retrieve the MBean server mBeanServer = Registry.getRegistry(null, null).getMBeanServer(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org