[jboss-cvs] JBossAS SVN: r65621 - in trunk/connector/src: resources/dtd and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 26 08:43:33 EDT 2007
Author: adrian at jboss.org
Date: 2007-09-26 08:43:33 -0400 (Wed, 26 Sep 2007)
New Revision: 65621
Modified:
trunk/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd
Log:
[JBAS-4490] - Bring the dtd up-to-date in jboss-head
Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java 2007-09-26 09:38:34 UTC (rev 65620)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java 2007-09-26 12:43:33 UTC (rev 65621)
@@ -357,6 +357,16 @@
queryTimeout = timeout;
}
+ /**
+ * Get the urlDelimiter.
+ *
+ * @return the urlDelimiter.
+ */
+ public String getURLDelimiter()
+ {
+ return urlDelimiter;
+ }
+
public void setURLDelimiter(String urlDelimiter)
throws ResourceException
{
Modified: trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd
===================================================================
--- trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd 2007-09-26 09:38:34 UTC (rev 65620)
+++ trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd 2007-09-26 12:43:33 UTC (rev 65621)
@@ -22,35 +22,42 @@
<!-- Specify a jca-jdbc non-XADatasource (local) wrapper, using no transactions
-->
-<!ELEMENT no-tx-datasource (jndi-name , use-java-context?, connection-url , driver-class ,
-connection-property* , user-name? , password? ,
+<!ELEMENT no-tx-datasource (jndi-name , use-java-context?, connection-url ,
+url-delimeter?, 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? , idle-timeout-minutes? ,
-new-connection-sql?, check-valid-connection-sql?, valid-connection-checker-class-name?,
-exception-sorter-class-name?, track-statements?,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes?,
+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?,
prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
metadata?, type-mapping?, depends*)>
<!-- Specify a jca-jdbc non-XADatasource (local) wrapper, using local
transactions
-->
-<!ELEMENT local-tx-datasource (jndi-name , use-java-context?, connection-url , driver-class ,
-transaction-isolation? , connection-property* , user-name? , password? ,
+<!ELEMENT local-tx-datasource (jndi-name , use-java-context?, connection-url ,
+url-delimeter?, 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? , idle-timeout-minutes? ,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes?,
+validate-on-match?, idle-timeout-minutes?
no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? ,
-valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? ,
+valid-connection-checker-class-name? , exception-sorter-class-name? , stale-connection-checker-class-name?, track-statements? ,
+prefill?, use-fast-fail?,
prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
metadata?, type-mapping?, depends*)>
<!-- Specify a jca-jdbc XADatasource wrapper
-->
<!ELEMENT xa-datasource (jndi-name , use-java-context?, track-connection-by-tx , xa-datasource-class ,
-xa-datasource-property* , isSameRM-override-value? , transaction-isolation? , user-name? , password? ,
+xa-datasource-property* , url-property?, url-delimeter?, 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? , idle-timeout-minutes? ,
-no-tx-separate-pools? , xa-resource-timeout?, new-connection-sql? , check-valid-connection-sql? ,
-valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? ,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? ,
+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?,
prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
metadata?, type-mapping?, depends*)>
@@ -171,6 +178,19 @@
-->
<!ELEMENT idle-timeout-minutes (#PCDATA)>
+<!-- The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to
+match a managed connection for a given set. This is typically exclusive to the use of background validation -->
+
+<!ELEMENT validate-on-match (#PCDATA)>
+
+<!-- An element to specify that connections should be validated on a background thread versus being validated
+ prior to use-->
+<!ELEMENT background-validation (#PCDATA)>
+
+<!-- The background-validation-minutes element specifies the amount of time, in minutes, that background validation
+ will run. -->
+<!ELEMENT background-validation-minutes (#PCDATA)>
+
<!-- An element to specify that all intermediate end(suspend) and
start(resume) calls. Also, all work on one tx will go through one
connection.
@@ -271,6 +291,19 @@
-->
<!ELEMENT exception-sorter-class-name (#PCDATA)>
+<!-- An org.jboss.resource.adapter.jdbc.StaleConnectionChecker that provides
+a boolean isStaleConnection(SQLException e) method which if it it returns
+true will wrap the exception in an
+org.jboss.resource.adapter.jdbc.StaleConnectionException
+which is a subclass of SQLException.
+
+Ex:
+<stale-connection-checker-class-name>
+ org.jboss.resource.adapter.jdbc.vendor.OracleStaleConnectionChecker
+</stale-connection-checker-class-name>
+-->
+<!ELEMENT stale-connection-checker-class-name (#PCDATA)>
+
<!-- Whether to check for unclosed statements when a
connection is returned to the pool and result sets are
closed when a statement is closed/return to the prepared
@@ -284,6 +317,21 @@
-->
<!ELEMENT track-statements EMPTY>
+<!-- Whether to attempt to prefill the connection pool. Empty element denotes a false value.
+ e.g.
+ <prefill>true</prefill>
+ -->
+<!ELEMENT prefill (#PCDATA) >
+
+<!-- Whether fail a connection allocation on the first connection if it is invalid (true)
+ or keep trying until the pool is exhausted of all potential connections (false)
+
+ default false.
+ e.g.
+ <use-fast-fail>true</use-fast-fail>
+ -->
+<!ELEMENT use-fast-fail (#PCDATA) >
+
<!-- The number of prepared statements per connection in an LRU cache
-->
<!ELEMENT prepared-statement-cache-size (#PCDATA)>
@@ -334,8 +382,8 @@
<!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? , idle-timeout-minutes? ,
-no-tx-separate-pools?, xa-resource-timeout?,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? ,
+no-tx-separate-pools?, prefill?, use-fast-fail?, xa-resource-timeout?,
metadata?, type-mapping?, depends*)>
<!-- The no-tx-connection-factory element is used to configure generic resource
@@ -343,8 +391,8 @@
-->
<!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? , idle-timeout-minutes? ,
-metadata?, type-mapping?, depends*)>
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? ,
+prefill?, use-fast-fail?, metadata?, type-mapping?, depends*)>
<!-- The rar deployment to associate with the connection manager mbean.
e.g. jms-ra.rar or myapplication.ear#my.rar for nested rars
@@ -394,7 +442,8 @@
<!-- For backwards compatibility use type-mapping -->
<!ELEMENT metadata (type-mapping)>
-<!-- EXPERIMENTAL: this is a copy of local-tx-datasource + url-delimeter
+<!--
+Use local-tx-datasource
-->
<!ELEMENT ha-local-tx-datasource (jndi-name, use-java-context?, connection-url, url-delimeter,
driver-class, transaction-isolation? , connection-property* , user-name? , password?,
@@ -405,7 +454,8 @@
prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
metadata?, type-mapping?, depends*)>
-<!-- Specify a jca-jdbc XADatasource wrapper
+<!--
+Use xa-datasource
-->
<!ELEMENT ha-xa-datasource (jndi-name , use-java-context?, track-connection-by-tx , xa-datasource-class ,
xa-datasource-property* , url-property, url-delimeter, isSameRM-override-value? , transaction-isolation? ,
@@ -422,6 +472,10 @@
-->
<!ELEMENT url-delimeter (#PCDATA)>
+<!-- A class that implements org.jboss.resource.adapter.jdbc.URLSelectorStrategy
+-->
+<!ELEMENT url-selector-strategy-class-name (#PCDATA)>
+
<!-- For HA XA datasource specifies the name of an xa-datasource-property that contains a list of URLs
-->
<!ELEMENT url-property (#PCDATA)>
More information about the jboss-cvs-commits
mailing list