[jboss-cvs] JBossAS SVN: r71552 - in branches/Branch_4_2/connector/src/resources: ha-local-rar/META-INF and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 1 08:58:46 EDT 2008
Author: adrian at jboss.org
Date: 2008-04-01 08:58:46 -0400 (Tue, 01 Apr 2008)
New Revision: 71552
Modified:
branches/Branch_4_2/connector/src/resources/dtd/jboss-ds_1_5.dtd
branches/Branch_4_2/connector/src/resources/ha-local-rar/META-INF/ra.xml
branches/Branch_4_2/connector/src/resources/ha-xa-rar/META-INF/ra.xml
branches/Branch_4_2/connector/src/resources/jms-rar/META-INF/ra.xml
branches/Branch_4_2/connector/src/resources/local-rar/META-INF/ra.xml
branches/Branch_4_2/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
branches/Branch_4_2/connector/src/resources/xa-rar/META-INF/ra.xml
Log:
Missed commit
Modified: branches/Branch_4_2/connector/src/resources/dtd/jboss-ds_1_5.dtd
===================================================================
--- branches/Branch_4_2/connector/src/resources/dtd/jboss-ds_1_5.dtd 2008-04-01 12:58:01 UTC (rev 71551)
+++ branches/Branch_4_2/connector/src/resources/dtd/jboss-ds_1_5.dtd 2008-04-01 12:58:46 UTC (rev 71552)
@@ -28,7 +28,7 @@
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?, track-statements?, prefill?, use-fast-fail?,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
+prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
metadata?, type-mapping?, depends*)>
<!-- Specify a jca-jdbc non-XADatasource (local) wrapper, using local
@@ -40,7 +40,7 @@
min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes?,
idle-timeout-minutes? , validate-on-match?, no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? ,
valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? , prefill?, use-fast-fail?,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
+prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
metadata?, type-mapping?, depends*)>
<!-- Specify a jca-jdbc XADatasource wrapper
@@ -51,7 +51,7 @@
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? , track-statements? , prefill?, use-fast-fail?,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
+prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
metadata?, type-mapping?, depends*)>
<!-- The JNDI name under which the DataSource wrapper will be bound. Note that
@@ -342,6 +342,14 @@
-->
<!ELEMENT query-timeout (#PCDATA)>
+<!-- Whether to use try locks in seconds
+
+ The default is wait for a lock indefinitely
+ e.g. 5 minutes
+ <use-try-lock>300</use-try-lock>
+-->
+<!ELEMENT use-try-lock (#PCDATA)>
+
<!-- The depends element specifies the JMX ObjectName string of a service
that the connection manager services depend on.
@@ -436,7 +444,7 @@
min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? , background-validation?, background-validation-minutes?,
no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? , validate-on-match?,
valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? , prefill?, use-fast-fail?,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
+prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
metadata?, type-mapping?, depends*)>
<!-- Specify a jca-jdbc XADatasource wrapper
@@ -449,7 +457,7 @@
no-tx-separate-pools? , xa-resource-timeout? , validate-on-match?,
new-connection-sql? , check-valid-connection-sql? ,
valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? , prefill?, use-fast-fail?,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?,
+prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
type-mapping?, depends*)>
<!-- Specifies the delimeter for URLs in connection-url for ha datasources
Modified: branches/Branch_4_2/connector/src/resources/ha-local-rar/META-INF/ra.xml
===================================================================
--- branches/Branch_4_2/connector/src/resources/ha-local-rar/META-INF/ra.xml 2008-04-01 12:58:01 UTC (rev 71551)
+++ branches/Branch_4_2/connector/src/resources/ha-local-rar/META-INF/ra.xml 2008-04-01 12:58:46 UTC (rev 71552)
@@ -126,6 +126,11 @@
<config-property-name>QueryTimeout</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
+ <config-property>
+ <description>Maximum wait for a lock</description>
+ <config-property-name>UseTryLock</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
<connectionfactory-impl-class>org.jboss.resource.adapter.jdbc.WrapperDataSource</connectionfactory-impl-class>
<connection-interface>java.sql.Connection</connection-interface>
Modified: branches/Branch_4_2/connector/src/resources/ha-xa-rar/META-INF/ra.xml
===================================================================
--- branches/Branch_4_2/connector/src/resources/ha-xa-rar/META-INF/ra.xml 2008-04-01 12:58:01 UTC (rev 71551)
+++ branches/Branch_4_2/connector/src/resources/ha-xa-rar/META-INF/ra.xml 2008-04-01 12:58:46 UTC (rev 71552)
@@ -131,6 +131,11 @@
<config-property-name>QueryTimeout</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
+ <config-property>
+ <description>Maximum wait for a lock</description>
+ <config-property-name>UseTryLock</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
<connectionfactory-impl-class>org.jboss.resource.adapter.jdbc.WrapperDataSource</connectionfactory-impl-class>
<connection-interface>java.sql.Connection</connection-interface>
Modified: branches/Branch_4_2/connector/src/resources/jms-rar/META-INF/ra.xml
===================================================================
--- branches/Branch_4_2/connector/src/resources/jms-rar/META-INF/ra.xml 2008-04-01 12:58:01 UTC (rev 71551)
+++ branches/Branch_4_2/connector/src/resources/jms-rar/META-INF/ra.xml 2008-04-01 12:58:46 UTC (rev 71552)
@@ -81,6 +81,11 @@
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value>true</config-property-value>
</config-property>
+ <config-property>
+ <description>Maximum wait for a lock</description>
+ <config-property-name>UseTryLock</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
<connectionfactory-interface>org.jboss.resource.adapter.jms.JmsConnectionFactory</connectionfactory-interface>
<connectionfactory-impl-class>org.jboss.resource.adapter.jms.JmsConnectionFactoryImpl</connectionfactory-impl-class>
<connection-interface>javax.jms.Session</connection-interface>
Modified: branches/Branch_4_2/connector/src/resources/local-rar/META-INF/ra.xml
===================================================================
--- branches/Branch_4_2/connector/src/resources/local-rar/META-INF/ra.xml 2008-04-01 12:58:01 UTC (rev 71551)
+++ branches/Branch_4_2/connector/src/resources/local-rar/META-INF/ra.xml 2008-04-01 12:58:46 UTC (rev 71552)
@@ -126,6 +126,11 @@
<config-property-name>QueryTimeout</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
+ <config-property>
+ <description>Maximum wait for a lock</description>
+ <config-property-name>UseTryLock</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
<connectionfactory-impl-class>org.jboss.resource.adapter.jdbc.WrapperDataSource</connectionfactory-impl-class>
<connection-interface>java.sql.Connection</connection-interface>
Modified: branches/Branch_4_2/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
===================================================================
--- branches/Branch_4_2/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl 2008-04-01 12:58:01 UTC (rev 71551)
+++ branches/Branch_4_2/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl 2008-04-01 12:58:46 UTC (rev 71552)
@@ -320,6 +320,9 @@
<xsl:if test="query-timeout">
<config-property name="QueryTimeout" type="int"><xsl:value-of select="normalize-space(query-timeout)"/></config-property>
</xsl:if>
+ <xsl:if test="use-try-lock">
+ <config-property name="UseTryLock" type="int"><xsl:value-of select="normalize-space(use-try-lock)"/></config-property>
+ </xsl:if>
<xsl:if test="url-delimiter">
<config-property name="URLDelimiter" type="java.lang.String"><xsl:value-of select="normalize-space(url-delimiter)"/></config-property>
</xsl:if>
Modified: branches/Branch_4_2/connector/src/resources/xa-rar/META-INF/ra.xml
===================================================================
--- branches/Branch_4_2/connector/src/resources/xa-rar/META-INF/ra.xml 2008-04-01 12:58:01 UTC (rev 71551)
+++ branches/Branch_4_2/connector/src/resources/xa-rar/META-INF/ra.xml 2008-04-01 12:58:46 UTC (rev 71552)
@@ -121,6 +121,11 @@
<config-property-name>QueryTimeout</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
+ <config-property>
+ <description>Maximum wait for a lock</description>
+ <config-property-name>UseTryLock</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
<connectionfactory-impl-class>org.jboss.resource.adapter.jdbc.WrapperDataSource</connectionfactory-impl-class>
<connection-interface>java.sql.Connection</connection-interface>
More information about the jboss-cvs-commits
mailing list