[jboss-cvs] JBossAS SVN: r109092 - in trunk/testsuite/src/resources/deadlock: META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-11-03 10:58:51 -0400 (Wed, 03 Nov 2010)
New Revision: 109092

Added:
   trunk/testsuite/src/resources/deadlock/META-INF/deadlock-ds.xml
Removed:
   trunk/testsuite/src/resources/deadlock/deadlock-ds.xml
Log:
[JBAS-8239]; make -ds.xml part of deployment, not to be treated as sub-deployment.


Copied: trunk/testsuite/src/resources/deadlock/META-INF/deadlock-ds.xml (from rev 109081, trunk/testsuite/src/resources/deadlock/deadlock-ds.xml)
===================================================================
--- trunk/testsuite/src/resources/deadlock/META-INF/deadlock-ds.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/deadlock/META-INF/deadlock-ds.xml	2010-11-03 14:58:51 UTC (rev 109092)
@@ -0,0 +1,11 @@
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>DeadlockDS</jndi-name>
+    <!-- A totally in-memory db, not saved when jboss stops. -->
+    <connection-url>jdbc:hsqldb:.</connection-url>
+    <driver-class>org.hsqldb.jdbcDriver</driver-class>
+    <user-name>sa</user-name>
+    <password></password>
+    <min-pool-size>5</min-pool-size>
+  </local-tx-datasource>
+</datasources>


Property changes on: trunk/testsuite/src/resources/deadlock/META-INF/deadlock-ds.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: trunk/testsuite/src/resources/deadlock/deadlock-ds.xml
===================================================================
--- trunk/testsuite/src/resources/deadlock/deadlock-ds.xml	2010-11-03 14:46:24 UTC (rev 109091)
+++ trunk/testsuite/src/resources/deadlock/deadlock-ds.xml	2010-11-03 14:58:51 UTC (rev 109092)
@@ -1,11 +0,0 @@
-<datasources>
-  <local-tx-datasource>
-    <jndi-name>DeadlockDS</jndi-name>
-    <!-- A totally in-memory db, not saved when jboss stops. -->
-    <connection-url>jdbc:hsqldb:.</connection-url>
-    <driver-class>org.hsqldb.jdbcDriver</driver-class>
-    <user-name>sa</user-name>
-    <password></password>
-    <min-pool-size>5</min-pool-size>
-  </local-tx-datasource>
-</datasources>