[jBoss-Dev] CVS update:jboss/src/main/org/jboss/minerva/datasource JDBCPoolDataSource.javaXAPoolDataSource.java

[jBoss CVS Development]

  User: mulder  
  Date: 00/10/04 18:36:35

  Modified:    src/main/org/jboss/minerva/datasource
                        JDBCPoolDataSource.java XAPoolDataSource.java
  Log:
  Changed configuration service so it doesn't use the JMX call to determine
  whether a parameter is writeable.
  
  Changed Minerva so the old "shrinking" is now "idle timeout".
   - An object is guaranteed to be released when it has surpassed the idle
     timeout (well, the next time GC is run, anyway)
   - There's a new parameter MaxIdleTimeoutShrinkPercent that you can use
     to force the server to replace some objects that hit the idle timeout
     so the pool doesn't shrink too rapidly.
   - The pool now prepopulates objects up to the minimum size, so the pool
     is never below the minimum size
  
  Updated jboss.jcml to reflect the new Minerva parameters.
  
  Revision  Changes    Path
  1.4       +7 -7      
jboss/src/main/org/jboss/minerva/datasource/JDBCPoolDataSource.java
  
  Index: JDBCPoolDataSource.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/minerva/datasource/JDBCPoolDataSource.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JDBCPoolDataSource.java   2000/08/30 12:41:50     1.3
  +++ JDBCPoolDataSource.java   2000/10/05 01:36:34     1.4
  @@ -25,7 +25,7 @@
    * and JDBCConnectionFactory.
    * @see org.jboss.minerva.pools.ObjectPool
    * @see org.jboss.minerva.factories.JDBCConnectionFactory
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class JDBCPoolDataSource implements DataSource, Referenceable, ObjectFactory 
{
  @@ -103,14 +103,14 @@
       public int getMaxSize() {return pool.getMaxSize();}
       public void setBlocking(boolean blocking) {pool.setBlocking(blocking);}
       public boolean isBlocking() {return pool.isBlocking();}
  -    public void setShrinkingEnabled(boolean allowShrinking) 
{pool.setShrinkingEnabled(allowShrinking);}
  -    public boolean isShrinkingEnabled() {return pool.isShrinkingEnabled();}
  +    public void setIdleTimeoutEnabled(boolean allowShrinking) 
{pool.setIdleTimeoutEnabled(allowShrinking);}
  +    public boolean isIdleTimeoutEnabled() {return pool.isIdleTimeoutEnabled();}
       public void setGCEnabled(boolean allowGC) {pool.setGCEnabled(allowGC);}
       public boolean isGCEnabled() {return pool.isGCEnabled();}
  -    public void setShrinkPercent(float percent) {pool.setShrinkPercent(percent);}
  -    public float getShrinkPercent() {return pool.getShrinkPercent();}
  -    public void setShrinkMinIdleTime(long millis) 
{pool.setShrinkMinIdleTime(millis);}
  -    public long getShrinkMinIdleTime() {return pool.getShrinkMinIdleTime();}
  +    public void setMaxIdleTimeoutPercent(float percent) 
{pool.setMaxIdleTimeoutPercent(percent);}
  +    public float getMaxIdleTimeoutPercent() {return 
pool.getMaxIdleTimeoutPercent();}
  +    public void setIdleTimeout(long millis) {pool.setIdleTimeout(millis);}
  +    public long getIdleTimeout() {return pool.getIdleTimeout();}
       public void setGCMinIdleTime(long millis) {pool.setGCMinIdleTime(millis);}
       public long getGCMinIdleTime() {return pool.getGCMinIdleTime();}
       public void setGCInterval(long millis) {pool.setGCInterval(millis);}
  
  
  
  1.4       +7 -7      
jboss/src/main/org/jboss/minerva/datasource/XAPoolDataSource.java
  
  Index: XAPoolDataSource.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/minerva/datasource/XAPoolDataSource.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XAPoolDataSource.java     2000/08/30 12:41:50     1.3
  +++ XAPoolDataSource.java     2000/10/05 01:36:34     1.4
  @@ -25,7 +25,7 @@
    * and XAConnectionFactory.
    * @see org.jboss.minerva.pools.ObjectPool
    * @see org.jboss.minerva.factories.XAConnectionFactory
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class XAPoolDataSource implements DataSource, Referenceable, ObjectFactory {
  @@ -108,14 +108,14 @@
       public int getMaxSize() {return pool.getMaxSize();}
       public void setBlocking(boolean blocking) {pool.setBlocking(blocking);}
       public boolean isBlocking() {return pool.isBlocking();}
  -    public void setShrinkingEnabled(boolean allowShrinking) 
{pool.setShrinkingEnabled(allowShrinking);}
  -    public boolean isShrinkingEnabled() {return pool.isShrinkingEnabled();}
  +    public void setIdleTimeoutEnabled(boolean allowShrinking) 
{pool.setIdleTimeoutEnabled(allowShrinking);}
  +    public boolean isIdleTimeoutEnabled() {return pool.isIdleTimeoutEnabled();}
       public void setGCEnabled(boolean allowGC) {pool.setGCEnabled(allowGC);}
       public boolean isGCEnabled() {return pool.isGCEnabled();}
  -    public void setShrinkPercent(float percent) {pool.setShrinkPercent(percent);}
  -    public float getShrinkPercent() {return pool.getShrinkPercent();}
  -    public void setShrinkMinIdleTime(long millis) 
{pool.setShrinkMinIdleTime(millis);}
  -    public long getShrinkMinIdleTime() {return pool.getShrinkMinIdleTime();}
  +    public void setMaxIdleTimeoutPercent(float percent) 
{pool.setMaxIdleTimeoutPercent(percent);}
  +    public float getMaxIdleTimeoutPercent() {return 
pool.getMaxIdleTimeoutPercent();}
  +    public void setIdleTimeout(long millis) {pool.setIdleTimeout(millis);}
  +    public long getIdleTimeout() {return pool.getIdleTimeout();}
       public void setGCMinIdleTime(long millis) {pool.setGCMinIdleTime(millis);}
       public long getGCMinIdleTime() {return pool.getGCMinIdleTime();}
       public void setGCInterval(long millis) {pool.setGCInterval(millis);}