geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r965817 - in /geronimo/server/branches/2.2/plugins/openejb: geronimo-openejb-clustering-wadi/src/main/resources/META-INF/org.apache.geronimo.openejb.cluster/ geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ openejb-clustering-wad...
Date Tue, 20 Jul 2010 12:00:03 GMT
Author: genspring
Date: Tue Jul 20 12:00:03 2010
New Revision: 965817

URL: http://svn.apache.org/viewvc?rev=965817&view=rev
Log:
(GERONIMO-5441) Update openejb pool JMX attributes, patch from Viola.

Modified:
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/resources/META-INF/org.apache.geronimo.openejb.cluster/service-jar.xml
    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-clustering-wadi/src/main/plan/plan.xml
    geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties
    geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.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-clustering-wadi/src/main/resources/META-INF/org.apache.geronimo.openejb.cluster/service-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/resources/META-INF/org.apache.geronimo.openejb.cluster/service-jar.xml?rev=965817&r1=965816&r2=965817&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/resources/META-INF/org.apache.geronimo.openejb.cluster/service-jar.xml
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/resources/META-INF/org.apache.geronimo.openejb.cluster/service-jar.xml
Tue Jul 20 12:00:03 2010
@@ -68,7 +68,7 @@
     # Specifies the size of the bean pools for this
     # stateless SessionBean container.
 
-    PoolSize 10
+    MaxSize 10
 
     # StrictPooling tells the container what to do when the pool
     # reaches it's maximum size and there are incoming requests
@@ -99,7 +99,7 @@
     # Replacement is done in a background queue using the number of
     # threads specified by CallbackThreads.
     
-    PoolMin 0
+    MinSize 0
     
 
   </ServiceProvider>

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=965817&r1=965816&r2=965817&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
Tue Jul 20 12:00:03 2010
@@ -53,13 +53,13 @@ public class StatelessContainerGBean ext
      * stateless SessionBean container.
      */
 
-    private final int poolSize;
+    private final int maxSize;
     
     
     /** Specifies the minimum number of bean instances that should be
      * in this stateless SessionBean container  
      */
-     private int poolMin;
+     private int minSize;
      
      
 	/**
@@ -89,22 +89,22 @@ public class StatelessContainerGBean ext
             @ParamSpecial(type = SpecialAttributeType.abstractName) AbstractName abstractName,
             @ParamReference(name = "OpenEjbSystem") OpenEjbSystem openEjbSystem,
             @ParamAttribute(name = "provider") String provider,
-            @ParamAttribute(name = "poolSize") int poolSize,
-            @ParamAttribute(name = "poolMin") int poolMin,
+            @ParamAttribute(name = "maxSize") int maxSize,
+            @ParamAttribute(name = "minSize") int minSize,
             @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));
-        set("PoolMin", Integer.toString(poolMin));        
+        set("MaxSize", Integer.toString(maxSize));
+        set("MinSize", Integer.toString(minSize));        
         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.maxSize = maxSize;
+        this.minSize= minSize;
         this.strictPooling = strictPooling;
         this.accessTimeout = accessTimeout;
         this.closeTimeout=closeTimeout;
@@ -112,7 +112,7 @@ public class StatelessContainerGBean ext
     }
 
     public int getPoolSize() {
-        return poolSize;
+        return maxSize;
     }
 
     public boolean isStrictPooling() {
@@ -132,6 +132,6 @@ public class StatelessContainerGBean ext
     }    
 
     public int getPoolMin() {
-        return poolMin;
+        return minSize;
     }
 }

Modified: geronimo/server/branches/2.2/plugins/openejb/openejb-clustering-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb-clustering-wadi/src/main/plan/plan.xml?rev=965817&r1=965816&r2=965817&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb-clustering-wadi/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb-clustering-wadi/src/main/plan/plan.xml
Tue Jul 20 12:00:03 2010
@@ -34,8 +34,8 @@
         <attribute name="provider">org.apache.geronimo.openejb.cluster:Default Clustered
Stateless Container</attribute>
         <attribute name="accessTimeout">0</attribute>
         <attribute name="closeTimeout">300000</attribute>        
-        <attribute name="poolSize">10</attribute>
-        <attribute name="poolMin">0</attribute>
+        <attribute name="maxSize">10</attribute>
+        <attribute name="minSize">0</attribute>
         <attribute name="strictPooling">true</attribute>
         <reference name="OpenEjbSystem">
             <name>OpenEjbSystem</name>

Modified: geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties?rev=965817&r1=965816&r2=965817&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties
Tue Jul 20 12:00:03 2010
@@ -72,7 +72,7 @@ portlet.openejb.help.sfpoolsize         
 portlet.openejb.help.sfpoolsizedesc           = Specifies the size of the bean pools for
this stateful SessionBean container. Default value is 1000.
 portlet.openejb.help.sftimeout                = TimeOut
 portlet.openejb.help.sftimeoutdesc            = Specifies the time to wait between invocations.
This value is measured in minutes. A value of 5 results in a time-out of 5 minutes between
invocations. A value of zero means no timeout. Default value is 20.
-portlet.openejb.help.slpoolsize               = PoolSize
+portlet.openejb.help.slpoolsize               = MaxSize
 portlet.openejb.help.slpoolsizedesc           = Specifies the size of the bean pools for
this stateless SessionBean container. Default value is 10.
 portlet.openejb.help.sltimeout                = TimeOut
 portlet.openejb.help.sltimeoutdesc            = Specifies the time to wait between invocations.
This value is measured in milliseconds. A value of 5 results in a time-out of 5 milliseconds
between invocations. A value of zero means no timeout. Default value is 0.

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=965817&r1=965816&r2=965817&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
Tue Jul 20 12:00:03 2010
@@ -65,8 +65,8 @@ 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 POOLSIZE = "MaxSize";
+    private static final String POOLMIN = "MinSize";
     private static final String BULKPASSIVATE = "BulkPassivate";
     private static final String CAPACITY = "Capacity";
     private static final String CLOSETIMEOUT = "CloseTimeout";

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=965817&r1=965816&r2=965817&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml Tue Jul 20 12:00:03 2010
@@ -185,8 +185,8 @@
                                 <gbean name="DefaultStatelessContainer">
                                     <attribute name="accessTimeout">${StatelessAccessTimeout}</attribute>
                                     <attribute name="closeTimeout">${StatelessCloseTimeout}</attribute>
                                   
-                                    <attribute name="poolSize">${StatelessPoolSize}</attribute>
-                                    <attribute name="poolMin">${StatelessMinPoolSize}</attribute>
                                   
+                                    <attribute name="maxSize">${StatelessPoolSize}</attribute>
+                                    <attribute name="minSize">${StatelessMinPoolSize}</attribute>
                                   
                                     <attribute name="strictPooling">${StatelessStrictPooling}</attribute>
                                     <attribute name="idleTimeout">${StatelessIdleTimeout}</attribute>
                                     
 				                </gbean>

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=965817&r1=965816&r2=965817&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 Tue Jul 20
12:00:03 2010
@@ -54,8 +54,8 @@
     <gbean name="DefaultStatelessContainer" class="org.apache.geronimo.openejb.StatelessContainerGBean">
         <attribute name="accessTimeout">0</attribute>
         <attribute name="closeTimeout">300000</attribute>          
-        <attribute name="poolSize">10</attribute>
-        <attribute name="poolMin">0</attribute>
+        <attribute name="maxSize">10</attribute>
+        <attribute name="minSize">0</attribute>
         <attribute name="strictPooling">true</attribute>
         <attribute name="idleTimeout">0</attribute>         
         <reference name="OpenEjbSystem">



Mime
View raw message