[jboss-cvs] JBossAS SVN: r81927 - in projects/metadata/trunk/src/main: resources/dtd and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Dec 1 18:46:48 EST 2008 

Author: alex.loubyansky at jboss.com
Date: 2008-12-01 18:46:48 -0500 (Mon, 01 Dec 2008)
New Revision: 81927

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java
   projects/metadata/trunk/src/main/resources/dtd/jboss-ds_5_0.dtd
Log:
JBMETA-150

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java	2008-12-01 22:34:18 UTC (rev 81926)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java	2008-12-01 23:46:48 UTC (rev 81927)
@@ -32,7 +32,13 @@
  * @author Jeff Zhang
  * @version $Revision: 1.1 $
  */
- at XmlType(name="local-tx-datasource")
+ at XmlType(name="local-tx-datasource", propOrder={"jndiName", "useJavaContext", "connectionUrl", "urlDelimiter", "urlSelectorStrategyClassName",
+      "driverClass", "transactionIsolation", "connectionProperties", "userName", "passWord", "securityMetaData", "minSize",
+      "maxPoolSize", "blockingTimeout", "backgroundValidation", "backgroundValidationMillis", "validateOnMatch", "idleTimeout",
+      "allocationRetry", "allocationRetryWaitMillis", "noTxSeparatePools", "newConnectionSQL", "checkValidConnectionSQL",
+      "validConnectionCheckerClassName", "exceptionSorterClassName", "staleConnectionCheckerClassName", "trackStatements", "prefill",
+      "preparedStatementCacheSize", "sharePreparedStatements", "useQueryTimeout", "queryTimeout", "useTryLock", "dbmsMetaData", "typeMapping",
+      "dependsNames"})
 @XmlAccessorType(XmlAccessType.FIELD)
 public class LocalDataSourceDeploymentMetaData extends NonXADataSourceDeploymentMetaData
 {

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java	2008-12-01 22:34:18 UTC (rev 81926)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java	2008-12-01 23:46:48 UTC (rev 81927)
@@ -30,7 +30,9 @@
  * @author Jeff Zhang
  * @version $Revision: $
  */
- at XmlType(name="no-tx-connection-factory")
+ at XmlType(name="no-tx-connection-factory", propOrder={"jndiName", "rarName", "connectionDefinition", "managedConnectionFactoryProperties",
+      "securityMetaData", "minSize", "maxPoolSize", "blockingTimeout", "backgroundValidation", "backgroundValidationMillis",
+      "idleTimeout", "allocationRetry", "allocationRetryWaitMillis", "prefill", "dbmsMetaData", "typeMapping"})
 public class NoTxConnectionFactoryDeploymentMetaData extends ManagedConnectionFactoryDeploymentMetaData
 {
 

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java	2008-12-01 22:34:18 UTC (rev 81926)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java	2008-12-01 23:46:48 UTC (rev 81927)
@@ -30,7 +30,12 @@
  * @author Jeff Zhang
  * @version $Revision: $
  */
- at XmlType(name="no-tx-datasource")
+ at XmlType(name="no-tx-datasource", propOrder={"jndiName", "useJavaContext", "connectionUrl", "urlDelimiter", "urlSelectorStrategyClassName",
+      "driverClass", "connectionProperties", "userName", "passWord", "securityMetaData", "minSize", "maxPoolSize", "blockingTimeout",
+      "backgroundValidation", "backgroundValidationMillis", "idleTimeout", "allocationRetry", "allocationRetryWaitMillis",
+      "validateOnMatch", "newConnectionSQL", "checkValidConnectionSQL", "validConnectionCheckerClassName", "exceptionSorterClassName",
+      "staleConnectionCheckerClassName", "trackStatements", "prefill", "preparedStatementCacheSize", "sharePreparedStatements",
+      "useQueryTimeout", "queryTimeout", "useTryLock", "dbmsMetaData", "typeMapping", "dependsNames"})
 public class NoTxDataSourceDeploymentMetaData extends NonXADataSourceDeploymentMetaData
 {
    /** The serialVersionUID */

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java	2008-12-01 22:34:18 UTC (rev 81926)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java	2008-12-01 23:46:48 UTC (rev 81927)
@@ -34,7 +34,10 @@
  * @author Jeff Zhang
  * @version $Revision: $
  */
- at XmlType(name="tx-connection-factory")
+ at XmlType(name="tx-connection-factory", propOrder={"jndiName", "localTransactions", "xaTransaction", "trackConnectionByTransaction",
+      "rarName", "connectionDefinition", "managedConnectionFactoryProperties", "securityMetaData", "minSize", "maxPoolSize",
+      "blockingTimeout", "backgroundValidation", "backgroundValidationMillis", "idleTimeout", "allocationRetry", "allocationRetryWaitMillis",
+      "noTxSeparatePools", "prefill", "xaResourceTimeout", "dbmsMetaData", "typeMapping", "dependsNames"})
 @XmlAccessorType(XmlAccessType.FIELD)
 public class TxConnectionFactoryDeploymentMetaData extends ManagedConnectionFactoryDeploymentMetaData
 {

Modified: projects/metadata/trunk/src/main/resources/dtd/jboss-ds_5_0.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss-ds_5_0.dtd	2008-12-01 22:34:18 UTC (rev 81926)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss-ds_5_0.dtd	2008-12-01 23:46:48 UTC (rev 81927)
@@ -26,7 +26,7 @@
 url-delimiter?, url-selector-strategy-class-name?, 
 driver-class , connection-property* , user-name? , password? ,
 (application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes?,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis? , idle-timeout-minutes?,
 allocation-retry?, allocation-retry-wait-millis?, validate-on-match?, new-connection-sql?, check-valid-connection-sql?, valid-connection-checker-class-name?,
 exception-sorter-class-name?, stale-connection-checker-class-name?, track-statements?, 
 prefill?, use-fast-fail?,
@@ -40,7 +40,7 @@
 url-delimiter?, url-selector-strategy-class-name?, 
 driver-class, transaction-isolation? , connection-property* , user-name? , password? ,
 (application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes?, 
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis?, 
 validate-on-match?, idle-timeout-minutes? , allocation-retry?, allocation-retry-wait-millis?, 
 no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? ,
 valid-connection-checker-class-name? , exception-sorter-class-name? , stale-connection-checker-class-name?, track-statements? ,
@@ -54,7 +54,7 @@
 xa-datasource-property* , url-property?, url-delimiter?, url-selector-strategy-class-name?,
 isSameRM-override-value? , transaction-isolation? , user-name? , password? ,
 (application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? ,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis? , idle-timeout-minutes? ,
 allocation-retry?, allocation-retry-wait-millis?, validate-on-match?, no-tx-separate-pools? , xa-resource-timeout?, new-connection-sql? , check-valid-connection-sql? ,
 valid-connection-checker-class-name? , exception-sorter-class-name? , stale-connection-checker-class-name?, track-statements? ,
 prefill?, use-fast-fail?,
@@ -412,7 +412,7 @@
 <!ELEMENT tx-connection-factory (jndi-name , (local-transaction | xa-transaction) ,
 track-connection-by-tx? , rar-name?, connection-definition?, config-property* ,
 (application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? ,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis? , idle-timeout-minutes? ,
 allocation-retry?, allocation-retry-wait-millis?, no-tx-separate-pools?, prefill?, use-fast-fail?, xa-resource-timeout?,
 metadata?, type-mapping?, depends*)>
 
@@ -421,7 +421,7 @@
 -->
 <!ELEMENT no-tx-connection-factory (jndi-name , rar-name?, connection-definition? , config-property* ,
 (application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? ,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis? , idle-timeout-minutes? ,
 allocation-retry?, allocation-retry-wait-millis?, prefill?, use-fast-fail?, metadata?, type-mapping?, depends*)>
 
 <!-- The rar deployment to associate with the connection manager mbean.

More information about the jboss-cvs-commits mailing list