From scm-return-19736-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Fri May 18 01:14:52 2007
Return-Path: <scm-return-19736-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 23198 invoked from network); 18 May 2007 01:14:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 May 2007 01:14:47 -0000
Received: (qmail 83100 invoked by uid 500); 18 May 2007 01:14:53 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 83067 invoked by uid 500); 18 May 2007 01:14:53 -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 83053 invoked by uid 99); 18 May 2007 01:14:53 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2007 18:14:53 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
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, 17 May 2007 18:14:46 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id AF1D41A981A; Thu, 17 May 2007 18:14:26 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r539207 - in /geronimo/server/trunk/assemblies:
 geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
 geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Date: Fri, 18 May 2007 01:14:26 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070518011426.AF1D41A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Thu May 17 18:14:25 2007
New Revision: 539207

URL: http://svn.apache.org/viewvc?view=rev&rev=539207
Log:
GERONIMO-3173 port conflict with multiple server instances.  Verified portOffset=1 and 10 worked for geronimo-tomcat6-jee5 when the default server instance was running.

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=539207&r1=539206&r2=539207
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml Thu May 17 18:14:25 2007
@@ -73,6 +73,14 @@
             <attribute name="port">${PlanCOSNamingPort + portOffset}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
+        <gbean name="Server">
+            <attribute name="port">${PlanORBSSLPort + portOffset}</attribute>
+            <attribute name="host">${PlanORBSSLHost}</attribute>
+        </gbean>
+        <gbean name="UnprotectedServer">
+            <attribute name="port">${PlanORBPort + portOffset}</attribute>
+            <attribute name="host">${PlanORBHost}</attribute>
+        </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/system-database/${version}/car">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=539207&r1=539206&r2=539207
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml Thu May 17 18:14:25 2007
@@ -73,6 +73,14 @@
             <attribute name="port">${PlanCOSNamingPort + portOffset}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
+        <gbean name="Server">
+            <attribute name="port">${PlanORBSSLPort + portOffset}</attribute>
+            <attribute name="host">${PlanORBSSLHost}</attribute>
+        </gbean>
+        <gbean name="UnprotectedServer">
+            <attribute name="port">${PlanORBPort + portOffset}</attribute>
+            <attribute name="host">${PlanORBHost}</attribute>
+        </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/system-database/${version}/car">