User: mulder
Date: 00/10/04 18:36:34
Modified: src/main/org/jboss/jdbc JDBCDataSourceLoader.java
JDBCDataSourceLoaderMBean.java
XADataSourceLoader.java
XADataSourceLoaderMBean.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.6 +13 -13 jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java
Index: JDBCDataSourceLoader.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDBCDataSourceLoader.java 2000/09/13 12:14:01 1.5
+++ JDBCDataSourceLoader.java 2000/10/05 01:36:33 1.6
@@ -25,7 +25,7 @@
/**
* Service that loads a JDBC 1 connection pool. The constructors are called by
* the JMX engine based on your MLET tags.
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
* @author Aaron Mulder ([EMAIL PROTECTED])
*/
public class JDBCDataSourceLoader extends ServiceMBeanSupport implements
JDBCDataSourceLoaderMBean {
@@ -138,28 +138,28 @@
return source.getGCMinIdleTime();
}
- public void setShrinkingEnabled(boolean enabled) {
- source.setShrinkingEnabled(enabled);
+ public void setIdleTimeoutEnabled(boolean enabled) {
+ source.setIdleTimeoutEnabled(enabled);
}
- public boolean isShrinkingEnabled() {
- return source.isShrinkingEnabled();
+ public boolean isIdleTimeoutEnabled() {
+ return source.isIdleTimeoutEnabled();
}
- public void setShrinkMinIdleTime(long idleMillis) {
- source.setShrinkMinIdleTime(idleMillis);
+ public void setIdleTimeout(long idleMillis) {
+ source.setIdleTimeout(idleMillis);
}
- public long getShrinkMinIdleTime() {
- return source.getShrinkMinIdleTime();
+ public long getIdleTimeout() {
+ return source.getIdleTimeout();
}
- public void setShrinkPercent(float percent) {
- source.setShrinkPercent(percent);
+ public void setMaxIdleTimeoutPercent(float percent) {
+ source.setMaxIdleTimeoutPercent(percent);
}
- public float getShrinkPercent() {
- return source.getShrinkPercent();
+ public float getMaxIdleTimeoutPercent() {
+ return source.getMaxIdleTimeoutPercent();
}
public void setInvalidateOnError(boolean invalidate) {
1.3 +6 -6 jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoaderMBean.java
Index: JDBCDataSourceLoaderMBean.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoaderMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCDataSourceLoaderMBean.java 2000/08/31 16:37:08 1.2
+++ JDBCDataSourceLoaderMBean.java 2000/10/05 01:36:33 1.3
@@ -35,12 +35,12 @@
public long getGCInterval();
public void setGCMinIdleTime(long idleMillis);
public long getGCMinIdleTime();
- public void setShrinkingEnabled(boolean enabled);
- public boolean isShrinkingEnabled();
- public void setShrinkMinIdleTime(long idleMillis);
- public long getShrinkMinIdleTime();
- public void setShrinkPercent(float percent);
- public float getShrinkPercent();
+ public void setIdleTimeoutEnabled(boolean enabled);
+ public boolean isIdleTimeoutEnabled();
+ public void setIdleTimeout(long idleMillis);
+ public long getIdleTimeout();
+ public void setMaxIdleTimeoutPercent(float percent);
+ public float getMaxIdleTimeoutPercent();
public void setInvalidateOnError(boolean invalidate);
public boolean isInvalidateOnError();
public void setTimestampUsed(boolean timestamp);
1.11 +13 -13 jboss/src/main/org/jboss/jdbc/XADataSourceLoader.java
Index: XADataSourceLoader.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/XADataSourceLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XADataSourceLoader.java 2000/09/27 13:38:14 1.10
+++ XADataSourceLoader.java 2000/10/05 01:36:33 1.11
@@ -29,7 +29,7 @@
* pool generates connections that are registered with the current Transaction
* and support two-phase commit. The constructors are called by the JMX engine
* based on your MLET tags.
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
* @author Aaron Mulder ([EMAIL PROTECTED])
*/
public class XADataSourceLoader extends ServiceMBeanSupport
@@ -196,28 +196,28 @@
return source.getGCMinIdleTime();
}
- public void setShrinkingEnabled(boolean enabled) {
- source.setShrinkingEnabled(enabled);
+ public void setIdleTimeoutEnabled(boolean enabled) {
+ source.setIdleTimeoutEnabled(enabled);
}
- public boolean isShrinkingEnabled() {
- return source.isShrinkingEnabled();
+ public boolean isIdleTimeoutEnabled() {
+ return source.isIdleTimeoutEnabled();
}
- public void setShrinkMinIdleTime(long idleMillis) {
- source.setShrinkMinIdleTime(idleMillis);
+ public void setIdleTimeout(long idleMillis) {
+ source.setIdleTimeout(idleMillis);
}
- public long getShrinkMinIdleTime() {
- return source.getShrinkMinIdleTime();
+ public long getIdleTimeout() {
+ return source.getIdleTimeout();
}
- public void setShrinkPercent(float percent) {
- source.setShrinkPercent(percent);
+ public void setMaxIdleTimeoutPercent(float percent) {
+ source.setMaxIdleTimeoutPercent(percent);
}
- public float getShrinkPercent() {
- return source.getShrinkPercent();
+ public float getMaxIdleTimeoutPercent() {
+ return source.getMaxIdleTimeoutPercent();
}
public void setInvalidateOnError(boolean invalidate) {
1.4 +6 -6 jboss/src/main/org/jboss/jdbc/XADataSourceLoaderMBean.java
Index: XADataSourceLoaderMBean.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/XADataSourceLoaderMBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XADataSourceLoaderMBean.java 2000/08/30 12:41:53 1.3
+++ XADataSourceLoaderMBean.java 2000/10/05 01:36:34 1.4
@@ -35,12 +35,12 @@
public long getGCInterval();
public void setGCMinIdleTime(long idleMillis);
public long getGCMinIdleTime();
- public void setShrinkingEnabled(boolean enabled);
- public boolean isShrinkingEnabled();
- public void setShrinkMinIdleTime(long idleMillis);
- public long getShrinkMinIdleTime();
- public void setShrinkPercent(float percent);
- public float getShrinkPercent();
+ public void setIdleTimeoutEnabled(boolean enabled);
+ public boolean isIdleTimeoutEnabled();
+ public void setIdleTimeout(long idleMillis);
+ public long getIdleTimeout();
+ public void setMaxIdleTimeoutPercent(float percent);
+ public float getMaxIdleTimeoutPercent();
public void setInvalidateOnError(boolean invalidate);
public boolean isInvalidateOnError();
public void setTimestampUsed(boolean timestamp);
