You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2007/05/18 03:14:26 UTC
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
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">