[jboss-cvs] JBossAS SVN: r108208 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 17 13:41:03 EDT 2010
Author: jesper.pedersen
Date: 2010-09-17 13:41:03 -0400 (Fri, 17 Sep 2010)
New Revision: 108208
Modified:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractResourceAdapterDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
Log:
[JBJCA-415] [JBJCA-416] Support pooling parameters
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractResourceAdapterDeployer.java 2010-09-17 15:53:01 UTC (rev 108207)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractResourceAdapterDeployer.java 2010-09-17 17:41:03 UTC (rev 108208)
@@ -22,8 +22,12 @@
package org.jboss.jca.deployers.fungal;
+import org.jboss.jca.common.api.metadata.common.CommonPool;
+import org.jboss.jca.common.api.metadata.common.CommonTimeOut;
+import org.jboss.jca.common.api.metadata.common.CommonValidation;
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.core.api.bootstrap.CloneableBootstrapContext;
+import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.validator.Failure;
import org.jboss.jca.validator.FailureHelper;
@@ -447,6 +451,57 @@
}
/**
+ * Create an instance of the pool configuration based on the input
+ * @param pp The pool parameters
+ * @param tp The timeout parameters
+ * @param vp The validation parameters
+ * @return The configuration
+ */
+ protected PoolConfiguration createPoolConfiguration(CommonPool pp,
+ CommonTimeOut tp,
+ CommonValidation vp)
+ {
+ PoolConfiguration pc = new PoolConfiguration();
+
+ if (pp != null)
+ {
+ if (pp.getMinPoolSize() != null)
+ pc.setMinSize(pp.getMinPoolSize().intValue());
+
+ if (pp.getMaxPoolSize() != null)
+ pc.setMaxSize(pp.getMaxPoolSize().intValue());
+
+ //if (pp.isPrefill() != null)
+ pc.setPrefill(pp.isPrefill()); // TODO
+
+ //if (pp.isUseStrictMin() != null)
+ pc.setStrictMin(pp.isUseStrictMin()); // TODO
+ }
+
+ if (tp != null)
+ {
+ if (tp.getBlockingTimeoutMillis() != null)
+ pc.setBlockingTimeout(tp.getBlockingTimeoutMillis().intValue()); // TODO - Long -> int
+
+ if (tp.getIdleTimeoutMinutes() != null)
+ pc.setIdleTimeout(tp.getIdleTimeoutMinutes().longValue());
+ }
+
+ /*
+ TODO
+ if (backgroundValidationInterval != null)
+ pc.setBackgroundValidationInterval(backgroundValidationInterval.longValue());
+ */
+
+ if (vp != null)
+ {
+ pc.setUseFastFail(vp.isUseFastFail()); // TODO
+ }
+
+ return pc;
+ }
+
+ /**
* Start
*/
public void start()
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2010-09-17 15:53:01 UTC (rev 108207)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2010-09-17 17:41:03 UTC (rev 108208)
@@ -379,7 +379,9 @@
associateResourceAdapter(resourceAdapter, mcf);
// Create the pool
- PoolConfiguration pc = new PoolConfiguration();
+ PoolConfiguration pc = createPoolConfiguration(ijCD != null ? ijCD.getPool() : null,
+ ijCD != null ? ijCD.getTimeOut() : null,
+ ijCD != null ? ijCD.getValidation() : null);
PoolFactory pf = new PoolFactory();
Boolean noTxSeparatePool = Boolean.FALSE;
@@ -547,7 +549,9 @@
associateResourceAdapter(resourceAdapter, mcf);
// Create the pool
- PoolConfiguration pc = new PoolConfiguration();
+ PoolConfiguration pc = createPoolConfiguration(ijCD != null ? ijCD.getPool() : null,
+ ijCD != null ? ijCD.getTimeOut() : null,
+ ijCD != null ? ijCD.getValidation() : null);
PoolFactory pf = new PoolFactory();
Boolean noTxSeparatePool = Boolean.FALSE;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-09-17 15:53:01 UTC (rev 108207)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-09-17 17:41:03 UTC (rev 108208)
@@ -277,7 +277,9 @@
associateResourceAdapter(resourceAdapter, mcf);
// Create the pool
- PoolConfiguration pc = new PoolConfiguration();
+ PoolConfiguration pc = createPoolConfiguration(ijCD != null ? ijCD.getPool() : null,
+ ijCD != null ? ijCD.getTimeOut() : null,
+ ijCD != null ? ijCD.getValidation() : null);
PoolFactory pf = new PoolFactory();
Boolean noTxSeparatePool = Boolean.FALSE;
@@ -461,7 +463,10 @@
associateResourceAdapter(resourceAdapter, mcf);
// Create the pool
- PoolConfiguration pc = new PoolConfiguration();
+ PoolConfiguration pc =
+ createPoolConfiguration(ijCD != null ? ijCD.getPool() : null,
+ ijCD != null ? ijCD.getTimeOut() : null,
+ ijCD != null ? ijCD.getValidation() : null);
PoolFactory pf = new PoolFactory();
Boolean noTxSeparatePool = Boolean.FALSE;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2010-09-17 15:53:01 UTC (rev 108207)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2010-09-17 17:41:03 UTC (rev 108208)
@@ -387,7 +387,22 @@
associateResourceAdapter(resourceAdapter, mcf);
// Create the pool
- PoolConfiguration pc = new PoolConfiguration();
+ PoolConfiguration pc = null;
+
+ if (cdRaXml.getPool() != null || cdRaXml.getPool() != null || cdRaXml.getPool() != null)
+ {
+ pc = createPoolConfiguration(cdRaXml.getPool(), cdRaXml.getTimeOut(), cdRaXml.getValidation());
+ }
+ else if (ijCD != null)
+ {
+ pc = createPoolConfiguration(ijCD.getPool(), ijCD.getTimeOut(), ijCD.getValidation());
+ }
+ else
+ {
+ // Default default settings
+ pc = createPoolConfiguration(null, null, null);
+ }
+
PoolFactory pf = new PoolFactory();
Boolean noTxSeparatePool = Boolean.FALSE;
@@ -615,7 +630,26 @@
associateResourceAdapter(resourceAdapter, mcf);
// Create the pool
- PoolConfiguration pc = new PoolConfiguration();
+ PoolConfiguration pc = null;
+
+ if (cdRaXml.getPool() != null || cdRaXml.getPool() != null || cdRaXml.getPool() != null)
+ {
+ pc = createPoolConfiguration(cdRaXml.getPool(),
+ cdRaXml.getTimeOut(),
+ cdRaXml.getValidation());
+ }
+ else if (ijCD != null)
+ {
+ pc = createPoolConfiguration(ijCD.getPool(),
+ ijCD.getTimeOut(),
+ ijCD.getValidation());
+ }
+ else
+ {
+ // Default default settings
+ pc = createPoolConfiguration(null, null, null);
+ }
+
PoolFactory pf = new PoolFactory();
Boolean noTxSeparatePool = Boolean.FALSE;
More information about the jboss-cvs-commits
mailing list