[jboss-cvs] JBossAS SVN: r71789 - in trunk/connector/src: resources/dtd and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 8 09:46:40 EDT 2008
Author: adrian at jboss.org
Date: 2008-04-08 09:46:40 -0400 (Tue, 08 Apr 2008)
New Revision: 71789
Modified:
trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd
trunk/connector/src/resources/jms-rar/META-INF/ra.xml
trunk/connector/src/resources/local-rar/META-INF/ra.xml
trunk/connector/src/resources/xa-rar/META-INF/ra.xml
Log:
[JBAS-5278] - Update rar deployments for use-try-lock
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2008-04-08 13:31:34 UTC (rev 71788)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2008-04-08 13:46:40 UTC (rev 71789)
@@ -82,6 +82,9 @@
@XmlElement(name="query-timeout")
private int queryTimeout;
+
+ @XmlElement(name="use-try-lock")
+ private long useTryLock;
@XmlElement(name="url-delimiter")
private String urlDelimiter;
@@ -247,6 +250,18 @@
{
this.queryTimeout = queryTimeout;
}
+
+ @ManagementProperty(name="use-try-lock", description="The internal lock timeout",
+ includeInTemplate=true)
+ public long getUseTryLock()
+ {
+ return useTryLock;
+ }
+
+ public void setUseTryLock(long useTryLock)
+ {
+ this.useTryLock = useTryLock;
+ }
@ManagementProperty(name="share-prepared-statements",
description="Should prepared statements be shared",
@@ -396,6 +411,12 @@
property.setType("int");
property.setValue(String.valueOf(getQueryTimeout()));
properties.add(property);
+
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("UseTryLock");
+ property.setType("long");
+ property.setValue(String.valueOf(getUseTryLock()));
+ properties.add(property);
property = new ManagedConnectionFactoryPropertyMetaData();
property.setName("TransactionQueryTimeout");
Modified: trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd
===================================================================
--- trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd 2008-04-08 13:31:34 UTC (rev 71788)
+++ trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd 2008-04-08 13:46:40 UTC (rev 71789)
@@ -30,7 +30,7 @@
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?,
+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
@@ -45,7 +45,7 @@
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? ,
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
@@ -58,7 +58,7 @@
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?,
+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
@@ -362,6 +362,14 @@
-->
<!ELEMENT query-timeout (#PCDATA)>
+<!-- Any configured timeout for internal locks on the resource adapter objects in milli-seconds
+
+ The default is no timeout
+ e.g. 5 minutes
+ <use-try-lock>300000</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.
@@ -455,7 +463,7 @@
min-pool-size? , max-pool-size? , blocking-timeout-millis? , 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? ,
-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*)>
<!--
@@ -469,7 +477,7 @@
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? ,
-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: trunk/connector/src/resources/jms-rar/META-INF/ra.xml
===================================================================
--- trunk/connector/src/resources/jms-rar/META-INF/ra.xml 2008-04-08 13:31:34 UTC (rev 71788)
+++ trunk/connector/src/resources/jms-rar/META-INF/ra.xml 2008-04-08 13:46:40 UTC (rev 71789)
@@ -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: trunk/connector/src/resources/local-rar/META-INF/ra.xml
===================================================================
--- trunk/connector/src/resources/local-rar/META-INF/ra.xml 2008-04-08 13:31:34 UTC (rev 71788)
+++ trunk/connector/src/resources/local-rar/META-INF/ra.xml 2008-04-08 13:46:40 UTC (rev 71789)
@@ -141,6 +141,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: trunk/connector/src/resources/xa-rar/META-INF/ra.xml
===================================================================
--- trunk/connector/src/resources/xa-rar/META-INF/ra.xml 2008-04-08 13:31:34 UTC (rev 71788)
+++ trunk/connector/src/resources/xa-rar/META-INF/ra.xml 2008-04-08 13:46:40 UTC (rev 71789)
@@ -141,6 +141,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