[jboss-cvs] JBossAS SVN: r112108 - in projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common: api/metadata/ds and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 23 15:31:02 EDT 2011
Author: jesper.pedersen
Date: 2011-08-23 15:31:01 -0400 (Tue, 23 Aug 2011)
New Revision: 112108
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonAdminObject.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java
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/CommonXaPool.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Credential.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Driver.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.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/api/metadata/ds/XaDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConnectionDefinition.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/Connector10.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Connector15.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Connector16.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapters.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonAdminObjectImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.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/CommonTimeOutImpl.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/common/CommonXaPoolImpl.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/DriverImpl.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/DsSecurityImpl.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
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
Log:
[JBJCA-654] Metadata cleanup (Part 1)
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonAdminObject.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonAdminObject.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonAdminObject.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -174,7 +174,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndi-name"),
+ JNDI_NAME("jndi-name"),
/** class-name attribute
*
@@ -193,7 +193,7 @@
/** use-java-context attribute
*
*/
- USEJAVACONTEXT("use-java-context");
+ USE_JAVA_CONTEXT("use-java-context");
private final String name;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -247,7 +247,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndi-name"),
+ JNDI_NAME("jndi-name"),
/** class-name attribute
*
@@ -266,11 +266,11 @@
/** use-java-context attribute
*
*/
- USEJAVACONTEXT("use-java-context"),
+ USE_JAVA_CONTEXT("use-java-context"),
/** use-ccm attribute
*
*/
- USECCM("use-ccm");
+ USE_CCM("use-ccm");
private final String name;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -88,23 +88,23 @@
/**
blockingTimeoutMillis tag
*/
- BLOCKINGTIMEOUTMILLIS("blocking-timeout-millis"),
+ BLOCKING_TIMEOUT_MILLIS("blocking-timeout-millis"),
/**
idleTimeoutMinutes tag
*/
- IDLETIMEOUTMINUTES("idle-timeout-minutes"),
+ IDLE_TIMEOUT_MINUTES("idle-timeout-minutes"),
/**
* xaResourceTimeout tag
*/
- XARESOURCETIMEOUT("xa-resource-timeout"),
+ XA_RESOURCE_TIMEOUT("xa-resource-timeout"),
/**
allocationRetry tag
*/
- ALLOCATIONRETRY("allocation-retry"),
+ ALLOCATION_RETRY("allocation-retry"),
/**
allocationRetryWaitMillis tag
*/
- ALLOCATIONRETRYWAITMILLIS("allocation-retry-wait-millis");
+ ALLOCATION_RETRY_WAIT_MILLIS("allocation-retry-wait-millis");
private final String name;
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-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -73,15 +73,15 @@
/**
backgroundValidation tag
*/
- BACKGROUNDVALIDATION("background-validation"),
+ BACKGROUND_VALIDATION("background-validation"),
/**
* backgroundValidationMinutes tag
*/
- BACKGROUNDVALIDATIONMILLIS("background-validation-millis"),
+ BACKGROUND_VALIDATION_MILLIS("background-validation-millis"),
/**
useFastFail tag
*/
- USEFASTFAIL("use-fast-fail");
+ USE_FAST_FAIL("use-fast-fail");
private final String name;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -113,7 +113,7 @@
/**
* isSameRmOverrideValue tag
*/
- ISSAMERMOVERRIDEVALUE("is-same-rm-override"),
+ IS_SAME_RM_OVERRIDE("is-same-rm-override"),
/**
* interleaving tag
*/
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Credential.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Credential.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Credential.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -75,7 +75,7 @@
/**
* userName tag
*/
- USERNAME("user-name"),
+ USER_NAME("user-name"),
/**
* password tag
*/
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -160,9 +160,9 @@
sb.append("<").append(Tag.RECOVER_CREDENTIAL).append(">");
if (credential.getUserName() != null)
{
- sb.append("<").append(Credential.Tag.USERNAME).append(">");
+ sb.append("<").append(Credential.Tag.USER_NAME).append(">");
sb.append(credential.getUserName());
- sb.append("</").append(Credential.Tag.USERNAME).append(">");
+ sb.append("</").append(Credential.Tag.USER_NAME).append(">");
sb.append("<").append(Credential.Tag.PASSWORD).append(">");
sb.append(credential.getPassword());
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -104,7 +104,7 @@
* @return the spy.
*/
- public boolean isSpy();
+ public Boolean isSpy();
/**
* Get the use-ccm.
@@ -112,7 +112,7 @@
* @return the use-ccm.
*/
- public boolean isUseCcm();
+ public Boolean isUseCcm();
/**
* Get the driver
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -39,7 +39,7 @@
* Get the JTA setting.
* @return The value
*/
- public boolean isJTA();
+ public Boolean isJTA();
/**
* Get the connectionUrl.
@@ -128,15 +128,15 @@
/**
* connection-url tag
*/
- CONNECTIONURL("connection-url"),
+ CONNECTION_URL("connection-url"),
/**
* driverClass tag
*/
- DRIVERCLASS("driver-class"),
+ DRIVER_CLASS("driver-class"),
/**
* dataSourceClass tag
*/
- DATASOURCECLASS("datasource-class"),
+ DATASOURCE_CLASS("datasource-class"),
/**
* module tag
*/
@@ -144,11 +144,11 @@
/**
* transactionIsolation tag
*/
- TRANSACTIONISOLATION("transaction-isolation"),
+ TRANSACTION_ISOLATION("transaction-isolation"),
/**
* connectionProperty tag
*/
- CONNECTIONPROPERTY("connection-property"),
+ CONNECTION_PROPERTY("connection-property"),
/**
* timeOut tag
*/
@@ -168,15 +168,15 @@
/**
* urlDelimiter tag
*/
- URLDELIMITER("url-delimiter"),
+ URL_DELIMITER("url-delimiter"),
/**
* urlSelectorStrategyClassName tag
*/
- URLSELECTORSTRATEGYCLASSNAME("url-selector-strategy-className"),
+ URL_SELECTOR_STRATEGY_CLASS_NAME("url-selector-strategy-class-name"),
/**
* newConnectionSql tag
*/
- NEWCONNECTIONSQL("new-connection-sql");
+ NEW_CONNECTION_SQL("new-connection-sql");
private final String name;
@@ -251,7 +251,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndi-name"),
+ JNDI_NAME("jndi-name"),
/** jndiName attribute
*
@@ -265,7 +265,7 @@
/** use-java-context attribute
*
*/
- USEJAVACONTEXT("use-java-context"),
+ USE_JAVA_CONTEXT("use-java-context"),
/** spy attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Driver.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Driver.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Driver.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -104,17 +104,17 @@
/**
* driverClass tag
*/
- DRIVERCLASS("driver-class"),
+ DRIVER_CLASS("driver-class"),
/**
* DatasourceClass tag
*/
- DATASOURCECLASS("datasource-class"),
+ DATASOURCE_CLASS("datasource-class"),
/**
* xaDatasourceClass tag
*/
- XADATASOURCECLASS("xa-datasource-class");
+ XA_DATASOURCE_CLASS("xa-datasource-class");
private final String name;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -61,7 +61,7 @@
/**
* userName tag
*/
- USERNAME("user-name"),
+ USER_NAME("user-name"),
/**
* password tag
*/
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -119,15 +119,15 @@
/**
* trackStatements tag
*/
- TRACKSTATEMENTS("track-statements"),
+ TRACK_STATEMENTS("track-statements"),
/**
* preparedStatementCacheSize tag
*/
- PREPAREDSTATEMENTCACHESIZE("prepared-statement-cache-size"),
+ PREPARED_STATEMENT_CACHE_SIZE("prepared-statement-cache-size"),
/**
* sharePreparedStatements tag
*/
- SHAREPREPAREDSTATEMENTS("share-prepared-statements");
+ SHARE_PREPARED_STATEMENTS("share-prepared-statements");
private final String name;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -76,35 +76,35 @@
/**
* blockingTimeoutMillis tag
*/
- BLOCKINGTIMEOUTMILLIS("blocking-timeout-millis"),
+ BLOCKING_TIMEOUT_MILLIS("blocking-timeout-millis"),
/**
* idleTimeoutMinutes tag
*/
- IDLETIMEOUTMINUTES("idle-timeout-minutes"),
+ IDLE_TIMEOUT_MINUTES("idle-timeout-minutes"),
/**
* setTxQueryTimeout tag
*/
- SETTXQUERYTIMEOUT("set-tx-query-timeout"),
+ SET_TX_QUERY_TIMEOUT("set-tx-query-timeout"),
/**
* queryTimeout tag
*/
- QUERYTIMEOUT("query-timeout"),
+ QUERY_TIMEOUT("query-timeout"),
/**
* useTryLock tag
*/
- USETRYLOCK("use-try-lock"),
+ USE_TRY_LOCK("use-try-lock"),
/**
* allocationRetry tag
*/
- ALLOCATIONRETRY("allocation-retry"),
+ ALLOCATION_RETRY("allocation-retry"),
/**
* xaResourceTimeout tag
*/
- XARESOURCETIMEOUT("xa-resource-timeout"),
+ XA_RESOURCE_TIMEOUT("xa-resource-timeout"),
/**
* allocationRetryWaitMillis tag
*/
- ALLOCATIONRETRYWAITMILLIS("allocation-retry-wait-millis");
+ ALLOCATION_RETRY_WAIT_MILLIS("allocation-retry-wait-millis");
private final String name;
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-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -91,36 +91,36 @@
/**
* validConnectionCheckerClassName tag
*/
- VALIDCONNECTIONCHECKER("valid-connection-checker"),
+ VALID_CONNECTION_CHECKER("valid-connection-checker"),
/**
* checkValidConnectionSql tag
*/
- CHECKVALIDCONNECTIONSQL("check-valid-connection-sql"),
+ CHECK_VALID_CONNECTION_SQL("check-valid-connection-sql"),
/**
* validateOnMatch tag
*/
- VALIDATEONMATCH("validate-on-match"),
+ VALIDATE_ON_MATCH("validate-on-match"),
/**
* backgroundValidation tag
*/
- BACKGROUNDVALIDATION("background-validation"),
+ BACKGROUND_VALIDATION("background-validation"),
/**
* backgroundValidationMillis tag
*/
- BACKGROUNDVALIDATIONMILLIS("background-validation-millis"),
+ BACKGROUND_VALIDATION_MILLIS("background-validation-millis"),
/**
* useFastFail tag
*/
- USEFASTFAIL("use-fast-fail"),
+ USE_FAST_FAIL("use-fast-fail"),
/**
* staleConnectionCheckerClassName tag
*/
- STALECONNECTIONCHECKER("stale-connection-checker"),
+ STALE_CONNECTION_CHECKER("stale-connection-checker"),
/**
* exceptionSorterClassName tag
*/
- EXCEPTIONSORTER("exception-sorter");
+ EXCEPTION_SORTER("exception-sorter");
private final String name;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -111,11 +111,11 @@
/**
* xaDatasourceProperty tag
*/
- XADATASOURCEPROPERTY("xa-datasource-property"),
+ XA_DATASOURCE_PROPERTY("xa-datasource-property"),
/**
* xaDatasourceClass tag
*/
- XADATASOURCECLASS("xa-datasource-class"),
+ XA_DATASOURCE_CLASS("xa-datasource-class"),
/**
* module tag
*/
@@ -123,7 +123,7 @@
/**
* transactionIsolation tag
*/
- TRANSACTIONISOLATION("transaction-isolation"),
+ TRANSACTION_ISOLATION("transaction-isolation"),
/**
* timeOut tag
*/
@@ -143,15 +143,15 @@
/**
* urlDelimiter tag
*/
- URLDELIMITER("url-delimiter"),
+ URL_DELIMITER("url-delimiter"),
/**
* urlSelectorStrategyClassName tag
*/
- URLSELECTORSTRATEGYCLASSNAME("url-selector-strategy-class-name"),
+ URL_SELECTOR_STRATEGY_CLASS_NAME("url-selector-strategy-class-name"),
/**
* newConnectionSql tag
*/
- NEWCONNECTIONSQL("new-connection-sql"),
+ NEW_CONNECTION_SQL("new-connection-sql"),
/**
* xa-pool tag
@@ -234,7 +234,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndi-name"),
+ JNDI_NAME("jndi-name"),
/** jndiName attribute
*
@@ -248,7 +248,7 @@
/** use-java-context attribute
*
*/
- USEJAVACONTEXT("use-java-context"),
+ USE_JAVA_CONTEXT("use-java-context"),
/** spy attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConnectionDefinition.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConnectionDefinition.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConnectionDefinition.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -121,7 +121,7 @@
/**
* managedconnectionfactory-class TAG
*/
- MANAGED_CONNECTIONFACTORY_CLASS("managedconnectionfactory-class"),
+ MANAGEDCONNECTIONFACTORY_CLASS("managedconnectionfactory-class"),
/**
* config-property TAG
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/Connector10.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/Connector10.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/Connector10.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -52,7 +52,7 @@
/**
* vendor-name tag
*/
- VENDORNAME("vendor-name"),
+ VENDOR_NAME("vendor-name"),
/**
* eis-type tag
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -144,7 +144,7 @@
/**
* managedconnectionfactory-class TAG
*/
- MANAGED_CONNECTIONFACTORY_CLASS("managedconnectionfactory-class"),
+ MANAGEDCONNECTIONFACTORY_CLASS("managedconnectionfactory-class"),
/**
* config-property TAG
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Connector15.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Connector15.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Connector15.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -64,7 +64,7 @@
/**
* vendor-name tag
*/
- VENDORNAME("vendor-name"),
+ VENDOR_NAME("vendor-name"),
/**
* eis-type tag
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Connector16.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Connector16.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Connector16.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -91,12 +91,12 @@
/**
* module-name tag
*/
- MODULENAME("module-name"),
+ MODULE_NAME("module-name"),
/**
* vendor-name tag
*/
- VENDORNAME("vendor-name"),
+ VENDOR_NAME("vendor-name"),
/**
* eis-type tag
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapters.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapters.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapters.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -62,7 +62,7 @@
/** jboss-ra tag name
*
*/
- RESOURCE_ADPTER("resource-adapter");
+ RESOURCE_ADAPTER("resource-adapter");
private final String name;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -76,7 +76,7 @@
* @throws XMLStreamException StAX exception
* @throws ParserException in case of non valid boolean for given element value
*/
- protected boolean elementAsBoolean(XMLStreamReader reader) throws XMLStreamException, ParserException
+ protected Boolean elementAsBoolean(XMLStreamReader reader) throws XMLStreamException, ParserException
{
String elementtext = rawElementText(reader);
String stringValue = getSubstitutionValue(elementtext);
@@ -102,7 +102,7 @@
* @throws XMLStreamException StAX exception
* @throws ParserException in case of not valid boolena for given attribute
*/
- protected boolean attributeAsBoolean(XMLStreamReader reader, String attributeName, boolean defaultValue)
+ protected Boolean attributeAsBoolean(XMLStreamReader reader, String attributeName, Boolean defaultValue)
throws XMLStreamException, ParserException
{
String attributeString = rawAttributeText(reader, attributeName);
@@ -276,8 +276,8 @@
{
Integer minPoolSize = null;
Integer maxPoolSize = null;
- boolean prefill = false;
- boolean useStrictMin = false;
+ Boolean prefill = Boolean.FALSE;
+ Boolean useStrictMin = Boolean.FALSE;
FlushStrategy flushStrategy = FlushStrategy.FAILING_CONNECTION_ONLY;
while (reader.hasNext())
@@ -413,14 +413,14 @@
{
Integer minPoolSize = null;
Integer maxPoolSize = null;
- boolean prefill = false;
+ Boolean prefill = Boolean.FALSE;
FlushStrategy flushStrategy = FlushStrategy.FAILING_CONNECTION_ONLY;
- boolean interleaving = false;
- boolean isSameRmOverrideValue = false;
- boolean padXid = false;
- boolean noTxSeparatePool = false;
- boolean wrapXaDataSource = true;
- boolean useStrictMin = false;
+ Boolean interleaving = Boolean.FALSE;
+ Boolean isSameRmOverride = Boolean.FALSE;
+ Boolean padXid = Boolean.FALSE;
+ Boolean noTxSeparatePool = Boolean.FALSE;
+ Boolean wrapXaDataSource = Boolean.TRUE;
+ Boolean useStrictMin = Boolean.FALSE;
while (reader.hasNext())
{
@@ -431,7 +431,7 @@
{
return new CommonXaPoolImpl(minPoolSize, maxPoolSize, prefill, useStrictMin, flushStrategy,
- isSameRmOverrideValue, interleaving, padXid,
+ isSameRmOverride, interleaving, padXid,
wrapXaDataSource, noTxSeparatePool);
}
@@ -459,8 +459,8 @@
interleaving = elementAsBoolean(reader);
break;
}
- case ISSAMERMOVERRIDEVALUE : {
- isSameRmOverrideValue = elementAsBoolean(reader);
+ case IS_SAME_RM_OVERRIDE : {
+ isSameRmOverride = elementAsBoolean(reader);
break;
}
case NO_TX_SEPARATE_POOLS : {
@@ -617,7 +617,7 @@
password = elementAsString(reader);
break;
}
- case USERNAME : {
+ case USER_NAME : {
userName = elementAsString(reader);
break;
}
@@ -659,7 +659,7 @@
switch (attribute)
{
case NO_RECOVERY : {
- noRecovery = attributeAsBoolean(reader, attribute.getLocalName(), false);
+ noRecovery = attributeAsBoolean(reader, attribute.getLocalName(), Boolean.FALSE);
break;
}
default :
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonAdminObjectImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonAdminObjectImpl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonAdminObjectImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -217,14 +217,14 @@
sb.append(" ").append(CommonAdminObject.Attribute.CLASS_NAME).append("=\"").append(className).append("\"");
if (jndiName != null)
- sb.append(" ").append(CommonAdminObject.Attribute.JNDINAME).append("=\"").append(jndiName).append("\"");
+ sb.append(" ").append(CommonAdminObject.Attribute.JNDI_NAME).append("=\"").append(jndiName).append("\"");
if (enabled != null)
sb.append(" ").append(CommonAdminObject.Attribute.ENABLED).append("=\"").append(enabled).append("\"");
if (useJavaContext != null)
{
- sb.append(" ").append(CommonAdminObject.Attribute.USEJAVACONTEXT);
+ sb.append(" ").append(CommonAdminObject.Attribute.USE_JAVA_CONTEXT);
sb.append("=\"").append(useJavaContext).append("\"");
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -369,14 +369,14 @@
sb.append(" ").append(CommonConnDef.Attribute.CLASS_NAME).append("=\"").append(className).append("\"");
if (jndiName != null)
- sb.append(" ").append(CommonConnDef.Attribute.JNDINAME).append("=\"").append(jndiName).append("\"");
+ sb.append(" ").append(CommonConnDef.Attribute.JNDI_NAME).append("=\"").append(jndiName).append("\"");
if (enabled != null)
sb.append(" ").append(CommonConnDef.Attribute.ENABLED).append("=\"").append(enabled).append("\"");
if (useJavaContext != null)
{
- sb.append(" ").append(CommonConnDef.Attribute.USEJAVACONTEXT);
+ sb.append(" ").append(CommonConnDef.Attribute.USE_JAVA_CONTEXT);
sb.append("=\"").append(useJavaContext).append("\"");
}
@@ -384,7 +384,7 @@
sb.append(" ").append(CommonConnDef.Attribute.POOL_NAME).append("=\"").append(poolName).append("\"");
if (useCcm != null)
- sb.append(" ").append(CommonConnDef.Attribute.USECCM).append("=\"").append(useCcm).append("\"");
+ sb.append(" ").append(CommonConnDef.Attribute.USE_CCM).append("=\"").append(useCcm).append("\"");
sb.append(">");
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-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -77,15 +77,15 @@
Recovery recovery = null;
//attributes reading
- boolean useJavaContext = true;
+ Boolean useJavaContext = Boolean.TRUE;
String className = null;
- boolean enabled = true;
+ Boolean enabled = Boolean.TRUE;
String jndiName = null;
String poolName = null;
- boolean useCcm = true;
+ Boolean useCcm = Boolean.TRUE;
int attributeSize = reader.getAttributeCount();
- boolean isXa = false;
+ Boolean isXa = Boolean.FALSE;
for (int i = 0; i < attributeSize; i++)
{
@@ -96,7 +96,7 @@
enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
- case JNDINAME : {
+ case JNDI_NAME : {
jndiName = attributeAsString(reader, attribute.getLocalName());
break;
}
@@ -108,11 +108,11 @@
poolName = attributeAsString(reader, attribute.getLocalName());
break;
}
- case USEJAVACONTEXT : {
+ case USE_JAVA_CONTEXT : {
useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
- case USECCM : {
+ case USE_CCM : {
useCcm = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
@@ -191,8 +191,8 @@
private CommonValidation parseValidation(XMLStreamReader reader) throws XMLStreamException, ParserException
{
- boolean useFastFail = false;
- boolean backgroundValidation = false;
+ Boolean useFastFail = Boolean.FALSE;
+ Boolean backgroundValidation = Boolean.FALSE;
Long backgroundValidationMillis = null;
while (reader.hasNext())
@@ -217,15 +217,15 @@
case START_ELEMENT : {
switch (CommonValidation.Tag.forName(reader.getLocalName()))
{
- case BACKGROUNDVALIDATIONMILLIS : {
+ case BACKGROUND_VALIDATION_MILLIS : {
backgroundValidationMillis = elementAsLong(reader);
break;
}
- case BACKGROUNDVALIDATION : {
+ case BACKGROUND_VALIDATION : {
backgroundValidation = elementAsBoolean(reader);
break;
}
- case USEFASTFAIL : {
+ case USE_FAST_FAIL : {
useFastFail = elementAsBoolean(reader);
break;
}
@@ -239,7 +239,7 @@
throw new ParserException(bundle.unexpectedEndOfDocument());
}
- private CommonTimeOut parseTimeOut(XMLStreamReader reader, boolean isXa) throws XMLStreamException,
+ private CommonTimeOut parseTimeOut(XMLStreamReader reader, Boolean isXa) throws XMLStreamException,
ParserException, ValidateException
{
Long blockingTimeoutMillis = null;
@@ -271,24 +271,24 @@
case START_ELEMENT : {
switch (CommonTimeOut.Tag.forName(reader.getLocalName()))
{
- case ALLOCATIONRETRYWAITMILLIS : {
+ case ALLOCATION_RETRY_WAIT_MILLIS : {
allocationRetryWaitMillis = elementAsLong(reader);
break;
}
- case ALLOCATIONRETRY : {
+ case ALLOCATION_RETRY : {
allocationRetry = elementAsInteger(reader);
break;
}
- case BLOCKINGTIMEOUTMILLIS : {
+ case BLOCKING_TIMEOUT_MILLIS : {
blockingTimeoutMillis = elementAsLong(reader);
break;
}
- case IDLETIMEOUTMINUTES : {
+ case IDLE_TIMEOUT_MINUTES : {
idleTimeoutMinutes = elementAsLong(reader);
break;
}
- case XARESOURCETIMEOUT : {
- if (!isXa)
+ case XA_RESOURCE_TIMEOUT : {
+ if (isXa != null && Boolean.FALSE.equals(isXa))
throw new ParserException(bundle.unsupportedElement(reader.getLocalName()));
xaResourceTimeout = elementAsInteger(reader);
break;
@@ -318,9 +318,9 @@
HashMap<String, String> configProperties = new HashMap<String, String>();
//attributes reading
- boolean useJavaContext = true;
+ Boolean useJavaContext = Boolean.TRUE;
String className = null;
- boolean enabled = true;
+ Boolean enabled = Boolean.TRUE;
String jndiName = null;
String poolName = null;
@@ -336,7 +336,7 @@
enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
- case JNDINAME : {
+ case JNDI_NAME : {
jndiName = attributeAsString(reader, attribute.getLocalName());
break;
}
@@ -344,7 +344,7 @@
className = attributeAsString(reader, attribute.getLocalName());
break;
}
- case USEJAVACONTEXT : {
+ case USE_JAVA_CONTEXT : {
useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
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 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -204,37 +204,37 @@
if (blockingTimeoutMillis != null)
{
- sb.append("<").append(CommonTimeOut.Tag.BLOCKINGTIMEOUTMILLIS).append(">");
+ sb.append("<").append(CommonTimeOut.Tag.BLOCKING_TIMEOUT_MILLIS).append(">");
sb.append(blockingTimeoutMillis);
- sb.append("</").append(CommonTimeOut.Tag.BLOCKINGTIMEOUTMILLIS).append(">");
+ sb.append("</").append(CommonTimeOut.Tag.BLOCKING_TIMEOUT_MILLIS).append(">");
}
if (idleTimeoutMinutes != null)
{
- sb.append("<").append(CommonTimeOut.Tag.IDLETIMEOUTMINUTES).append(">");
+ sb.append("<").append(CommonTimeOut.Tag.IDLE_TIMEOUT_MINUTES).append(">");
sb.append(idleTimeoutMinutes);
- sb.append("</").append(CommonTimeOut.Tag.IDLETIMEOUTMINUTES).append(">");
+ sb.append("</").append(CommonTimeOut.Tag.IDLE_TIMEOUT_MINUTES).append(">");
}
if (allocationRetry != null)
{
- sb.append("<").append(CommonTimeOut.Tag.ALLOCATIONRETRY).append(">");
+ sb.append("<").append(CommonTimeOut.Tag.ALLOCATION_RETRY).append(">");
sb.append(allocationRetry);
- sb.append("</").append(CommonTimeOut.Tag.ALLOCATIONRETRY).append(">");
+ sb.append("</").append(CommonTimeOut.Tag.ALLOCATION_RETRY).append(">");
}
if (allocationRetryWaitMillis != null)
{
- sb.append("<").append(CommonTimeOut.Tag.ALLOCATIONRETRYWAITMILLIS).append(">");
+ sb.append("<").append(CommonTimeOut.Tag.ALLOCATION_RETRY_WAIT_MILLIS).append(">");
sb.append(allocationRetryWaitMillis);
- sb.append("</").append(CommonTimeOut.Tag.ALLOCATIONRETRYWAITMILLIS).append(">");
+ sb.append("</").append(CommonTimeOut.Tag.ALLOCATION_RETRY_WAIT_MILLIS).append(">");
}
if (xaResourceTimeout != null)
{
- sb.append("<").append(CommonTimeOut.Tag.XARESOURCETIMEOUT).append(">");
+ sb.append("<").append(CommonTimeOut.Tag.XA_RESOURCE_TIMEOUT).append(">");
sb.append(xaResourceTimeout);
- sb.append("</").append(CommonTimeOut.Tag.XARESOURCETIMEOUT).append(">");
+ sb.append("</").append(CommonTimeOut.Tag.XA_RESOURCE_TIMEOUT).append(">");
}
sb.append("</timeout>");
@@ -245,18 +245,18 @@
private void partialCommonValidate() throws ValidateException
{
if (this.allocationRetry != null && this.allocationRetry < 0)
- throw new ValidateException(bundle.invalidNegative(Tag.ALLOCATIONRETRY.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(Tag.ALLOCATION_RETRY.getLocalName()));
if (this.blockingTimeoutMillis != null && this.blockingTimeoutMillis < 0)
- throw new ValidateException(bundle.invalidNegative(Tag.BLOCKINGTIMEOUTMILLIS.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(Tag.BLOCKING_TIMEOUT_MILLIS.getLocalName()));
if (this.allocationRetryWaitMillis != null && this.allocationRetryWaitMillis < 0)
- throw new ValidateException(bundle.invalidNegative(Tag.ALLOCATIONRETRYWAITMILLIS.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(Tag.ALLOCATION_RETRY_WAIT_MILLIS.getLocalName()));
if (this.idleTimeoutMinutes != null && this.idleTimeoutMinutes < 0)
- throw new ValidateException(bundle.invalidNegative(Tag.IDLETIMEOUTMINUTES.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(Tag.IDLE_TIMEOUT_MINUTES.getLocalName()));
if (this.xaResourceTimeout != null && this.xaResourceTimeout < 0)
- throw new ValidateException(bundle.invalidNegative(Tag.XARESOURCETIMEOUT.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(Tag.XA_RESOURCE_TIMEOUT.getLocalName()));
}
}
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-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -147,23 +147,23 @@
if (backgroundValidation != null)
{
- sb.append("<").append(CommonValidation.Tag.BACKGROUNDVALIDATION).append(">");
+ sb.append("<").append(CommonValidation.Tag.BACKGROUND_VALIDATION).append(">");
sb.append(backgroundValidation);
- sb.append("</").append(CommonValidation.Tag.BACKGROUNDVALIDATION).append(">");
+ sb.append("</").append(CommonValidation.Tag.BACKGROUND_VALIDATION).append(">");
}
if (backgroundValidationMillis != null)
{
- sb.append("<").append(CommonValidation.Tag.BACKGROUNDVALIDATIONMILLIS).append(">");
+ sb.append("<").append(CommonValidation.Tag.BACKGROUND_VALIDATION_MILLIS).append(">");
sb.append(backgroundValidationMillis);
- sb.append("</").append(CommonValidation.Tag.BACKGROUNDVALIDATIONMILLIS).append(">");
+ sb.append("</").append(CommonValidation.Tag.BACKGROUND_VALIDATION_MILLIS).append(">");
}
if (useFastFail != null)
{
- sb.append("<").append(CommonValidation.Tag.USEFASTFAIL).append(">");
+ sb.append("<").append(CommonValidation.Tag.USE_FAST_FAIL).append(">");
sb.append(useFastFail);
- sb.append("</").append(CommonValidation.Tag.USEFASTFAIL).append(">");
+ sb.append("</").append(CommonValidation.Tag.USE_FAST_FAIL).append(">");
}
sb.append("</validation>");
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -241,9 +241,9 @@
if (isSameRmOverride != null)
{
- sb.append("<").append(CommonXaPool.Tag.ISSAMERMOVERRIDEVALUE).append(">");
+ sb.append("<").append(CommonXaPool.Tag.IS_SAME_RM_OVERRIDE).append(">");
sb.append(isSameRmOverride);
- sb.append("</").append(CommonXaPool.Tag.ISSAMERMOVERRIDEVALUE).append(">");
+ sb.append("</").append(CommonXaPool.Tag.IS_SAME_RM_OVERRIDE).append(">");
}
if (interleaving != null)
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 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -107,12 +107,12 @@
/**
* spy
*/
- protected final boolean spy;
+ protected final Boolean spy;
/**
* use-ccm
*/
- protected final boolean useCcm;
+ protected final Boolean useCcm;
/**
* Create a new DataSourceAbstractImpl.
@@ -135,7 +135,7 @@
protected DataSourceAbstractImpl(TransactionIsolation transactionIsolation, TimeOut timeOut,
DsSecurity security, Statement statement, Validation validation, String urlDelimiter,
String urlSelectorStrategyClassName, Boolean useJavaContext, String poolName, Boolean enabled, String jndiName,
- boolean spy, boolean useCcm)
+ Boolean spy, Boolean useCcm)
throws ValidateException
{
super();
@@ -258,7 +258,7 @@
*/
@Override
- public final boolean isSpy()
+ public final Boolean isSpy()
{
return spy;
}
@@ -270,7 +270,7 @@
*/
@Override
- public final boolean isUseCcm()
+ public final Boolean isUseCcm()
{
return useCcm;
}
@@ -284,7 +284,7 @@
protected void partialCommonValidation() throws ValidateException
{
if (this.jndiName == null)
- throw new ValidateException(bundle.requiredAttributeMissing(DataSource.Attribute.JNDINAME.getLocalName(),
+ throw new ValidateException(bundle.requiredAttributeMissing(DataSource.Attribute.JNDI_NAME.getLocalName(),
this.getClass().getCanonicalName()));
if (this.poolName == null)
throw new ValidateException(bundle.requiredAttributeMissing(DataSource.Attribute.POOL_NAME.getLocalName(),
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 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -53,7 +53,7 @@
/** The bundle */
private static CommonBundle bundle = Messages.getBundle(CommonBundle.class);
- private final boolean jta;
+ private final Boolean jta;
private final String connectionUrl;
@@ -99,8 +99,8 @@
TransactionIsolation transactionIsolation, Map<String, String> connectionProperties,
TimeOut timeOut, DsSecurity security, Statement statement, Validation validation,
String urlDelimiter, String urlSelectorStrategyClassName, String newConnectionSql,
- boolean useJavaContext, String poolName, boolean enabled, String jndiName,
- boolean spy, boolean useccm, boolean jta, CommonPool pool)
+ Boolean useJavaContext, String poolName, Boolean enabled, String jndiName,
+ Boolean spy, Boolean useccm, Boolean jta, CommonPool pool)
throws ValidateException
{
super(transactionIsolation, timeOut, security, statement, validation, urlDelimiter,
@@ -127,7 +127,7 @@
/**
* {@inheritDoc}
*/
- public boolean isJTA()
+ public Boolean isJTA()
{
return jta;
}
@@ -327,7 +327,7 @@
sb.append("<datasource");
if (jndiName != null)
- sb.append(" ").append(DataSource.Attribute.JNDINAME).append("=\"").append(jndiName).append("\"");
+ sb.append(" ").append(DataSource.Attribute.JNDI_NAME).append("=\"").append(jndiName).append("\"");
if (poolName != null)
sb.append(" ").append(DataSource.Attribute.POOL_NAME).append("=\"").append(poolName).append("\"");
@@ -336,7 +336,10 @@
sb.append(" ").append(DataSource.Attribute.ENABLED).append("=\"").append(enabled).append("\"");
if (useJavaContext != null)
- sb.append(" ").append(DataSource.Attribute.USEJAVACONTEXT).append("=\"").append(useJavaContext).append("\"");
+ {
+ sb.append(" ").append(DataSource.Attribute.USE_JAVA_CONTEXT);
+ sb.append("=\"").append(useJavaContext).append("\"");
+ }
if (spy)
sb.append(" ").append(DataSource.Attribute.SPY).append("=\"").append(spy).append("\"");
@@ -351,23 +354,23 @@
if (connectionUrl != null)
{
- sb.append("<").append(DataSource.Tag.CONNECTIONURL).append(">");
+ sb.append("<").append(DataSource.Tag.CONNECTION_URL).append(">");
sb.append(connectionUrl);
- sb.append("</").append(DataSource.Tag.CONNECTIONURL).append(">");
+ sb.append("</").append(DataSource.Tag.CONNECTION_URL).append(">");
}
if (driverClass != null)
{
- sb.append("<").append(DataSource.Tag.DRIVERCLASS).append(">");
+ sb.append("<").append(DataSource.Tag.DRIVER_CLASS).append(">");
sb.append(driverClass);
- sb.append("</").append(DataSource.Tag.DRIVERCLASS).append(">");
+ sb.append("</").append(DataSource.Tag.DRIVER_CLASS).append(">");
}
if (dataSourceClass != null)
{
- sb.append("<").append(DataSource.Tag.DATASOURCECLASS).append(">");
+ sb.append("<").append(DataSource.Tag.DATASOURCE_CLASS).append(">");
sb.append(dataSourceClass);
- sb.append("</").append(DataSource.Tag.DATASOURCECLASS).append(">");
+ sb.append("</").append(DataSource.Tag.DATASOURCE_CLASS).append(">");
}
if (driver != null)
@@ -383,39 +386,39 @@
while (it.hasNext())
{
Map.Entry<String, String> entry = it.next();
- sb.append("<").append(DataSource.Tag.CONNECTIONPROPERTY);
+ sb.append("<").append(DataSource.Tag.CONNECTION_PROPERTY);
sb.append(" name=\"").append(entry.getKey()).append("\">");
sb.append(entry.getValue());
- sb.append("</").append(DataSource.Tag.CONNECTIONPROPERTY).append(">");
+ sb.append("</").append(DataSource.Tag.CONNECTION_PROPERTY).append(">");
}
}
if (newConnectionSql != null)
{
- sb.append("<").append(DataSource.Tag.NEWCONNECTIONSQL).append(">");
+ sb.append("<").append(DataSource.Tag.NEW_CONNECTION_SQL).append(">");
sb.append(newConnectionSql);
- sb.append("</").append(DataSource.Tag.NEWCONNECTIONSQL).append(">");
+ sb.append("</").append(DataSource.Tag.NEW_CONNECTION_SQL).append(">");
}
if (transactionIsolation != null)
{
- sb.append("<").append(DataSource.Tag.TRANSACTIONISOLATION).append(">");
+ sb.append("<").append(DataSource.Tag.TRANSACTION_ISOLATION).append(">");
sb.append(transactionIsolation);
- sb.append("</").append(DataSource.Tag.TRANSACTIONISOLATION).append(">");
+ sb.append("</").append(DataSource.Tag.TRANSACTION_ISOLATION).append(">");
}
if (urlDelimiter != null)
{
- sb.append("<").append(DataSource.Tag.URLDELIMITER).append(">");
+ sb.append("<").append(DataSource.Tag.URL_DELIMITER).append(">");
sb.append(urlDelimiter);
- sb.append("</").append(DataSource.Tag.URLDELIMITER).append(">");
+ sb.append("</").append(DataSource.Tag.URL_DELIMITER).append(">");
}
if (urlSelectorStrategyClassName != null)
{
- sb.append("<").append(DataSource.Tag.URLSELECTORSTRATEGYCLASSNAME).append(">");
+ sb.append("<").append(DataSource.Tag.URL_SELECTOR_STRATEGY_CLASS_NAME).append(">");
sb.append(urlSelectorStrategyClassName);
- sb.append("</").append(DataSource.Tag.URLSELECTORSTRATEGYCLASSNAME).append(">");
+ sb.append("</").append(DataSource.Tag.URL_SELECTOR_STRATEGY_CLASS_NAME).append(">");
}
if (pool != null)
@@ -442,13 +445,13 @@
public void validate() throws ValidateException
{
if (this.driverClass != null && (this.connectionUrl == null || this.connectionUrl.trim().length() == 0))
- throw new ValidateException(bundle.requiredElementMissing(Tag.CONNECTIONURL.getLocalName(),
+ throw new ValidateException(bundle.requiredElementMissing(Tag.CONNECTION_URL.getLocalName(),
this.getClass().getCanonicalName()));
if ((this.driverClass == null || this.driverClass.trim().length() == 0) &&
(this.dataSourceClass == null || this.dataSourceClass.trim().length() == 0) &&
(this.driver == null || this.driver.trim().length() == 0))
- throw new ValidateException(bundle.requiredElementMissing(Tag.DRIVERCLASS.getLocalName(),
+ throw new ValidateException(bundle.requiredElementMissing(Tag.DRIVER_CLASS.getLocalName(),
this.getClass().getCanonicalName()));
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DriverImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DriverImpl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DriverImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -189,23 +189,23 @@
if (driverClass != null)
{
- sb.append("<").append(Driver.Tag.DRIVERCLASS).append(">");
+ sb.append("<").append(Driver.Tag.DRIVER_CLASS).append(">");
sb.append(driverClass);
- sb.append("</").append(Driver.Tag.DRIVERCLASS).append(">");
+ sb.append("</").append(Driver.Tag.DRIVER_CLASS).append(">");
}
if (dataSourceClass != null)
{
- sb.append("<").append(Driver.Tag.DATASOURCECLASS).append(">");
+ sb.append("<").append(Driver.Tag.DATASOURCE_CLASS).append(">");
sb.append(dataSourceClass);
- sb.append("</").append(Driver.Tag.DATASOURCECLASS).append(">");
+ sb.append("</").append(Driver.Tag.DATASOURCE_CLASS).append(">");
}
if (xaDataSourceClass != null)
{
- sb.append("<").append(Driver.Tag.XADATASOURCECLASS).append(">");
+ sb.append("<").append(Driver.Tag.XA_DATASOURCE_CLASS).append(">");
sb.append(xaDataSourceClass);
- sb.append("</").append(Driver.Tag.XADATASOURCECLASS).append(">");
+ sb.append("</").append(Driver.Tag.XA_DATASOURCE_CLASS).append(">");
}
sb.append("</driver>");
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-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -252,15 +252,15 @@
case START_ELEMENT : {
switch (Driver.Tag.forName(reader.getLocalName()))
{
- case DATASOURCECLASS : {
+ case DATASOURCE_CLASS : {
dataSourceClass = elementAsString(reader);
break;
}
- case XADATASOURCECLASS : {
+ case XA_DATASOURCE_CLASS : {
xaDataSourceClass = elementAsString(reader);
break;
}
- case DRIVERCLASS : {
+ case DRIVER_CLASS : {
driverClass = elementAsString(reader);
break;
}
@@ -294,12 +294,12 @@
//attributes reading
- boolean useJavaContext = true;
+ Boolean useJavaContext = Boolean.TRUE;
String poolName = null;
- boolean enabled = true;
+ Boolean enabled = Boolean.TRUE;
String jndiName = null;
- boolean spy = false;
- boolean useCcm = true;
+ Boolean spy = Boolean.FALSE;
+ Boolean useCcm = Boolean.TRUE;
for (XaDataSource.Attribute attribute : XaDataSource.Attribute.values())
{
@@ -309,7 +309,7 @@
enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
- case JNDINAME : {
+ case JNDI_NAME : {
jndiName = attributeAsString(reader, attribute.getLocalName());
break;
}
@@ -317,7 +317,7 @@
poolName = attributeAsString(reader, attribute.getLocalName());
break;
}
- case USEJAVACONTEXT : {
+ case USE_JAVA_CONTEXT : {
useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
@@ -361,11 +361,11 @@
case START_ELEMENT : {
switch (XaDataSource.Tag.forName(reader.getLocalName()))
{
- case XADATASOURCEPROPERTY : {
+ case XA_DATASOURCE_PROPERTY : {
xaDataSourceProperty.put(attributeAsString(reader, "name"), elementAsString(reader));
break;
}
- case XADATASOURCECLASS : {
+ case XA_DATASOURCE_CLASS : {
xaDataSourceClass = elementAsString(reader);
break;
}
@@ -377,19 +377,19 @@
xaPool = parseXaPool(reader);
break;
}
- case NEWCONNECTIONSQL : {
+ case NEW_CONNECTION_SQL : {
newConnectionSql = elementAsString(reader);
break;
}
- case URLDELIMITER : {
+ case URL_DELIMITER : {
urlDelimiter = elementAsString(reader);
break;
}
- case URLSELECTORSTRATEGYCLASSNAME : {
+ case URL_SELECTOR_STRATEGY_CLASS_NAME : {
urlSelectorStrategyClassName = elementAsString(reader);
break;
}
- case TRANSACTIONISOLATION : {
+ case TRANSACTION_ISOLATION : {
transactionIsolation = TransactionIsolation.valueOf(elementAsString(reader));
break;
}
@@ -459,7 +459,7 @@
password = elementAsString(reader);
break;
}
- case USERNAME : {
+ case USER_NAME : {
userName = elementAsString(reader);
break;
}
@@ -500,13 +500,13 @@
CommonPool pool = null;
//attributes reading
- boolean useJavaContext = true;
+ Boolean useJavaContext = Boolean.TRUE;
String poolName = null;
- boolean enabled = true;
+ Boolean enabled = Boolean.TRUE;
String jndiName = null;
- boolean spy = false;
- boolean useCcm = true;
- boolean jta = true;
+ Boolean spy = Boolean.FALSE;
+ Boolean useCcm = Boolean.TRUE;
+ Boolean jta = Boolean.TRUE;
for (DataSource.Attribute attribute : DataSource.Attribute.values())
{
@@ -516,7 +516,7 @@
enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
- case JNDINAME : {
+ case JNDI_NAME : {
jndiName = attributeAsString(reader, attribute.getLocalName());
break;
}
@@ -524,7 +524,7 @@
poolName = attributeAsString(reader, attribute.getLocalName());
break;
}
- case USEJAVACONTEXT : {
+ case USE_JAVA_CONTEXT : {
useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
@@ -572,19 +572,19 @@
case START_ELEMENT : {
switch (DataSource.Tag.forName(reader.getLocalName()))
{
- case CONNECTIONPROPERTY : {
+ case CONNECTION_PROPERTY : {
connectionProperties.put(attributeAsString(reader, "name"), elementAsString(reader));
break;
}
- case CONNECTIONURL : {
+ case CONNECTION_URL : {
connectionUrl = elementAsString(reader);
break;
}
- case DRIVERCLASS : {
+ case DRIVER_CLASS : {
driverClass = elementAsString(reader);
break;
}
- case DATASOURCECLASS : {
+ case DATASOURCE_CLASS : {
dataSourceClass = elementAsString(reader);
break;
}
@@ -596,19 +596,19 @@
pool = parsePool(reader);
break;
}
- case NEWCONNECTIONSQL : {
+ case NEW_CONNECTION_SQL : {
newConnectionSql = elementAsString(reader);
break;
}
- case URLDELIMITER : {
+ case URL_DELIMITER : {
urlDelimiter = elementAsString(reader);
break;
}
- case URLSELECTORSTRATEGYCLASSNAME : {
+ case URL_SELECTOR_STRATEGY_CLASS_NAME : {
urlSelectorStrategyClassName = elementAsString(reader);
break;
}
- case TRANSACTIONISOLATION : {
+ case TRANSACTION_ISOLATION : {
transactionIsolation = TransactionIsolation.valueOf(elementAsString(reader));
break;
}
@@ -641,11 +641,11 @@
private Validation parseValidationSetting(XMLStreamReader reader) throws XMLStreamException, ParserException,
ValidateException
{
- boolean validateOnMatch = false;
- boolean useFastFail = false;
+ Boolean validateOnMatch = Boolean.FALSE;
+ Boolean useFastFail = Boolean.FALSE;
Long backgroundValidationMillis = null;
Extension staleConnectionChecker = null;
- boolean backgroundValidation = false;
+ Boolean backgroundValidation = Boolean.FALSE;
String checkValidConnectionSql = null;
Extension validConnectionChecker = null;
Extension exceptionSorter = null;
@@ -676,35 +676,35 @@
Validation.Tag currTag = Validation.Tag.forName(reader.getLocalName());
switch (currTag)
{
- case BACKGROUNDVALIDATION : {
+ case BACKGROUND_VALIDATION : {
backgroundValidation = elementAsBoolean(reader);
break;
}
- case BACKGROUNDVALIDATIONMILLIS : {
+ case BACKGROUND_VALIDATION_MILLIS : {
backgroundValidationMillis = elementAsLong(reader);
break;
}
- case CHECKVALIDCONNECTIONSQL : {
+ case CHECK_VALID_CONNECTION_SQL : {
checkValidConnectionSql = elementAsString(reader);
break;
}
- case EXCEPTIONSORTER : {
+ case EXCEPTION_SORTER : {
exceptionSorter = parseExtension(reader, currTag.getLocalName());
break;
}
- case STALECONNECTIONCHECKER : {
+ case STALE_CONNECTION_CHECKER : {
staleConnectionChecker = parseExtension(reader, currTag.getLocalName());
break;
}
- case USEFASTFAIL : {
+ case USE_FAST_FAIL : {
useFastFail = elementAsBoolean(reader);
break;
}
- case VALIDATEONMATCH : {
+ case VALIDATE_ON_MATCH : {
validateOnMatch = elementAsBoolean(reader);
break;
}
- case VALIDCONNECTIONCHECKER : {
+ case VALID_CONNECTION_CHECKER : {
validConnectionChecker = parseExtension(reader, currTag.getLocalName());
break;
}
@@ -724,7 +724,7 @@
Long blockingTimeoutMillis = null;
Long idleTimeoutMinutes = null;
- boolean setTxQuertTimeout = false;
+ Boolean setTxQuertTimeout = Boolean.FALSE;
Long queryTimeout = null;
Integer allocationRetry = null;
Long allocationRetryWaitMillis = null;
@@ -755,35 +755,35 @@
case START_ELEMENT : {
switch (TimeOut.Tag.forName(reader.getLocalName()))
{
- case ALLOCATIONRETRY : {
+ case ALLOCATION_RETRY : {
allocationRetry = elementAsInteger(reader);
break;
}
- case ALLOCATIONRETRYWAITMILLIS : {
+ case ALLOCATION_RETRY_WAIT_MILLIS : {
allocationRetryWaitMillis = elementAsLong(reader);
break;
}
- case BLOCKINGTIMEOUTMILLIS : {
+ case BLOCKING_TIMEOUT_MILLIS : {
blockingTimeoutMillis = elementAsLong(reader);
break;
}
- case IDLETIMEOUTMINUTES : {
+ case IDLE_TIMEOUT_MINUTES : {
idleTimeoutMinutes = elementAsLong(reader);
break;
}
- case QUERYTIMEOUT : {
+ case QUERY_TIMEOUT : {
queryTimeout = elementAsLong(reader);
break;
}
- case SETTXQUERYTIMEOUT : {
+ case SET_TX_QUERY_TIMEOUT : {
setTxQuertTimeout = elementAsBoolean(reader);
break;
}
- case USETRYLOCK : {
+ case USE_TRY_LOCK : {
useTryLock = elementAsLong(reader);
break;
}
- case XARESOURCETIMEOUT : {
+ case XA_RESOURCE_TIMEOUT : {
xaResourceTimeout = elementAsInteger(reader);
break;
}
@@ -802,7 +802,7 @@
{
Long preparedStatementsCacheSize = null;
- boolean sharePreparedStatements = false;
+ Boolean sharePreparedStatements = Boolean.FALSE;
TrackStatementsEnum trackStatements = null;
while (reader.hasNext())
@@ -827,17 +827,17 @@
case START_ELEMENT : {
switch (Statement.Tag.forName(reader.getLocalName()))
{
- case PREPAREDSTATEMENTCACHESIZE : {
+ case PREPARED_STATEMENT_CACHE_SIZE : {
preparedStatementsCacheSize = elementAsLong(reader);
break;
}
- case TRACKSTATEMENTS : {
+ case TRACK_STATEMENTS : {
String elementString = elementAsString(reader);
trackStatements = TrackStatementsEnum.valueOf(elementString == null ? "FALSE" : elementString
.toUpperCase(Locale.US));
break;
}
- case SHAREPREPAREDSTATEMENTS : {
+ case SHARE_PREPARED_STATEMENTS : {
sharePreparedStatements = elementAsBoolean(reader);
break;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -110,9 +110,9 @@
if (getUserName() != null)
{
- sb.append("<").append(DsSecurity.Tag.USERNAME).append(">");
+ sb.append("<").append(DsSecurity.Tag.USER_NAME).append(">");
sb.append(getUserName());
- sb.append("</").append(DsSecurity.Tag.USERNAME).append(">");
+ sb.append("</").append(DsSecurity.Tag.USER_NAME).append(">");
sb.append("<").append(DsSecurity.Tag.PASSWORD).append(">");
sb.append(getPassword());
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 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -148,21 +148,21 @@
if (trackStatements != null)
{
- sb.append("<").append(Statement.Tag.TRACKSTATEMENTS).append(">");
+ sb.append("<").append(Statement.Tag.TRACK_STATEMENTS).append(">");
sb.append(trackStatements);
- sb.append("</").append(Statement.Tag.TRACKSTATEMENTS).append(">");
+ sb.append("</").append(Statement.Tag.TRACK_STATEMENTS).append(">");
}
if (preparedStatementsCacheSize != null)
{
- sb.append("<").append(Statement.Tag.PREPAREDSTATEMENTCACHESIZE).append(">");
+ sb.append("<").append(Statement.Tag.PREPARED_STATEMENT_CACHE_SIZE).append(">");
sb.append(preparedStatementsCacheSize);
- sb.append("</").append(Statement.Tag.PREPAREDSTATEMENTCACHESIZE).append(">");
+ sb.append("</").append(Statement.Tag.PREPARED_STATEMENT_CACHE_SIZE).append(">");
}
if (sharePreparedStatements != null && Boolean.TRUE.equals(sharePreparedStatements))
{
- sb.append("<").append(Statement.Tag.SHAREPREPAREDSTATEMENTS).append("/>");
+ sb.append("<").append(Statement.Tag.SHARE_PREPARED_STATEMENTS).append("/>");
}
sb.append("</statement>");
@@ -174,7 +174,7 @@
public void validate() throws ValidateException
{
if (this.preparedStatementsCacheSize != null && this.preparedStatementsCacheSize < 0)
- throw new ValidateException(bundle.invalidNegative(Tag.PREPAREDSTATEMENTCACHESIZE.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(Tag.PREPARED_STATEMENT_CACHE_SIZE.getLocalName()));
}
}
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 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -160,56 +160,56 @@
if (blockingTimeoutMillis != null)
{
- sb.append("<").append(TimeOut.Tag.BLOCKINGTIMEOUTMILLIS).append(">");
+ sb.append("<").append(TimeOut.Tag.BLOCKING_TIMEOUT_MILLIS).append(">");
sb.append(blockingTimeoutMillis);
- sb.append("</").append(TimeOut.Tag.BLOCKINGTIMEOUTMILLIS).append(">");
+ sb.append("</").append(TimeOut.Tag.BLOCKING_TIMEOUT_MILLIS).append(">");
}
if (idleTimeoutMinutes != null)
{
- sb.append("<").append(TimeOut.Tag.IDLETIMEOUTMINUTES).append(">");
+ sb.append("<").append(TimeOut.Tag.IDLE_TIMEOUT_MINUTES).append(">");
sb.append(idleTimeoutMinutes);
- sb.append("</").append(TimeOut.Tag.IDLETIMEOUTMINUTES).append(">");
+ sb.append("</").append(TimeOut.Tag.IDLE_TIMEOUT_MINUTES).append(">");
}
if (setTxQueryTimeout != null && Boolean.TRUE.equals(setTxQueryTimeout))
{
- sb.append("<").append(TimeOut.Tag.SETTXQUERYTIMEOUT).append("/>");
+ sb.append("<").append(TimeOut.Tag.SET_TX_QUERY_TIMEOUT).append("/>");
}
if (queryTimeout != null)
{
- sb.append("<").append(TimeOut.Tag.QUERYTIMEOUT).append(">");
+ sb.append("<").append(TimeOut.Tag.QUERY_TIMEOUT).append(">");
sb.append(queryTimeout);
- sb.append("</").append(TimeOut.Tag.QUERYTIMEOUT).append(">");
+ sb.append("</").append(TimeOut.Tag.QUERY_TIMEOUT).append(">");
}
if (useTryLock != null)
{
- sb.append("<").append(TimeOut.Tag.USETRYLOCK).append(">");
+ sb.append("<").append(TimeOut.Tag.USE_TRY_LOCK).append(">");
sb.append(useTryLock);
- sb.append("</").append(TimeOut.Tag.USETRYLOCK).append(">");
+ sb.append("</").append(TimeOut.Tag.USE_TRY_LOCK).append(">");
}
if (allocationRetry != null)
{
- sb.append("<").append(TimeOut.Tag.ALLOCATIONRETRY).append(">");
+ sb.append("<").append(TimeOut.Tag.ALLOCATION_RETRY).append(">");
sb.append(allocationRetry);
- sb.append("</").append(TimeOut.Tag.ALLOCATIONRETRY).append(">");
+ sb.append("</").append(TimeOut.Tag.ALLOCATION_RETRY).append(">");
}
if (allocationRetryWaitMillis != null)
{
- sb.append("<").append(TimeOut.Tag.ALLOCATIONRETRYWAITMILLIS).append(">");
+ sb.append("<").append(TimeOut.Tag.ALLOCATION_RETRY_WAIT_MILLIS).append(">");
sb.append(allocationRetryWaitMillis);
- sb.append("</").append(TimeOut.Tag.ALLOCATIONRETRYWAITMILLIS).append(">");
+ sb.append("</").append(TimeOut.Tag.ALLOCATION_RETRY_WAIT_MILLIS).append(">");
}
if (xaResourceTimeout != null)
{
- sb.append("<").append(TimeOut.Tag.XARESOURCETIMEOUT).append(">");
+ sb.append("<").append(TimeOut.Tag.XA_RESOURCE_TIMEOUT).append(">");
sb.append(xaResourceTimeout);
- sb.append("</").append(TimeOut.Tag.XARESOURCETIMEOUT).append(">");
+ sb.append("</").append(TimeOut.Tag.XA_RESOURCE_TIMEOUT).append(">");
}
sb.append("</timeout>");
@@ -221,9 +221,9 @@
public void validate() throws ValidateException
{
if (this.queryTimeout != null && this.queryTimeout < 0)
- throw new ValidateException(bundle.invalidNegative(TimeOut.Tag.QUERYTIMEOUT.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(TimeOut.Tag.QUERY_TIMEOUT.getLocalName()));
if (this.useTryLock != null && this.useTryLock < 0)
- throw new ValidateException(bundle.invalidNegative(TimeOut.Tag.USETRYLOCK.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(TimeOut.Tag.USE_TRY_LOCK.getLocalName()));
}
}
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-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -149,7 +149,7 @@
public void validate() throws ValidateException
{
if (this.backgroundValidationMillis != null && this.backgroundValidationMillis < 0)
- throw new ValidateException(bundle.invalidNegative(Validation.Tag.BACKGROUNDVALIDATIONMILLIS.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(Validation.Tag.BACKGROUND_VALIDATION_MILLIS.getLocalName()));
if (this.validConnectionChecker != null)
try
@@ -158,7 +158,7 @@
}
catch (ValidateException ve)
{
- throw new ValidateException(bundle.invalidTag(Validation.Tag.VALIDCONNECTIONCHECKER.getLocalName()), ve);
+ throw new ValidateException(bundle.invalidTag(Validation.Tag.VALID_CONNECTION_CHECKER.getLocalName()), ve);
}
if (this.exceptionSorter != null)
try
@@ -167,7 +167,7 @@
}
catch (ValidateException ve)
{
- throw new ValidateException(bundle.invalidTag(Validation.Tag.EXCEPTIONSORTER.getLocalName()), ve);
+ throw new ValidateException(bundle.invalidTag(Validation.Tag.EXCEPTION_SORTER.getLocalName()), ve);
}
if (this.staleConnectionChecker != null)
try
@@ -176,7 +176,7 @@
}
catch (ValidateException ve)
{
- throw new ValidateException(bundle.invalidTag(Validation.Tag.STALECONNECTIONCHECKER.getLocalName()), ve);
+ throw new ValidateException(bundle.invalidTag(Validation.Tag.STALE_CONNECTION_CHECKER.getLocalName()), ve);
}
}
@@ -189,7 +189,7 @@
if (validConnectionChecker != null)
{
- sb.append("<").append(Validation.Tag.VALIDCONNECTIONCHECKER);
+ sb.append("<").append(Validation.Tag.VALID_CONNECTION_CHECKER);
sb.append(" ").append(Extension.Attribute.CLASS_NAME).append("=\"");
sb.append(validConnectionChecker.getClassName()).append("\"");
sb.append(">");
@@ -211,47 +211,47 @@
}
}
- sb.append("</").append(Validation.Tag.VALIDCONNECTIONCHECKER).append(">");
+ sb.append("</").append(Validation.Tag.VALID_CONNECTION_CHECKER).append(">");
}
if (checkValidConnectionSql != null)
{
- sb.append("<").append(Validation.Tag.CHECKVALIDCONNECTIONSQL).append(">");
+ sb.append("<").append(Validation.Tag.CHECK_VALID_CONNECTION_SQL).append(">");
sb.append(checkValidConnectionSql);
- sb.append("</").append(Validation.Tag.CHECKVALIDCONNECTIONSQL).append(">");
+ sb.append("</").append(Validation.Tag.CHECK_VALID_CONNECTION_SQL).append(">");
}
if (validateOnMatch != null)
{
- sb.append("<").append(Validation.Tag.VALIDATEONMATCH).append(">");
+ sb.append("<").append(Validation.Tag.VALIDATE_ON_MATCH).append(">");
sb.append(validateOnMatch);
- sb.append("</").append(Validation.Tag.VALIDATEONMATCH).append(">");
+ sb.append("</").append(Validation.Tag.VALIDATE_ON_MATCH).append(">");
}
if (backgroundValidation != null)
{
- sb.append("<").append(Validation.Tag.BACKGROUNDVALIDATION).append(">");
+ sb.append("<").append(Validation.Tag.BACKGROUND_VALIDATION).append(">");
sb.append(backgroundValidation);
- sb.append("</").append(Validation.Tag.BACKGROUNDVALIDATION).append(">");
+ sb.append("</").append(Validation.Tag.BACKGROUND_VALIDATION).append(">");
}
if (backgroundValidationMillis != null)
{
- sb.append("<").append(Validation.Tag.BACKGROUNDVALIDATIONMILLIS).append(">");
+ sb.append("<").append(Validation.Tag.BACKGROUND_VALIDATION_MILLIS).append(">");
sb.append(backgroundValidationMillis);
- sb.append("</").append(Validation.Tag.BACKGROUNDVALIDATIONMILLIS).append(">");
+ sb.append("</").append(Validation.Tag.BACKGROUND_VALIDATION_MILLIS).append(">");
}
if (useFastFail != null)
{
- sb.append("<").append(Validation.Tag.USEFASTFAIL).append(">");
+ sb.append("<").append(Validation.Tag.USE_FAST_FAIL).append(">");
sb.append(useFastFail);
- sb.append("</").append(Validation.Tag.USEFASTFAIL).append(">");
+ sb.append("</").append(Validation.Tag.USE_FAST_FAIL).append(">");
}
if (staleConnectionChecker != null)
{
- sb.append("<").append(Validation.Tag.STALECONNECTIONCHECKER);
+ sb.append("<").append(Validation.Tag.STALE_CONNECTION_CHECKER);
sb.append(" ").append(Extension.Attribute.CLASS_NAME).append("=\"");
sb.append(staleConnectionChecker.getClassName()).append("\"");
sb.append(">");
@@ -273,12 +273,12 @@
}
}
- sb.append("</").append(Validation.Tag.STALECONNECTIONCHECKER).append(">");
+ sb.append("</").append(Validation.Tag.STALE_CONNECTION_CHECKER).append(">");
}
if (exceptionSorter != null)
{
- sb.append("<").append(Validation.Tag.EXCEPTIONSORTER);
+ sb.append("<").append(Validation.Tag.EXCEPTION_SORTER);
sb.append(" ").append(Extension.Attribute.CLASS_NAME).append("=\"");
sb.append(exceptionSorter.getClassName()).append("\"");
sb.append(">");
@@ -300,7 +300,7 @@
}
}
- sb.append("</").append(Validation.Tag.EXCEPTIONSORTER).append(">");
+ sb.append("</").append(Validation.Tag.EXCEPTION_SORTER).append(">");
}
sb.append("</validation>");
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 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -92,7 +92,7 @@
*/
public XADataSourceImpl(TransactionIsolation transactionIsolation, TimeOut timeOut, DsSecurity security,
Statement statement, Validation validation, String urlDelimiter, String urlSelectorStrategyClassName,
- boolean useJavaContext, String poolName, boolean enabled, String jndiName, boolean spy, boolean useCcm,
+ Boolean useJavaContext, String poolName, Boolean enabled, String jndiName, Boolean spy, Boolean useCcm,
Map<String, String> xaDataSourceProperty, String xaDataSourceClass, String driver, String newConnectionSql,
CommonXaPool xaPool, Recovery recovery) throws ValidateException
{
@@ -250,7 +250,7 @@
sb.append("<xa-datasource");
if (jndiName != null)
- sb.append(" ").append(XaDataSource.Attribute.JNDINAME).append("=\"").append(jndiName).append("\"");
+ sb.append(" ").append(XaDataSource.Attribute.JNDI_NAME).append("=\"").append(jndiName).append("\"");
if (poolName != null)
sb.append(" ").append(XaDataSource.Attribute.POOL_NAME).append("=\"").append(poolName).append("\"");
@@ -259,7 +259,10 @@
sb.append(" ").append(XaDataSource.Attribute.ENABLED).append("=\"").append(enabled).append("\"");
if (useJavaContext != null)
- sb.append(" ").append(XaDataSource.Attribute.USEJAVACONTEXT).append("=\"").append(useJavaContext).append("\"");
+ {
+ sb.append(" ").append(XaDataSource.Attribute.USE_JAVA_CONTEXT);
+ sb.append("=\"").append(useJavaContext).append("\"");
+ }
if (spy)
sb.append(" ").append(XaDataSource.Attribute.SPY).append("=\"").append(spy).append("\"");
@@ -275,18 +278,18 @@
while (it.hasNext())
{
Map.Entry<String, String> entry = it.next();
- sb.append("<").append(XaDataSource.Tag.XADATASOURCEPROPERTY);
+ sb.append("<").append(XaDataSource.Tag.XA_DATASOURCE_PROPERTY);
sb.append(" name=\"").append(entry.getKey()).append("\">");
sb.append(entry.getValue());
- sb.append("</").append(XaDataSource.Tag.XADATASOURCEPROPERTY).append(">");
+ sb.append("</").append(XaDataSource.Tag.XA_DATASOURCE_PROPERTY).append(">");
}
}
if (xaDataSourceClass != null)
{
- sb.append("<").append(XaDataSource.Tag.XADATASOURCECLASS).append(">");
+ sb.append("<").append(XaDataSource.Tag.XA_DATASOURCE_CLASS).append(">");
sb.append(xaDataSourceClass);
- sb.append("</").append(XaDataSource.Tag.XADATASOURCECLASS).append(">");
+ sb.append("</").append(XaDataSource.Tag.XA_DATASOURCE_CLASS).append(">");
}
if (driver != null)
@@ -298,30 +301,30 @@
if (urlDelimiter != null)
{
- sb.append("<").append(XaDataSource.Tag.URLDELIMITER).append(">");
+ sb.append("<").append(XaDataSource.Tag.URL_DELIMITER).append(">");
sb.append(urlDelimiter);
- sb.append("</").append(XaDataSource.Tag.URLDELIMITER).append(">");
+ sb.append("</").append(XaDataSource.Tag.URL_DELIMITER).append(">");
}
if (urlSelectorStrategyClassName != null)
{
- sb.append("<").append(XaDataSource.Tag.URLSELECTORSTRATEGYCLASSNAME).append(">");
+ sb.append("<").append(XaDataSource.Tag.URL_SELECTOR_STRATEGY_CLASS_NAME).append(">");
sb.append(urlSelectorStrategyClassName);
- sb.append("</").append(XaDataSource.Tag.URLSELECTORSTRATEGYCLASSNAME).append(">");
+ sb.append("</").append(XaDataSource.Tag.URL_SELECTOR_STRATEGY_CLASS_NAME).append(">");
}
if (newConnectionSql != null)
{
- sb.append("<").append(XaDataSource.Tag.NEWCONNECTIONSQL).append(">");
+ sb.append("<").append(XaDataSource.Tag.NEW_CONNECTION_SQL).append(">");
sb.append(newConnectionSql);
- sb.append("</").append(XaDataSource.Tag.NEWCONNECTIONSQL).append(">");
+ sb.append("</").append(XaDataSource.Tag.NEW_CONNECTION_SQL).append(">");
}
if (transactionIsolation != null)
{
- sb.append("<").append(XaDataSource.Tag.TRANSACTIONISOLATION).append(">");
+ sb.append("<").append(XaDataSource.Tag.TRANSACTION_ISOLATION).append(">");
sb.append(transactionIsolation);
- sb.append("</").append(XaDataSource.Tag.TRANSACTIONISOLATION).append(">");
+ sb.append("</").append(XaDataSource.Tag.TRANSACTION_ISOLATION).append(">");
}
if (xaPool != null)
@@ -374,11 +377,11 @@
{
if ((this.xaDataSourceClass == null || this.xaDataSourceClass.trim().length() == 0) &&
(this.driver == null || this.driver.trim().length() == 0))
- throw new ValidateException(bundle.requiredElementMissing(Tag.XADATASOURCECLASS.getLocalName(),
+ throw new ValidateException(bundle.requiredElementMissing(Tag.XA_DATASOURCE_CLASS.getLocalName(),
this.getClass().getCanonicalName()));
if (this.xaDataSourceProperty.isEmpty())
- throw new ValidateException(bundle.requiredElementMissing(Tag.XADATASOURCEPROPERTY.getLocalName(),
+ throw new ValidateException(bundle.requiredElementMissing(Tag.XA_DATASOURCE_PROPERTY.getLocalName(),
this.getClass().getCanonicalName()));
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -226,7 +226,7 @@
case START_ELEMENT : {
switch (Connector10.Tag.forName(reader.getLocalName()))
{
- case VENDORNAME : {
+ case VENDOR_NAME : {
vendorName = elementAsXsdString(reader);
break;
}
@@ -310,7 +310,7 @@
case START_ELEMENT : {
switch (Connector15.Tag.forName(reader.getLocalName()))
{
- case VENDORNAME : {
+ case VENDOR_NAME : {
vendorName = elementAsXsdString(reader);
break;
}
@@ -399,11 +399,11 @@
switch (Connector16.Tag.forName(reader.getLocalName()))
{
- case MODULENAME : {
+ case MODULE_NAME : {
moduleName = reader.getElementText().trim();
break;
}
- case VENDORNAME : {
+ case VENDOR_NAME : {
vendorName = elementAsXsdString(reader);
break;
}
@@ -631,7 +631,7 @@
authenticationMechanism.add(parseAuthenticationMechanism(reader));
break;
}
- case MANAGED_CONNECTIONFACTORY_CLASS : {
+ case MANAGEDCONNECTIONFACTORY_CLASS : {
managedConnectionFactoryClass = elementAsXsdString(reader);
break;
}
@@ -1051,7 +1051,7 @@
configProperty.add(parseConfigProperty(reader));
break;
}
- case MANAGED_CONNECTIONFACTORY_CLASS : {
+ case MANAGEDCONNECTIONFACTORY_CLASS : {
managedconnectionfactoryClass = elementAsXsdString(reader);
break;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -305,9 +305,9 @@
sb.append(" ").append(ConnectionDefinition.Attribute.ID).append("=\"").append(id).append("\"");
sb.append(">");
- sb.append("<" + ConnectionDefinition.Tag.MANAGED_CONNECTIONFACTORY_CLASS + ">");
+ sb.append("<" + ConnectionDefinition.Tag.MANAGEDCONNECTIONFACTORY_CLASS + ">");
sb.append(managedconnectionfactoryClass);
- sb.append("</" + ConnectionDefinition.Tag.MANAGED_CONNECTIONFACTORY_CLASS + ">");
+ sb.append("</" + ConnectionDefinition.Tag.MANAGEDCONNECTIONFACTORY_CLASS + ">");
if (configProperties != null)
{
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -124,9 +124,9 @@
if (!XsdString.isNull(vendorName))
{
- sb.append("<" + Connector10.Tag.VENDORNAME + ">");
+ sb.append("<" + Connector10.Tag.VENDOR_NAME + ">");
sb.append(vendorName);
- sb.append("</" + Connector10.Tag.VENDORNAME + ">");
+ sb.append("</" + Connector10.Tag.VENDOR_NAME + ">");
}
sb.append("<" + Connector10.Tag.SPEC_VERSION + ">");
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -367,9 +367,9 @@
StringBuilder sb = new StringBuilder(1024);
sb.append("<").append("resourceadapter").append(">");
- sb.append("<" + ResourceAdapter10.Tag.MANAGED_CONNECTIONFACTORY_CLASS + ">");
+ sb.append("<" + ResourceAdapter10.Tag.MANAGEDCONNECTIONFACTORY_CLASS + ">");
sb.append(managedConnectionFactoryClass);
- sb.append("</" + ResourceAdapter10.Tag.MANAGED_CONNECTIONFACTORY_CLASS + ">");
+ sb.append("</" + ResourceAdapter10.Tag.MANAGEDCONNECTIONFACTORY_CLASS + ">");
sb.append("<" + ResourceAdapter10.Tag.CONNECTIONFACTORY_INTERFACE + ">");
sb.append(connectionFactoryInterface);
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -138,9 +138,9 @@
if (!XsdString.isNull(vendorName))
{
- sb.append("<" + Connector15.Tag.VENDORNAME + ">");
+ sb.append("<" + Connector15.Tag.VENDOR_NAME + ">");
sb.append(vendorName);
- sb.append("</" + Connector15.Tag.VENDORNAME + ">");
+ sb.append("</" + Connector15.Tag.VENDOR_NAME + ">");
}
if (!XsdString.isNull(eisType))
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -194,18 +194,18 @@
if (moduleName != null)
{
- sb.append("<" + Connector16.Tag.MODULENAME + ">");
+ sb.append("<" + Connector16.Tag.MODULE_NAME + ">");
sb.append(moduleName);
- sb.append("</" + Connector16.Tag.MODULENAME + ">");
+ sb.append("</" + Connector16.Tag.MODULE_NAME + ">");
}
// description, displayName, icon
if (!XsdString.isNull(vendorName))
{
- sb.append("<" + Connector16.Tag.VENDORNAME + ">");
+ sb.append("<" + Connector16.Tag.VENDOR_NAME + ">");
sb.append(vendorName);
- sb.append("</" + Connector16.Tag.VENDORNAME + ">");
+ sb.append("</" + Connector16.Tag.VENDOR_NAME + ">");
}
if (!XsdString.isNull(eisType))
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2011-08-23 15:42:02 UTC (rev 112107)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2011-08-23 19:31:01 UTC (rev 112108)
@@ -105,7 +105,7 @@
switch (Tag.forName(reader.getLocalName()))
{
- case RESOURCE_ADPTERS : {
+ case RESOURCE_ADAPTERS : {
adapters = parseResourceAdapters(reader);
break;
}
@@ -132,7 +132,7 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (Tag.forName(reader.getLocalName()) == Tag.RESOURCE_ADPTERS)
+ if (Tag.forName(reader.getLocalName()) == Tag.RESOURCE_ADAPTERS)
{
resourceAdapters.trimToSize();
return new ResourceAdaptersImpl(resourceAdapters);
@@ -149,7 +149,7 @@
case START_ELEMENT : {
switch (ResourceAdapters.Tag.forName(reader.getLocalName()))
{
- case RESOURCE_ADPTER : {
+ case RESOURCE_ADAPTER : {
resourceAdapters.add(parseResourceAdapter(reader));
break;
}
@@ -178,7 +178,7 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (ResourceAdapters.Tag.forName(reader.getLocalName()) == ResourceAdapters.Tag.RESOURCE_ADPTER)
+ if (ResourceAdapters.Tag.forName(reader.getLocalName()) == ResourceAdapters.Tag.RESOURCE_ADAPTER)
{
return new ResourceAdapterImpl(archive, transactionSupport, connectionDefinitions, adminObjects,
configProperties, beanValidationGroups, bootstrapContext);
@@ -266,7 +266,7 @@
/** jboss-ra tag name
*
*/
- RESOURCE_ADPTERS("resource-adapters");
+ RESOURCE_ADAPTERS("resource-adapters");
private final String name;
More information about the jboss-cvs-commits
mailing list