You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/05/31 15:48:35 UTC

svn commit: r949745 - /geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java

Author: genspring
Date: Mon May 31 13:48:35 2010
New Revision: 949745

URL: http://svn.apache.org/viewvc?rev=949745&view=rev
Log:
GERONIMO-5354 Support configuration from openejb portlet for added attributes of stateless ejb container.

Modified:
    geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java

Modified: geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java?rev=949745&r1=949744&r2=949745&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java Mon May 31 13:48:35 2010
@@ -66,10 +66,12 @@ public class EjbHelper extends BaseRemot
     private static final Logger log = LoggerFactory.getLogger(EjbHelper.class);
     
     private static final String POOLSIZE = "PoolSize";
+    private static final String POOLMIN = "PoolMin";
     private static final String BULKPASSIVATE = "BulkPassivate";
     private static final String CAPACITY = "Capacity";
-    private static final String TIMEOUT = "TimeOut";
+    private static final String CLOSETIMEOUT = "CloseTimeout";
     private static final String ACCESSTIMEOUT = "AccessTimeout";
+    private static final String IDLETIMEOUT = "IdleTimeout";    
     private static final String PASSIVATOR = "Passivator";
     private static final String STRICTPOOLING = "StrictPooling";
     private static final String INSTANCELIMIT = "InstanceLimit";
@@ -231,9 +233,11 @@ public class EjbHelper extends BaseRemot
                 infos.add(information);
                 List<String> editableProperties = new ArrayList<String>();
                 editableProperties.add(POOLSIZE);
+                editableProperties.add(POOLMIN);                
                 editableProperties.add(BULKPASSIVATE);
-                editableProperties.add(TIMEOUT);
+                editableProperties.add(CLOSETIMEOUT);
                 editableProperties.add(ACCESSTIMEOUT);
+                editableProperties.add(IDLETIMEOUT);                
                 editableProperties.add(CAPACITY);
                 editableProperties.add(STRICTPOOLING);
                 editableProperties.add(INSTANCELIMIT);                
@@ -285,11 +289,14 @@ public class EjbHelper extends BaseRemot
         
         List<String> numericProperties = new ArrayList<String>();
         numericProperties.add(POOLSIZE);
+        numericProperties.add(POOLMIN);        
         numericProperties.add(BULKPASSIVATE);
-        numericProperties.add(TIMEOUT);
+        numericProperties.add(CLOSETIMEOUT);
+        numericProperties.add(ACCESSTIMEOUT);
+        numericProperties.add(IDLETIMEOUT);           
         numericProperties.add(INSTANCELIMIT); 
         numericProperties.add(CAPACITY);
-        numericProperties.add(ACCESSTIMEOUT);
+     
         
         if (numericProperties.contains(propertyKey)) {
             try {