[jboss-cvs] JBossAS SVN: r111892 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/api/metadata/common and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 1 10:45:37 EDT 2011
Author: jesper.pedersen
Date: 2011-08-01 10:45:37 -0400 (Mon, 01 Aug 2011)
New Revision: 111892
Modified:
projects/jboss-jca/trunk/adapters/src/test/resources/h2-valid-connection-checker-ds.xml
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java
projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd
projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/background-validation-minutes-negative-ds.xml
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java
Log:
[JBJCA-639] XSD: background-validation-minutes
Modified: projects/jboss-jca/trunk/adapters/src/test/resources/h2-valid-connection-checker-ds.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/resources/h2-valid-connection-checker-ds.xml 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/adapters/src/test/resources/h2-valid-connection-checker-ds.xml 2011-08-01 14:45:37 UTC (rev 111892)
@@ -15,7 +15,7 @@
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.spi.testimpl.TestValidConnectionChecker"></valid-connection-checker>
<validate-on-match>true</validate-on-match>
<background-validation>true</background-validation>
- <background-validation-minutes>1</background-validation-minutes>
+ <background-validation-millis>1000</background-validation-millis>
</validation>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -43,11 +43,11 @@
public Boolean isBackgroundValidation();
/**
- * Get the backgroundValidationMinutes.
+ * Get the backgroundValidationMillis.
*
- * @return the backgroundValidationMinutes.
+ * @return the backgroundValidationMillis.
*/
- public Long getBackgroundValidationMinutes();
+ public Long getBackgroundValidationMillis();
/**
* Get the useFastFail.
@@ -77,7 +77,7 @@
/**
* backgroundValidationMinutes tag
*/
- BACKGROUNDVALIDATIONMINUTES("background-validation-minutes"),
+ BACKGROUNDVALIDATIONMILLIS("background-validation-millis"),
/**
useFastFail tag
*/
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -106,9 +106,9 @@
*/
BACKGROUNDVALIDATION("background-validation"),
/**
- * backgroundValidationMinutes tag
+ * backgroundValidationMillis tag
*/
- BACKGROUNDVALIDATIONMINUTES("background-validation-minutes"),
+ BACKGROUNDVALIDATIONMILLIS("background-validation-millis"),
/**
* useFastFail tag
*/
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -193,7 +193,7 @@
{
boolean useFastFail = false;
boolean backgroundValidation = false;
- Long backgroundValidationMinutes = null;
+ Long backgroundValidationMillis = null;
while (reader.hasNext())
{
@@ -203,7 +203,7 @@
if (CommonConnDef.Tag.forName(reader.getLocalName()) == CommonConnDef.Tag.VALIDATION)
{
- return new CommonValidationImpl(backgroundValidation, backgroundValidationMinutes, useFastFail);
+ return new CommonValidationImpl(backgroundValidation, backgroundValidationMillis, useFastFail);
}
else
{
@@ -217,8 +217,8 @@
case START_ELEMENT : {
switch (CommonValidation.Tag.forName(reader.getLocalName()))
{
- case BACKGROUNDVALIDATIONMINUTES : {
- backgroundValidationMinutes = elementAsLong(reader);
+ case BACKGROUNDVALIDATIONMILLIS : {
+ backgroundValidationMillis = elementAsLong(reader);
break;
}
case BACKGROUNDVALIDATION : {
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -39,8 +39,8 @@
/** backgroundValidation **/
protected final Boolean backgroundValidation;
- /** backgroundValidationMinutes **/
- protected final Long backgroundValidationMinutes;
+ /** backgroundValidationMillis **/
+ protected final Long backgroundValidationMillis;
/** useFastFail **/
protected final Boolean useFastFail;
@@ -49,14 +49,14 @@
* Create a new SValidationImpl.
*
* @param backgroundValidation backgroundValidation
- * @param backgroundValidationMinutes backgroundValidationMinutes
+ * @param backgroundValidationMillis backgroundValidationMillis
* @param useFastFail useFastFail
*/
- public CommonValidationImpl(Boolean backgroundValidation, Long backgroundValidationMinutes, Boolean useFastFail)
+ public CommonValidationImpl(Boolean backgroundValidation, Long backgroundValidationMillis, Boolean useFastFail)
{
super();
this.backgroundValidation = backgroundValidation;
- this.backgroundValidationMinutes = backgroundValidationMinutes;
+ this.backgroundValidationMillis = backgroundValidationMillis;
this.useFastFail = useFastFail;
}
@@ -72,14 +72,14 @@
}
/**
- * Get the backgroundValidationMinutes.
+ * Get the backgroundValidationMillis.
*
- * @return the backgroundValidationMinutes.
+ * @return the backgroundValidationMillis.
*/
@Override
- public final Long getBackgroundValidationMinutes()
+ public final Long getBackgroundValidationMillis()
{
- return backgroundValidationMinutes;
+ return backgroundValidationMillis;
}
/**
@@ -99,7 +99,7 @@
final int prime = 31;
int result = 1;
result = prime * result + ((backgroundValidation == null) ? 0 : backgroundValidation.hashCode());
- result = prime * result + ((backgroundValidationMinutes == null) ? 0 : backgroundValidationMinutes.hashCode());
+ result = prime * result + ((backgroundValidationMillis == null) ? 0 : backgroundValidationMillis.hashCode());
result = prime * result + ((useFastFail == null) ? 0 : useFastFail.hashCode());
return result;
}
@@ -121,12 +121,12 @@
}
else if (!backgroundValidation.equals(other.backgroundValidation))
return false;
- if (backgroundValidationMinutes == null)
+ if (backgroundValidationMillis == null)
{
- if (other.backgroundValidationMinutes != null)
+ if (other.backgroundValidationMillis != null)
return false;
}
- else if (!backgroundValidationMinutes.equals(other.backgroundValidationMinutes))
+ else if (!backgroundValidationMillis.equals(other.backgroundValidationMillis))
return false;
if (useFastFail == null)
{
@@ -141,8 +141,8 @@
@Override
public String toString()
{
- return "SValidationImpl [backgroundValidation=" + backgroundValidation + ", backgroundValidationMinutes=" +
- backgroundValidationMinutes + ", useFastFail=" + useFastFail + "]";
+ return "SValidationImpl [backgroundValidation=" + backgroundValidation + ", backgroundValidationMillis=" +
+ backgroundValidationMillis + ", useFastFail=" + useFastFail + "]";
}
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -643,7 +643,7 @@
{
boolean validateOnMatch = false;
boolean useFastFail = false;
- Long backgroundValidationMinutes = null;
+ Long backgroundValidationMillis = null;
Extension staleConnectionChecker = null;
boolean backgroundValidation = false;
String checkValidConnectionSql = null;
@@ -658,7 +658,7 @@
if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.VALIDATION)
{
- return new ValidationImpl(backgroundValidation, backgroundValidationMinutes, useFastFail,
+ return new ValidationImpl(backgroundValidation, backgroundValidationMillis, useFastFail,
validConnectionChecker, checkValidConnectionSql, validateOnMatch,
staleConnectionChecker, exceptionSorter);
@@ -680,8 +680,8 @@
backgroundValidation = elementAsBoolean(reader);
break;
}
- case BACKGROUNDVALIDATIONMINUTES : {
- backgroundValidationMinutes = elementAsLong(reader);
+ case BACKGROUNDVALIDATIONMILLIS : {
+ backgroundValidationMillis = elementAsLong(reader);
break;
}
case CHECKVALIDCONNECTIONSQL : {
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -58,7 +58,7 @@
* Create a new ValidationImpl.
*
* @param backgroundValidation backgroundValidation
- * @param backgroundValidationMinutes backgroundValidationMinutes
+ * @param backgroundValidationMillis backgroundValidationMillis
* @param useFastFail useFastFail
* @param validConnectionChecker validConnectionChecker
* @param checkValidConnectionSql checkValidConnectionSql
@@ -67,11 +67,11 @@
* @param exceptionSorter exceptionSorter
* @throws ValidateException ValidateException
*/
- public ValidationImpl(Boolean backgroundValidation, Long backgroundValidationMinutes, Boolean useFastFail,
+ public ValidationImpl(Boolean backgroundValidation, Long backgroundValidationMillis, Boolean useFastFail,
Extension validConnectionChecker, String checkValidConnectionSql, Boolean validateOnMatch,
Extension staleConnectionChecker, Extension exceptionSorter) throws ValidateException
{
- super(backgroundValidation, backgroundValidationMinutes, useFastFail);
+ super(backgroundValidation, backgroundValidationMillis, useFastFail);
this.validConnectionChecker = validConnectionChecker;
this.checkValidConnectionSql = checkValidConnectionSql;
this.validateOnMatch = validateOnMatch;
@@ -145,8 +145,8 @@
@Override
public void validate() throws ValidateException
{
- if (this.backgroundValidationMinutes != null && this.backgroundValidationMinutes < 0)
- throw new ValidateException(bundle.invalidNegative(Validation.Tag.BACKGROUNDVALIDATIONMINUTES.getLocalName()));
+ if (this.backgroundValidationMillis != null && this.backgroundValidationMillis < 0)
+ throw new ValidateException(bundle.invalidNegative(Validation.Tag.BACKGROUNDVALIDATIONMILLIS.getLocalName()));
if (this.validConnectionChecker != null)
try
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2011-08-01 14:45:37 UTC (rev 111892)
@@ -451,12 +451,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="background-validation-minutes" type="xs:nonNegativeInteger" minOccurs="0">
+ <xs:element name="background-validation-millis" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The background-validation-minutes element specifies the amount of
- time, in minutes, that background validation will run.
+ The background-validation-millis element specifies the amount of
+ time, in millis, that background validation will run.
]]>
</xs:documentation>
</xs:annotation>
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd 2011-08-01 14:45:37 UTC (rev 111892)
@@ -243,12 +243,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="background-validation-minutes" type="xs:nonNegativeInteger" minOccurs="0">
+ <xs:element name="background-validation-millis" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The background-validation-minutes element specifies the amount of
- time, in minutes, that background validation will run.
+ The background-validation-millis element specifies the amount of
+ time, in millis, that background validation will run.
]]>
</xs:documentation>
</xs:annotation>
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd 2011-08-01 14:45:37 UTC (rev 111892)
@@ -251,12 +251,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="background-validation-minutes" type="xs:nonNegativeInteger" minOccurs="0">
+ <xs:element name="background-validation-millis" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The background-validation-minutes element specifies the amount of
- time, in minutes, that background validation will run.
+ The background-validation-millis element specifies the amount of
+ time, in millis, that background validation will run.
]]>
</xs:documentation>
</xs:annotation>
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -435,7 +435,7 @@
//validation default
CommonValidation v = connDef.getValidation();
- assertThat(v.getBackgroundValidationMinutes(), new IsNull<Long>());
+ assertThat(v.getBackgroundValidationMillis(), new IsNull<Long>());
assertThat(v.isBackgroundValidation(), is(false));
assertThat(v.isUseFastFail(), is(false));
@@ -498,7 +498,7 @@
//validation default
CommonValidation v = connDef.getValidation();
- assertThat(v.getBackgroundValidationMinutes(), new IsNull<Long>());
+ assertThat(v.getBackgroundValidationMillis(), new IsNull<Long>());
assertThat(v.isBackgroundValidation(), is(false));
assertThat(v.isUseFastFail(), is(false));
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/background-validation-minutes-negative-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/background-validation-minutes-negative-ds.xml 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/background-validation-minutes-negative-ds.xml 2011-08-01 14:45:37 UTC (rev 111892)
@@ -11,7 +11,7 @@
<!-- ********************************************** -->
<!-- THIS FIELD IS CAUSING THE FAIL OF RELATED TEST -->
<!-- ********************************************** -->
- <background-validation-minutes>-1</background-validation-minutes>
+ <background-validation-millis>-1</background-validation-millis>
</validation>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -48,8 +48,8 @@
/** Background validation */
private AtomicBoolean backgroundValidation;
- /** Background validation - minutes */
- private AtomicInteger backgroundValidationMinutes;
+ /** Background validation - millis */
+ private AtomicLong backgroundValidationMillis;
/** Prefill pool*/
private AtomicBoolean prefill;
@@ -73,7 +73,7 @@
blockingTimeout = new AtomicLong(30000);
idleTimeout = new AtomicLong(1000 * 60 * 30);
backgroundValidation = new AtomicBoolean(false);
- backgroundValidationMinutes = new AtomicInteger(0);
+ backgroundValidationMillis = new AtomicLong(0);
prefill = new AtomicBoolean(false);
strictMin = new AtomicBoolean(false);
useFastFail = new AtomicBoolean(false);
@@ -166,33 +166,24 @@
}
/**
- * Get the background validation minutes setting
+ * Get the background validation millis setting
* @return The value
*/
- public int getBackgroundValidationMinutes()
+ public long getBackgroundValidationMillis()
{
- return backgroundValidationMinutes.get();
+ return backgroundValidationMillis.get();
}
/**
- * Set the background validation minutes setting
+ * Set the background validation millis setting
* @param v The value
*/
- public void setBackgroundValidationMinutes(int v)
+ public void setBackgroundValidationMillis(long v)
{
- this.backgroundValidationMinutes.set(v);
+ this.backgroundValidationMillis.set(v);
}
/**
- * Get the background validation interval in milliseconds
- * @return The interval
- */
- public long getBackgroundValidationInterval()
- {
- return backgroundValidationMinutes.get() * 60000L;
- }
-
- /**
* @return the prefill
*/
public boolean isPrefill()
@@ -255,7 +246,7 @@
sb.append(" blockingTimeout=").append(blockingTimeout.get());
sb.append(" idleTimeout=").append(idleTimeout.get());
sb.append(" backgroundValidation=").append(backgroundValidation.get());
- sb.append(" backgroundValidationMinutes=").append(backgroundValidationMinutes.get());
+ sb.append(" backgroundValidationMillis=").append(backgroundValidationMillis.get());
sb.append(" prefill=").append(prefill.get());
sb.append(" strictMin=").append(strictMin.get());
sb.append(" useFastFail=").append(useFastFail.get());
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -182,13 +182,13 @@
IdleRemover.registerPool(this, poolConfiguration.getIdleTimeout());
}
- if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationInterval() > 0)
+ if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationMillis() > 0)
{
log.debug("Registering for background validation at interval " +
- poolConfiguration.getBackgroundValidationInterval());
+ poolConfiguration.getBackgroundValidationMillis());
//Register validation
- ConnectionValidator.registerPool(this, poolConfiguration.getBackgroundValidationInterval());
+ ConnectionValidator.registerPool(this, poolConfiguration.getBackgroundValidationMillis());
}
shutdown.set(false);
@@ -806,7 +806,7 @@
ConnectionListener cl = iter.next();
long lastCheck = cl.getLastValidatedTime();
- if ((System.currentTimeMillis() - lastCheck) >= poolConfiguration.getBackgroundValidationInterval())
+ if ((System.currentTimeMillis() - lastCheck) >= poolConfiguration.getBackgroundValidationMillis())
{
result = cl;
cls.remove(cl);
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -206,13 +206,13 @@
IdleRemover.registerPool(this, poolConfiguration.getIdleTimeout());
}
- if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationInterval() > 0)
+ if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationMillis() > 0)
{
log.debug("Registering for background validation at interval " +
- poolConfiguration.getBackgroundValidationInterval());
+ poolConfiguration.getBackgroundValidationMillis());
//Register validation
- ConnectionValidator.registerPool(this, poolConfiguration.getBackgroundValidationInterval());
+ ConnectionValidator.registerPool(this, poolConfiguration.getBackgroundValidationMillis());
}
shutdown.set(false);
@@ -869,7 +869,7 @@
cl = iter.next();
long lastCheck = cl.getLastValidatedTime();
- if ((System.currentTimeMillis() - lastCheck) >= poolConfiguration.getBackgroundValidationInterval())
+ if ((System.currentTimeMillis() - lastCheck) >= poolConfiguration.getBackgroundValidationMillis())
{
cls.remove(cl);
break;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -92,15 +92,13 @@
{
PoolConfiguration params = new PoolConfiguration();
assertFalse(params.isBackgroundValidation());
- assertEquals(0L, params.getBackgroundValidationMinutes());
- assertEquals(0L, params.getBackgroundValidationInterval());
+ assertEquals(0L, params.getBackgroundValidationMillis());
params.setBackgroundValidation(true);
- params.setBackgroundValidationMinutes(5);
+ params.setBackgroundValidationMillis(5000);
assertTrue(params.isBackgroundValidation());
- assertEquals(5, params.getBackgroundValidationMinutes());
- assertEquals(300000L, params.getBackgroundValidationInterval());
+ assertEquals(5000, params.getBackgroundValidationMillis());
}
/**
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -888,8 +888,8 @@
if (vp.isBackgroundValidation() != null)
pc.setBackgroundValidation(vp.isBackgroundValidation().booleanValue());
- if (vp.getBackgroundValidationMinutes() != null)
- pc.setBackgroundValidationMinutes(vp.getBackgroundValidationMinutes().intValue());
+ if (vp.getBackgroundValidationMillis() != null)
+ pc.setBackgroundValidationMillis(vp.getBackgroundValidationMillis().intValue());
if (vp.isUseFastFail() != null)
pc.setUseFastFail(vp.isUseFastFail());
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -499,8 +499,8 @@
if (vp.isBackgroundValidation() != null)
pc.setBackgroundValidation(vp.isBackgroundValidation().booleanValue());
- if (vp.getBackgroundValidationMinutes() != null)
- pc.setBackgroundValidationMinutes(vp.getBackgroundValidationMinutes().intValue());
+ if (vp.getBackgroundValidationMillis() != null)
+ pc.setBackgroundValidationMillis(vp.getBackgroundValidationMillis().intValue());
if (vp.isUseFastFail() != null)
pc.setUseFastFail(vp.isUseFastFail());
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -69,14 +69,10 @@
PropertySimple isBackGroundValidateProp = new PropertySimple("background-validation", doBackGroundValidation);
config.put(isBackGroundValidateProp);
- Long bvInterval = Long.valueOf(poolConfig.getBackgroundValidationInterval());
- PropertySimple backGroundValidateIntervalProp = new PropertySimple("background-validation-millis", bvInterval);
- config.put(backGroundValidateIntervalProp);
+ Long bvMillis = Long.valueOf(poolConfig.getBackgroundValidationMillis());
+ PropertySimple backGroundValidateMillisProp = new PropertySimple("background-validation-millis", bvMillis);
+ config.put(backGroundValidateMillisProp);
- Integer bvMinutes = Integer.valueOf(poolConfig.getBackgroundValidationMinutes());
- PropertySimple backGroundValidateMintuesProp = new PropertySimple("background-validation-minutes", bvMinutes);
- config.put(backGroundValidateMintuesProp);
-
Long blTimeout = Long.valueOf(poolConfig.getBlockingTimeout());
PropertySimple blockingTimeoutProp = new PropertySimple("blocking-timeout-millis", blTimeout);
config.put(blockingTimeoutProp);
@@ -116,9 +112,9 @@
// background-validation-millis
- // background-validation-minutes
- Integer backGroundValidMinutes = Integer.valueOf(config.getSimpleValue("background-validation-minutes", "0"));
- poolConfig.setBackgroundValidationMinutes(backGroundValidMinutes.intValue());
+ // background-validation-millis
+ Long backGroundValidMillis = Long.valueOf(config.getSimpleValue("background-validation-millis", "0"));
+ poolConfig.setBackgroundValidationMillis(backGroundValidMillis.intValue());
// blocking-timeout-millis
Long blockTimeoutMillis = Long.valueOf(config.getSimpleValue("blocking-timeout-millis", "30000"));
Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java 2011-08-01 13:52:36 UTC (rev 111891)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java 2011-08-01 14:45:37 UTC (rev 111892)
@@ -123,7 +123,6 @@
assertEquals("20", config.getSimpleValue("max-pool-size", null));
assertEquals("false", config.getSimpleValue("background-validation", null));
assertEquals("0", config.getSimpleValue("background-validation-millis", null));
- assertEquals("0", config.getSimpleValue("background-validation-minutes", null));
assertEquals("30000", config.getSimpleValue("blocking-timeout-millis", null));
assertEquals("30", config.getSimpleValue("idle-timeout-minutes", null));
assertEquals("false", config.getSimpleValue("prefill", null));
@@ -161,7 +160,7 @@
int oldMinPoolSize = poolConfig.getMinSize();
int oldMaxPoolSize = poolConfig.getMaxSize();
boolean oldBackgroundValidation = poolConfig.isBackgroundValidation();
- int oldBackgroundValidationTime = poolConfig.getBackgroundValidationMinutes();
+ long oldBackgroundValidationTime = poolConfig.getBackgroundValidationMillis();
long oldBlockingTimeout = poolConfig.getBlockingTimeout();
long oldIdleTimeout = poolConfig.getIdleTimeout();
boolean oldPreFill = poolConfig.isPrefill();
@@ -170,14 +169,14 @@
int minPoolSize = 5;
int maxPoolSize = 15;
- int backValidationTime = 30;
+ long backValidationTime = 30000;
long blockingTimeout = 10000;
long idleTimeOut = 15;
config.put(new PropertySimple("min-pool-size", minPoolSize));
config.put(new PropertySimple("max-pool-size", maxPoolSize));
config.put(new PropertySimple("background-validation", true));
- config.put(new PropertySimple("background-validation-minutes", backValidationTime));
+ config.put(new PropertySimple("background-validation-millis", backValidationTime));
config.put(new PropertySimple("blocking-timeout-millis", blockingTimeout));
config.put(new PropertySimple("idle-timeout-minutes", idleTimeOut));
config.put(new PropertySimple("prefill", false));
@@ -190,7 +189,7 @@
assertEquals(minPoolSize, poolConfig.getMinSize());
assertEquals(maxPoolSize, poolConfig.getMaxSize());
assertTrue(poolConfig.isBackgroundValidation());
- assertEquals(backValidationTime, poolConfig.getBackgroundValidationMinutes());
+ assertEquals(backValidationTime, poolConfig.getBackgroundValidationMillis());
assertEquals(blockingTimeout, poolConfig.getBlockingTimeout());
assertEquals(idleTimeOut * 60 * 1000L, poolConfig.getIdleTimeout());
assertFalse(poolConfig.isPrefill());
@@ -198,7 +197,7 @@
assertTrue(poolConfig.isUseFastFail());
poolConfig.setBackgroundValidation(oldBackgroundValidation);
- poolConfig.setBackgroundValidationMinutes(oldBackgroundValidationTime);
+ poolConfig.setBackgroundValidationMillis(oldBackgroundValidationTime);
poolConfig.setBlockingTimeout(oldBlockingTimeout);
poolConfig.setIdleTimeout(oldIdleTimeout);
poolConfig.setMaxSize(oldMaxPoolSize);
More information about the jboss-cvs-commits
mailing list