[jboss-cvs] JBossAS SVN: r109721 - in projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common: metadata/common and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 6 07:37:17 EST 2010
Author: maeste
Date: 2010-12-06 07:37:16 -0500 (Mon, 06 Dec 2010)
New Revision: 109721
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/JdbcAdapterExtension.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonPoolImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java
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/XADataSourceImpl.java
Log:
JBJCA-478: better exceptions chain
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/JdbcAdapterExtension.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/JdbcAdapterExtension.java 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/JdbcAdapterExtension.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -250,7 +250,8 @@
public void validate() throws ValidateException
{
if (this.className == null || className.trim().length() == 0)
- throw new ValidateException("connectionUrl is required in " + this.getClass().getCanonicalName());
+ throw new ValidateException("className (xml attribute " + Attribute.CLASS_NAME + ") is required in " +
+ this.getClass().getCanonicalName());
}
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonPoolImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonPoolImpl.java 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonPoolImpl.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -125,9 +125,9 @@
public void validate() throws ValidateException
{
if (this.maxPoolSize != null && this.maxPoolSize < 0)
- throw new ValidateException("maxPoolSize cannot be < 0");
+ throw new ValidateException("maxPoolSize (xml tag " + Tag.MAXPOOLSIZE + ") cannot be < 0");
if (this.minPoolSize != null && this.minPoolSize < 0)
- throw new ValidateException("minPoolSize cannot be < 0");
+ throw new ValidateException("minPoolSize (xml tag " + Tag.MIN_POOL_SIZE + ") cannot be < 0");
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -202,15 +202,18 @@
private void partialCommonValidate() throws ValidateException
{
if (this.allocationRetry != null && this.allocationRetry < 0)
- throw new ValidateException("allocationRetry cannot be < 0");
+ throw new ValidateException("allocationRetry (xml attribure " + Tag.ALLOCATIONRETRY + ") cannot be < 0");
if (this.blockingTimeoutMillis != null && this.blockingTimeoutMillis < 0)
- throw new ValidateException("blockingTimeoutMillis cannot be < 0");
+ throw new ValidateException("blockingTimeoutMillis (xml attribure " + Tag.BLOCKINGTIMEOUTMILLIS +
+ ") cannot be < 0");
if (this.allocationRetryWaitMillis != null && this.allocationRetryWaitMillis < 0)
- throw new ValidateException("allocationRetryWaitMillis cannot be < 0");
+ throw new ValidateException("allocationRetryWaitMillis (xml attribure " + Tag.ALLOCATIONRETRYWAITMILLIS +
+ ") cannot be < 0");
if (this.idleTimeoutMinutes != null && this.idleTimeoutMinutes < 0)
- throw new ValidateException("idleTimeoutMinutes cannot be < 0");
+ throw new ValidateException("idleTimeoutMinutes (xml attribure " + Tag.IDLETIMEOUTMINUTES +
+ ") cannot be < 0");
if (this.xaResourceTimeout != null && this.xaResourceTimeout < 0)
- throw new ValidateException("xaResourceTimeout cannot be < 0");
+ throw new ValidateException("xaResourceTimeout (xml attribure " + Tag.XARESOURCETIMEOUT + ") cannot be < 0");
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -23,6 +23,7 @@
import org.jboss.jca.common.api.metadata.common.CommonSecurity;
import org.jboss.jca.common.api.metadata.ds.CommonDataSource;
+import org.jboss.jca.common.api.metadata.ds.DataSource;
import org.jboss.jca.common.api.metadata.ds.Statement;
import org.jboss.jca.common.api.metadata.ds.TimeOut;
import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
@@ -238,9 +239,11 @@
protected void partialCommonValidation() throws ValidateException
{
if (this.jndiName == null)
- throw new ValidateException("jndiName is required in " + this.getClass().getCanonicalName());
+ throw new ValidateException("jndiName (xml attribure " + DataSource.Attribute.JNDINAME +
+ ") is required in " + this.getClass().getCanonicalName());
if (this.poolName == null)
- throw new ValidateException("poolName is required in " + this.getClass().getCanonicalName());
+ throw new ValidateException("poolName (xml attribure " + DataSource.Attribute.POOL_NAME +
+ ") is required in " + this.getClass().getCanonicalName());
if (this.timeOut != null)
this.timeOut.validate();
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -289,9 +289,11 @@
public void validate() throws ValidateException
{
if (this.connectionUrl == null || this.connectionUrl.trim().length() == 0)
- throw new ValidateException("connectionUrl is required in " + this.getClass().getCanonicalName());
+ throw new ValidateException("connectionUrl (xml tag " + Tag.CONNECTIONURL + ") is required in " +
+ this.getClass().getCanonicalName());
if (this.driverClass == null || this.driverClass.trim().length() == 0)
- throw new ValidateException("driverClass is required in " + this.getClass().getCanonicalName());
+ throw new ValidateException("driverClass (xml tag " + Tag.DRIVERCLASS + ") is required in " +
+ this.getClass().getCanonicalName());
}
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -146,7 +146,8 @@
public void validate() throws ValidateException
{
if (this.preparedStatementsCacheSize != null && this.preparedStatementsCacheSize < 0)
- throw new ValidateException("preparedStatementsCacheSize cannot be < 0");
+ throw new ValidateException("preparedStatementsCacheSize (xml attribure " + Tag.PREPAREDSTATEMENTCACHESIZE +
+ ") cannot be < 0");
}
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -156,9 +156,9 @@
public void validate() throws ValidateException
{
if (this.queryTimeout != null && this.queryTimeout < 0)
- throw new ValidateException("queryTimeout cannot be < 0");
+ throw new ValidateException("queryTimeout (xml attribure " + TimeOut.Tag.QUERYTIMEOUT + ") cannot be < 0");
if (this.useTryLock != null && this.useTryLock < 0)
- throw new ValidateException("useTryLock cannot be < 0");
+ throw new ValidateException("useTryLock (xml attribure " + TimeOut.Tag.USETRYLOCK + ") cannot be < 0");
}
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 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -145,13 +145,35 @@
public void validate() throws ValidateException
{
if (this.backgroundValidationMinutes != null && this.backgroundValidationMinutes < 0)
- throw new ValidateException("backgroundValidationMinutes cannot be < 0");
+ throw new ValidateException("backgroundValidationMinutes (xml attribure " +
+ Validation.Tag.BACKGROUNDVALIDATIONMINUTES + ") cannot be < 0");
if (this.validConnectionChecker != null)
- this.validConnectionChecker.validate();
+ try {
+ this.validConnectionChecker.validate();
+ } catch (ValidateException ve) {
+ throw new ValidateException("validCoonnectionChecker (xml tag" + Validation.Tag.VALIDCONNECTIONCHECKER +
+ ") not valid. See the cause exception for more details", ve);
+ }
if (this.exceptionSorter != null)
- this.exceptionSorter.validate();
+ try
+ {
+ this.exceptionSorter.validate();
+ }
+ catch (ValidateException ve)
+ {
+ throw new ValidateException("exceptionSorter (xml tag" + Validation.Tag.EXCEPTIONSORTER +
+ ") not valid. See the cause exception for more details", ve);
+ }
if (this.staleConnectionChecker != null)
- this.staleConnectionChecker.validate();
+ try
+ {
+ this.staleConnectionChecker.validate();
+ }
+ catch (ValidateException ve)
+ {
+ throw new ValidateException("staleConnectionChecker (xml tag" + Validation.Tag.STALECONNECTIONCHECKER +
+ ") not valid. See the cause exception for more details", ve);
+ }
}
@Override
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2010-12-06 11:31:58 UTC (rev 109720)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2010-12-06 12:37:16 UTC (rev 109721)
@@ -265,10 +265,10 @@
public void validate() throws ValidateException
{
if (this.xaDataSourceClass == null || this.xaDataSourceClass.trim().length() == 0)
- throw new ValidateException("xaDataSourceClass is required in " + this.getClass().getCanonicalName());
+ throw new ValidateException("xaDataSourceClass (xml tag " + Tag.XADATASOURCECLASS + ") is required");
if (this.xaDataSourceProperty.isEmpty())
- throw new ValidateException("at least one xaDataSourceProperty is required in " +
- this.getClass().getCanonicalName());
+ throw new ValidateException("at least one xaDataSourceProperty (xml tag " + Tag.XADATASOURCEPROPERTY +
+ ") is required ");
}
}
More information about the jboss-cvs-commits
mailing list