geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r582310 - in /geronimo/server/branches/2.0/assemblies: geronimo-boilerplate-minimal/src/main/resources/var/config/ geronimo-framework/src/main/resources/var/config/ geronimo-jetty6-jee5/src/main/resources/var/config/ geronimo-jetty6-minimal...
Date Fri, 05 Oct 2007 15:16:24 GMT
Author: dwoods
Date: Fri Oct  5 08:16:17 2007
New Revision: 582310

URL: http://svn.apache.org/viewvc?rev=582310&view=rev
Log:
GERONIMO-3475 expose thread pool size in config.xml/config-substitutions.properties

Modified:
    geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
    geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml

Modified: geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties?rev=582310&r1=582309&r2=582310&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
Fri Oct  5 08:16:17 2007
@@ -47,4 +47,6 @@
 AJPPortPrimary=8009
 JMXPort=9999
 NodeName=NODE1
-WebConnectorConTimeout=20000
\ No newline at end of file
+WebConnectorConTimeout=20000
+ThreadPoolSize=150
+SMTPPort=25
\ No newline at end of file

Modified: geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml?rev=582310&r1=582309&r2=582310&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
Fri Oct  5 08:16:17 2007
@@ -26,11 +26,15 @@
     
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
-            <attribute name="port">${NamingPort}</attribute>
+            <attribute name="port">${NamingPort + PortOffset}</attribute>
         </gbean>
         <gbean name="NamingProperties">
             <!-- Check whether this really works if host name is 0.0.0.0 -->
-            <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort}</attribute>
+            <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
+        </gbean>
+        <gbean name="DefaultThreadPool">
+            <attribute name="keepAliveTime">5000</attribute>
+            <attribute name="poolSize">${ThreadPoolSize}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
@@ -42,8 +46,8 @@
         <gbean name="JMXService">
             <attribute name="protocol">rmi</attribute>
             <attribute name="host">${ServerHostname}</attribute>
-            <attribute name="port">${JMXPort}</attribute>
-            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort}/JMXConnector</attribute>
+            <attribute name="port">${JMXPort + PortOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort +
PortOffset}/JMXConnector</attribute>
         </gbean>
     </module>
 

Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?rev=582310&r1=582309&r2=582310&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
Fri Oct  5 08:16:17 2007
@@ -34,6 +34,10 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
         </gbean>
+        <gbean name="DefaultThreadPool">
+            <attribute name="keepAliveTime">5000</attribute>
+            <attribute name="poolSize">${ThreadPoolSize}</attribute>
+        </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
           <attribute name="userRepositories">[]</attribute>
@@ -279,7 +283,7 @@
     <module name="org.apache.geronimo.configs/javamail/${version}/car">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
-            <attribute name="port">25</attribute>
+            <attribute name="port">${SMTPPort + PortOffset}</attribute>
         </gbean>
     </module>
 

Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?rev=582310&r1=582309&r2=582310&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
Fri Oct  5 08:16:17 2007
@@ -32,6 +32,10 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
         </gbean>
+        <gbean name="DefaultThreadPool">
+            <attribute name="keepAliveTime">5000</attribute>
+            <attribute name="poolSize">${ThreadPoolSize}</attribute>
+        </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
           <attribute name="userRepositories">[]</attribute>

Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?rev=582310&r1=582309&r2=582310&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Fri Oct  5 08:16:17 2007
@@ -34,6 +34,10 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
         </gbean>
+        <gbean name="DefaultThreadPool">
+            <attribute name="keepAliveTime">5000</attribute>
+            <attribute name="poolSize">${ThreadPoolSize}</attribute>
+        </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
           <attribute name="userRepositories">[]</attribute>
@@ -292,7 +296,7 @@
     <module name="org.apache.geronimo.configs/javamail/${version}/car">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
-            <attribute name="port">25</attribute>
+            <attribute name="port">${SMTPPort + PortOffset}</attribute>
         </gbean>
     </module>
 

Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml?rev=582310&r1=582309&r2=582310&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
Fri Oct  5 08:16:17 2007
@@ -32,6 +32,10 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
         </gbean>
+        <gbean name="DefaultThreadPool">
+            <attribute name="keepAliveTime">5000</attribute>
+            <attribute name="poolSize">${ThreadPoolSize}</attribute>
+        </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
           <attribute name="userRepositories">[]</attribute>



Mime
View raw message