[jboss-cvs] JBossAS SVN: r110831 - in projects/jboss-jca/trunk/common/src: test/resources/ds/example and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 3 16:08:19 EST 2011
Author: maeste
Date: 2011-03-03 16:08:19 -0500 (Thu, 03 Mar 2011)
New Revision: 110831
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/XaDataSource.java
projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/allocation-retry-negative-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/allocation-retry-wait-millis-negative-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/blocking-timeout-millis-negative-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/idle-timeout-minutes-negative-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/jeremy-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/query-timeout-negative-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/use-try-lock-negative-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/xa-resource-timeout-negative-ds.xml
Log:
fixing timeout in -ds.xsd
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-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-03-03 21:08:19 UTC (rev 110831)
@@ -143,7 +143,7 @@
/**
* timeOut tag
*/
- TIMEOUT("time-out"),
+ TIMEOUT("timeout"),
/**
* security tag
*/
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-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-03-03 21:08:19 UTC (rev 110831)
@@ -125,7 +125,7 @@
/**
* timeOut tag
*/
- TIMEOUT("time-out"),
+ TIMEOUT("timeout"),
/**
* security tag
*/
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -14,9 +14,9 @@
<user-name>sa</user-name>
<password></password>
</security>
- <time-out>
+ <timeout>
<idle-timeout-minutes>5</idle-timeout-minutes>
- </time-out>
+ </timeout>
<statement>
<track-statements>true</track-statements>
</statement>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -15,16 +15,16 @@
<user-name>sa</user-name>
<password></password>
</security>
- <time-out>
+ <timeout>
<!--
TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem
with not reaping threads on closed connections
-->
<idle-timeout-minutes>0</idle-timeout-minutes>
- </time-out>
+ </timeout>
<statement>
<track-statements>true</track-statements>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
</statement>
</datasource>
-</datasources>
\ No newline at end of file
+</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -14,10 +14,10 @@
<user-name>changeme</user-name>
<password>changeme</password>
</security>
- <time-out>
+ <timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
- </time-out>
+ </timeout>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -15,10 +15,10 @@
<user-name>changeme</user-name>
<password>changeme</password>
</security>
- <time-out>
+ <timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
- </time-out>
+ </timeout>
</xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-xa-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -15,9 +15,9 @@
<max-pool-size>20</max-pool-size>
<!-- Uncomment to enable interleaving <interleaving/> -->
</xa-pool>
- <time-out>
+ <timeout>
<idle-timeout-minutes>15</idle-timeout-minutes>
- </time-out>
+ </timeout>
<validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.sybase.SybaseValidConnectionChecker"></valid-connection-checker>
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.sybase.SybaseExceptionSorter"></exception-sorter>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/allocation-retry-negative-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/allocation-retry-negative-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/allocation-retry-negative-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -7,11 +7,11 @@
<datasource jndi-name="DefaultDS" pool-name="DefaultDS">
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
- <time-out>
+ <timeout>
<!-- ********************************************** -->
<!-- THIS FIELD IS CAUSING THE FAIL OF RELATED TEST -->
<!-- ********************************************** -->
<allocation-retry>-1</allocation-retry>
- </time-out>
+ </timeout>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/allocation-retry-wait-millis-negative-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/allocation-retry-wait-millis-negative-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/allocation-retry-wait-millis-negative-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -7,11 +7,11 @@
<datasource jndi-name="DefaultDS" pool-name="DefaultDS">
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
- <time-out>
+ <timeout>
<!-- ********************************************** -->
<!-- THIS FIELD IS CAUSING THE FAIL OF RELATED TEST -->
<!-- ********************************************** -->
<allocation-retry-wait-millis>-1</allocation-retry-wait-millis>
- </time-out>
+ </timeout>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/blocking-timeout-millis-negative-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/blocking-timeout-millis-negative-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/blocking-timeout-millis-negative-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -7,11 +7,11 @@
<datasource jndi-name="DefaultDS" pool-name="DefaultDS">
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
- <time-out>
+ <timeout>
<!-- ********************************************** -->
<!-- THIS FIELD IS CAUSING THE FAIL OF RELATED TEST -->
<!-- ********************************************** -->
<blocking-timeout-millis>-1</blocking-timeout-millis>
- </time-out>
+ </timeout>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/idle-timeout-minutes-negative-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/idle-timeout-minutes-negative-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/idle-timeout-minutes-negative-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -7,11 +7,11 @@
<datasource jndi-name="DefaultDS" pool-name="DefaultDS">
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
- <time-out>
+ <timeout>
<!-- ********************************************** -->
<!-- THIS FIELD IS CAUSING THE FAIL OF RELATED TEST -->
<!-- ********************************************** -->
<idle-timeout-minutes>-1</idle-timeout-minutes>
- </time-out>
+ </timeout>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/jeremy-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/jeremy-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/jeremy-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -41,12 +41,12 @@
<validation>
<!--valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.ValidConnectionChecker</valid-connection-checker-class-name-->
</validation>
- <time-out>
+ <timeout>
<!-- The time before an unused connection is destroyed -->
<!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
<!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
<idle-timeout-minutes>0</idle-timeout-minutes>
- </time-out>
+ </timeout>
<statement>
<!-- Whether to check all statements are closed when the connection is returned to the pool, this is a debugging feature
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/query-timeout-negative-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/query-timeout-negative-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/query-timeout-negative-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -7,11 +7,11 @@
<datasource jndi-name="DefaultDS" pool-name="DefaultDS">
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
- <time-out>
+ <timeout>
<!-- ********************************************** -->
<!-- THIS FIELD IS CAUSING THE FAIL OF RELATED TEST -->
<!-- ********************************************** -->
<query-timeout>-1</query-timeout>
- </time-out>
+ </timeout>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/use-try-lock-negative-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/use-try-lock-negative-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/use-try-lock-negative-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -7,11 +7,11 @@
<datasource jndi-name="DefaultDS" pool-name="DefaultDS">
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
- <time-out>
+ <timeout>
<!-- ********************************************** -->
<!-- THIS FIELD IS CAUSING THE FAIL OF RELATED TEST -->
<!-- ********************************************** -->
<use-try-lock>-1</use-try-lock>
- </time-out>
+ </timeout>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/xa-resource-timeout-negative-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/xa-resource-timeout-negative-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/xa-resource-timeout-negative-ds.xml 2011-03-03 21:08:19 UTC (rev 110831)
@@ -9,11 +9,11 @@
<xa-datasource-property name="User">scott</xa-datasource-property>
<xa-datasource-property name="Password">tiger</xa-datasource-property>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <time-out>
+ <timeout>
<!-- ********************************************** -->
<!-- THIS FIELD IS CAUSING THE FAIL OF RELATED TEST -->
<!-- ********************************************** -->
<xa-resource-timeout>-1</xa-resource-timeout>
- </time-out>
+ </timeout>
</xa-datasource>
</datasources>
More information about the jboss-cvs-commits
mailing list