Return-Path: 
 <scm-return-24999-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 33486 invoked from network); 7 Feb 2008 20:31:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Feb 2008 20:31:42 -0000
Received: (qmail 12400 invoked by uid 500); 7 Feb 2008 20:31:35 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 12357 invoked by uid 500); 7 Feb 2008 20:31:34 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 12346 invoked by uid 99); 7 Feb 2008 20:31:34 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 12:31:34 -0800
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.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 20:31:26 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5C4FF1A9832; Thu,  7 Feb 2008 12:31:19 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r619628 - in
 /geronimo/server/branches/2.1/plugins/tomcat/tomcat6: pom.xml
 src/main/plan/plan.xml
Date: Thu, 07 Feb 2008 20:31:18 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080207203119.5C4FF1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Thu Feb  7 12:31:10 2008
New Revision: 619628

URL: http://svn.apache.org/viewvc?rev=619628&view=rev
Log:
GERONIMO-3829 fix typo in tomcat config port from trunk

Modified:
    geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml

Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml?rev=619628&r1=619627&r2=619628&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml Thu Feb  7 12:31:10 2008
@@ -183,6 +183,13 @@
                                     <attribute name="keystorePass">secret</attribute>
                                     <attribute name="keystoreType">JKS</attribute>
                                 </gbean>
+                                <gbean name="TomcatHost">
+                                    <attribute name="initParams">
+                                        name=${ServerHostname}
+                                        appBase=
+                                        workDir=work
+                                    </attribute>
+                                </gbean>
                             </config-xml-content>
                             <config-substitution key="HTTPPort">8080</config-substitution>
                             <config-substitution key="AJPPort">8009</config-substitution>

Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml?rev=619628&r1=619627&r2=619628&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml Thu Feb  7 12:31:10 2008
@@ -191,7 +191,7 @@
     <gbean name="TomcatHost" class="org.apache.geronimo.tomcat.HostGBean">
         <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
         <attribute name="initParams">
-            name=${PlanServerHostname}
+            name=${ServerHostname}
             appBase=
             workDir=work
         </attribute>