geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r949739 - in /geronimo/server/branches/2.2/plugins/openejb: geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java openejb/pom.xml openejb/src/main/plan/plan.xml
Date Mon, 31 May 2010 13:38:34 GMT
Author: genspring
Date: Mon May 31 13:38:34 2010
New Revision: 949739

URL: http://svn.apache.org/viewvc?rev=949739&view=rev
Log:
GERONIMO-5353 To support idleTimeout configuration for stateless ejb conainter.

Modified:
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java
    geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml
    geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java?rev=949739&r1=949738&r2=949739&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java
Mon May 31 13:38:34 2010
@@ -61,6 +61,13 @@ public class StatelessContainerGBean ext
      */
      private int poolMin;
      
+     
+	/**
+	 * Specifies the maximum time that an instance should be allowed to sit idly
+	 * in the pool without use before it should be retired and removed.
+	 */
+      private int idleTimeout;
+     
 
     /**
      * StrictPooling tells the container what to do when the pool
@@ -87,6 +94,7 @@ public class StatelessContainerGBean ext
             @ParamAttribute(name = "strictPooling") boolean strictPooling,
             @ParamAttribute(name = "accessTimeout") int accessTimeout,
             @ParamAttribute(name = "closeTimeout") int closeTimeout,
+            @ParamAttribute(name = "idleTimeout") int idleTimeout,            
             @ParamAttribute(name = "properties") Properties properties) {
         super(abstractName, StatelessSessionContainerInfo.class, openEjbSystem, provider,
"STATELESS", properties);
         set("PoolSize", Integer.toString(poolSize));
@@ -94,11 +102,13 @@ public class StatelessContainerGBean ext
         set("StrictPooling", Boolean.toString(strictPooling));
         set("AccessTimeout", Integer.toString(accessTimeout));
         set("CloseTimeout", Integer.toString(closeTimeout));
+        set("IdleTimeout", Integer.toString(idleTimeout));
         this.poolSize = poolSize;
         this.poolMin=poolMin;
         this.strictPooling = strictPooling;
         this.accessTimeout = accessTimeout;
         this.closeTimeout=closeTimeout;
+        this.idleTimeout=idleTimeout;        
     }
 
     public int getPoolSize() {
@@ -116,6 +126,10 @@ public class StatelessContainerGBean ext
     public int getCloseTimeout() {
         return closeTimeout;
     }
+    
+    public int getIdleTimeout() {
+        return idleTimeout;
+    }    
 
     public int getPoolMin() {
         return poolMin;

Modified: geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml?rev=949739&r1=949738&r2=949739&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml Mon May 31 13:38:34 2010
@@ -173,11 +173,11 @@
                                 </gbean>
                                 <gbean name="DefaultStatefulContainer">
                                     <attribute name="timeout">${StatefulTimeout}</attribute>
-                                    <attribute name="capacity">${Capacity}</attribute>
-                                    <attribute name="bulkPassivate">${BulkPassivate}</attribute>
+                                    <attribute name="capacity">${StatefulCapacity}</attribute>
+                                    <attribute name="bulkPassivate">${StatefulBulkPassivate}</attribute>
                                 </gbean>
                                 <gbean name="DefaultSingletonContainer">
-                                    <attribute name="accessTimeout">${AccessTimeout}</attribute>
+                                    <attribute name="accessTimeout">${SingletonAccessTimeout}</attribute>
                                 </gbean>
                                 <gbean name="DefaultBMPContainer">
                                     <attribute name="poolSize">${BMPPoolSize}</attribute>
@@ -187,20 +187,22 @@
                                     <attribute name="closeTimeout">${StatelessCloseTimeout}</attribute>
                                   
                                     <attribute name="poolSize">${StatelessPoolSize}</attribute>
                                     <attribute name="poolMin">${StatelessMinPoolSize}</attribute>
                                   
-                                    <attribute name="strictPooling">${StrictPooling}</attribute>
+                                    <attribute name="strictPooling">${StatelessStrictPooling}</attribute>
+                                    <attribute name="idleTimeout">${StatelessIdleTimeout}</attribute>
                                     
 				                </gbean>
                             </config-xml-content>
                             <config-substitution key="OpenEJBPort">4201</config-substitution>
                             <config-substitution key="StatefulTimeout">20</config-substitution>
-                            <config-substitution key="Capacity">1000</config-substitution>
-                            <config-substitution key="BulkPassivate">100</config-substitution>
-                            <config-substitution key="AccessTimeout">30</config-substitution>
+                            <config-substitution key="StatefulCapacity">1000</config-substitution>
+                            <config-substitution key="StatefulBulkPassivate">100</config-substitution>
+                            <config-substitution key="SingletonAccessTimeout">30</config-substitution>
                             <config-substitution key="BMPPoolSize">10</config-substitution>
                             <config-substitution key="StatelessAccessTimeout">0</config-substitution>
                             <config-substitution key="StatelessCloseTimeout">300000</config-substitution>
                           
                             <config-substitution key="StatelessPoolSize">10</config-substitution>

                             <config-substitution key="StatelessMinPoolSize">0</config-substitution>
                            
-                            <config-substitution key="StrictPooling">true</config-substitution>
+                            <config-substitution key="StatelessStrictPooling">true</config-substitution>
+                            <config-substitution key="StatelessIdleTimeout">0</config-substitution>
                              
                             <config-substitution key="MulticastDiscoveryAddress">239.255.3.2</config-substitution>
                             <config-substitution key="MulticastDiscoveryPort">6142</config-substitution>
                             <config-substitution key="MultipointHost">0.0.0.0</config-substitution>

Modified: geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml?rev=949739&r1=949738&r2=949739&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml Mon May 31
13:38:34 2010
@@ -57,6 +57,7 @@
         <attribute name="poolSize">10</attribute>
         <attribute name="poolMin">0</attribute>
         <attribute name="strictPooling">true</attribute>
+        <attribute name="idleTimeout">0</attribute>         
         <reference name="OpenEjbSystem">
             <name>OpenEjbSystem</name>
         </reference>



Mime
View raw message