svn commit: r513475 - in /incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il: config/OdeConfigProperties.java dbutil/Database.java

[mszefler]

Author: mszefler
Date: Thu Mar  1 12:11:27 2007
New Revision: 513475

URL: http://svn.apache.org/viewvc?view=rev&rev=513475
Log:
Allow change to Minerva pool blocking.

Modified:
    
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
    
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java

Modified: 
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?view=diff&rev=513475&r1=513474&r2=513475
==============================================================================
--- 
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
 (original)
+++ 
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
 Thu Mar  1 12:11:27 2007
@@ -47,6 +47,7 @@
 
     private static final String PROP_DB_INTERNAL_URL = "db.int.jdbcurl";
 
+
     private static final String PROP_DB_INTERNAL_DRIVER = "db.int.driver";
 
     private static final String PROP_DB_INTERNAL_PASSWORD = "db.int.password";
@@ -61,6 +62,8 @@
 
     private static final String PROP_POOL_MIN = "db.pool.min";
 
+    private static final String PROP_DB_POOL_BLOCKING = "db.pool.blocking";
+
     private static final String PROP_CONNECTOR_PORT = "jca.port";
 
     private static final String PROP_CONNECTOR_NAME = "jca.name";
@@ -175,6 +178,12 @@
     public String getDbInternalJdbcDriverClass() {
         return getProperty(OdeConfigProperties.PROP_DB_INTERNAL_DRIVER, 
"org.apache.derby.jdbc.ClientDriver");
     }
+    
+    public boolean getPoolBlocking() {
+        return Boolean.valueOf(getProperty(PROP_DB_POOL_BLOCKING,"false"));
+    }
+
+
 
     public int getPoolMaxSize() {
         return Integer.valueOf(getProperty(OdeConfigProperties.PROP_POOL_MAX, 
"10"));

Modified: 
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java?view=diff&rev=513475&r1=513474&r2=513475
==============================================================================
--- 
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
 (original)
+++ 
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
 Thu Mar  1 12:11:27 2007
@@ -160,7 +160,7 @@
 
         _minervaPool.getPoolParams().maxSize = _odeConfig.getPoolMaxSize();
         _minervaPool.getPoolParams().minSize = _odeConfig.getPoolMinSize();
-        _minervaPool.getPoolParams().blocking = false;
+        _minervaPool.getPoolParams().blocking = _odeConfig.getPoolBlocking();
         _minervaPool.setType(MinervaPool.PoolType.MANAGED);
 
         try {