geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r527596 - in /geronimo/server/trunk/assemblies: ./ geronimo-boilerplate-minimal/src/main/resources/var/config/ geronimo-jetty6-jee5/src/main/resources/var/config/ geronimo-tomcat6-jee5/src/main/resources/var/config/
Date Wed, 11 Apr 2007 18:19:35 GMT
Author: akulshreshtha
Date: Wed Apr 11 11:19:34 2007
New Revision: 527596

URL: http://svn.apache.org/viewvc?view=rev&rev=527596
Log:
GERONIMO-2735 Added portOffset to config.xml 
                            Updated config-substitutions.properties in boilerplate-minimal
GERONIMO-3011 Added port configuration for EJBNetworkService, ActiveMQ.stomp.default, and
ActiveMQ RA

Removed:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config-substitutions.properties
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
    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
    geronimo/server/trunk/assemblies/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties?view=diff&rev=527596&r1=527595&r2=527596
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
Wed Apr 11 11:19:34 2007
@@ -19,4 +19,32 @@
 #hostName=localhost
 #httpPort=8080
 #httpsPort=8443
+##   To run multiple instances of geronimo choose a portOffset such that none of the ports
below conflict
+##   Try portOffset=10
 #portOffset=0
+PlanServerHostname=0.0.0.0
+PlanNamingPort=1099
+PlanOpenEJBPort=4201
+PlanClientAddresses=127.0.0.1
+PlanIIOPPort=9000
+PlanCOSNamingHost=localhost
+PlanCOSNamingPort=1050
+PlanCOSSunNamingPort=1050
+PlanORBHost=localhost
+PlanORBPort=6882
+PlanORBSunPort=6882
+PlanORBSSLHost=localhost
+PlanORBSSLPort=2001
+PlanORBSunSSLPort=2001
+PlanActiveMQPort=61616
+PlanActiveMQStompPort=61613
+PlanDerbyPort=1527
+PlanRemoteLoginPort=4242
+PlanLdapPort=1389
+PlanHTTPPortPrimary=8080
+PlanHTTPSPortPrimary=8443
+PlanAJPPortPrimary=8009
+PlanHTTPPortSecondary=8090
+PlanHTTPSPortSecondary=8453
+PlanAJPPortSecondary=8019
+PlanJMXPort=9999
\ No newline at end of file

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=527596&r1=527595&r2=527596
==============================================================================
--- 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
Wed Apr 11 11:19:34 2007
@@ -28,11 +28,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>
@@ -47,13 +47,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>
 
@@ -62,11 +62,15 @@
     <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
+        <gbean name="EJBNetworkService">
+            <attribute name="port">${PlanOpenEJBPort + portOffset}</attribute>
+            <attribute name="host">${PlanServerHostname}</attribute>
+        </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
         <gbean name="NameServer">
-            <attribute name="port">${PlanCOSNamingPort}</attribute>
+            <attribute name="port">${PlanCOSNamingPort + portOffset}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
@@ -74,18 +78,26 @@
     <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanDerbyPort}</attribute>
+            <attribute name="port">${PlanDerbyPort + portOffset}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanActiveMQPort}</attribute>
+            <attribute name="port">${PlanActiveMQPort + portOffset}</attribute>
+        </gbean>
+        <gbean name="ActiveMQ.stomp.default">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanActiveMQStompPort + portOffset}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/activemq-ra/${version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq-ra/${version}/car">
+        <gbean name="ActiveMQ RA">
+                <attribute name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort
+ portOffset}</attribute>
+        </gbean>
+    </module>
 
     <module name="org.apache.geronimo.configs/jasper/${version}/car" load="false"/>
 
@@ -93,13 +105,13 @@
 
     <module name="org.apache.geronimo.configs/jetty6/${version}/car">
         <gbean name="JettyWebConnector">
-            <attribute name="host">${hostName}</attribute>
-            <attribute name="port">${httpPort + portOffset}</attribute>
-            <attribute name="redirectPort">${httpsPort + portOffset}</attribute>
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPPortPrimary + portOffset}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
         </gbean>
         <gbean name="JettySSLConnector">
-            <attribute name="host">${hostName}</attribute>
-            <attribute name="port">${httpsPort + portOffset}</attribute>
+            <attribute name="host">${PlanServerHostname}</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-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=527596&r1=527595&r2=527596
==============================================================================
--- 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
Wed Apr 11 11:19:34 2007
@@ -28,11 +28,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>
@@ -47,13 +47,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>
 
@@ -62,30 +62,42 @@
     <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
+        <gbean name="EJBNetworkService">
+            <attribute name="port">${PlanOpenEJBPort + portOffset}</attribute>
+            <attribute name="host">${PlanServerHostname}</attribute>
+        </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
         <gbean name="NameServer">
-            <attribute name="port">${PlanCOSNamingPort}</attribute>
-            <attribute name="host">${PlanCOSNamingHost}</attribute>
+            <attribute name="port">${PlanCOSNamingPort + portOffset}</attribute>
+            <attribute name="host">${PlanCOSNamingHost + portOffset}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanDerbyPort}</attribute>
+            <attribute name="port">${PlanDerbyPort + portOffset}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanActiveMQPort}</attribute>
+            <attribute name="port">${PlanActiveMQPort + portOffset}</attribute>
+        </gbean>
+        <gbean name="ActiveMQ.stomp.default">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanActiveMQStompPort + portOffset}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/activemq-ra/${version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq-ra/${version}/car">
+        <gbean name="ActiveMQ RA">
+            <attribute name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort
+ portOffset}</attribute>
+        </gbean>
+    </module>
 
     <module name="org.apache.geronimo.configs/jasper/${version}/car" load="false"/>
 
@@ -101,17 +113,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>
 

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=527596&r1=527595&r2=527596
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Wed Apr 11 11:19:34 2007
@@ -37,7 +37,7 @@
     <properties>
         <!--
         TODO: Move this where it can be shared with the configs/pom.xml values
-        -->
+        
         <PlanServerHostname>0.0.0.0</PlanServerHostname>
         <PlanNamingPort>1099</PlanNamingPort>
         <PlanOpenEJBPort>4201</PlanOpenEJBPort>
@@ -63,6 +63,7 @@
         <PlanHTTPSPortSecondary>8453</PlanHTTPSPortSecondary>
         <PlanAJPPortSecondary>8019</PlanAJPPortSecondary>
         <PlanJMXPort>9999</PlanJMXPort>
+        -->
         <PlanJettyWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</PlanJettyWebBuilderDefaultNamespace>
         <PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
     </properties>



Mime
View raw message