geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r530945 - in /geronimo/server/trunk/assemblies: geronimo-jetty6-minimal/src/main/resources/var/config/config.xml geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
Date Fri, 20 Apr 2007 23:24:45 GMT
Author: akulshreshtha
Date: Fri Apr 20 16:24:44 2007
New Revision: 530945

URL: http://svn.apache.org/viewvc?view=rev&rev=530945
Log:
GERONIMO-2735 Added portOffset to config.xml in minimal assemblies
                          

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

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=530945&r1=530944&r2=530945
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
Fri Apr 20 16:24:44 2007
@@ -26,11 +26,11 @@
     
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
-            <attribute name="port">${PlanNamingPort}</attribute>
+            <attribute name="port">${PlanNamingPort + portOffset}</attribute>
         </gbean>
         <gbean name="NamingProperties">
             <!-- Check whether this really works if host name is 0.0.0.0 -->
-            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
@@ -45,13 +45,13 @@
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanRemoteLoginPort}</attribute>
+            <attribute name="port">${PlanRemoteLoginPort + portOffset}</attribute>
         </gbean>
         <gbean name="JMXService">
             <attribute name="protocol">rmi</attribute>
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanJMXPort}</attribute>
-            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+            <attribute name="port">${PlanJMXPort + portOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}/JMXConnector</attribute>
         </gbean>
     </module>
 
@@ -60,12 +60,12 @@
     <module name="org.apache.geronimo.configs/jetty6/${version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortPrimary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+            <attribute name="port">${PlanHTTPPortPrimary + portOffset}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
         </gbean>
         <gbean name="JettySSLConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
+            <attribute name="port">${PlanHTTPSPortPrimary + portOffset}</attribute>
         </gbean>
 <!--        <gbean name="JettyAJP13Connector">
             <attribute name="host">0.0.0.0</attribute>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=530945&r1=530944&r2=530945
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
Fri Apr 20 16:24:44 2007
@@ -26,11 +26,11 @@
     
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
-            <attribute name="port">${PlanNamingPort}</attribute>
+            <attribute name="port">${PlanNamingPort + portOffset}</attribute>
         </gbean>
         <gbean name="NamingProperties">
             <!-- Check whether this really works if host name is 0.0.0.0 -->
-            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
@@ -45,13 +45,13 @@
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanRemoteLoginPort}</attribute>
+            <attribute name="port">${PlanRemoteLoginPort + portOffset}</attribute>
         </gbean>
         <gbean name="JMXService">
             <attribute name="protocol">rmi</attribute>
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanJMXPort}</attribute>
-            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+            <attribute name="port">${PlanJMXPort + portOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}/JMXConnector</attribute>
         </gbean>
     </module>
 
@@ -61,17 +61,17 @@
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortPrimary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+            <attribute name="port">${PlanHTTPPortPrimary + portOffset}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
         </gbean>
         <gbean name="TomcatAJPConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanAJPPortPrimary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+            <attribute name="port">${PlanAJPPortPrimary + portOffset}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
         </gbean>
         <gbean name="TomcatWebSSLConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
+            <attribute name="port">${PlanHTTPSPortPrimary + portOffset}</attribute>
         </gbean>
     </module>
     



Mime
View raw message