[jboss-cvs] JBossAS SVN: r79671 - in projects/ejb3/trunk/testsuite/src/test: resources/test/clusteredsession/xpc and 1 other directories.

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

Author: bstansberry at jboss.com
Date: 2008-10-17 15:49:30 -0400 (Fri, 17 Oct 2008)
New Revision: 79671

Added:
   projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredsession/xpc/clusteredsession-ds.xml
Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ScopedExtendedPersistenceUnitTestCase.java
   projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredsession/xpc/META-INF/persistence.xml
Log:
Clustered XPC tests should use shared DB

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java	2008-10-17 19:46:57 UTC (rev 79670)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java	2008-10-17 19:49:30 UTC (rev 79671)
@@ -63,7 +63,7 @@
    {
       TestSuite suite = new TestSuite();
       Test t1 = getDeploySetup(ExtendedPersistenceUnitTestCase.class,
-                               "clusteredsession-xpc.jar");
+                               "clusteredsession-ds.xml, clusteredsession-xpc.jar");
 
       suite.addTest(t1);
 

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ScopedExtendedPersistenceUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ScopedExtendedPersistenceUnitTestCase.java	2008-10-17 19:46:57 UTC (rev 79670)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ScopedExtendedPersistenceUnitTestCase.java	2008-10-17 19:49:30 UTC (rev 79671)
@@ -44,7 +44,7 @@
    {
       TestSuite suite = new TestSuite();
       Test t1 = getDeploySetup(ScopedExtendedPersistenceUnitTestCase.class,
-                               "clusteredsession-xpc-scoped.jar");
+                               "clusteredsession-ds.xml, clusteredsession-xpc-scoped.jar");
 
       suite.addTest(t1);
 

Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredsession/xpc/META-INF/persistence.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredsession/xpc/META-INF/persistence.xml	2008-10-17 19:46:57 UTC (rev 79670)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredsession/xpc/META-INF/persistence.xml	2008-10-17 19:49:30 UTC (rev 79671)
@@ -5,7 +5,7 @@
    http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
    version="1.0"> 
    <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jta-data-source>java:/ClusteredSessionTestDS</jta-data-source>
       <properties>
           <property name="hibernate.session_factory_name" value="tempdb"/>
           <property name="hibernate.hbm2ddl.auto" value="create-drop"/>

Added: projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredsession/xpc/clusteredsession-ds.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredsession/xpc/clusteredsession-ds.xml	                        (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredsession/xpc/clusteredsession-ds.xml	2008-10-17 19:49:30 UTC (rev 79671)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+   <local-tx-datasource>
+      <jndi-name>ClusteredSessionTestDS</jndi-name>
+
+      <connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url>
+      <driver-class>org.hsqldb.jdbcDriver</driver-class>
+      <user-name>sa</user-name>
+      <password></password>
+      <min-pool-size>1</min-pool-size>
+      <max-pool-size>20</max-pool-size>
+      <idle-timeout-minutes>0</idle-timeout-minutes>
+      <track-statements/>
+   </local-tx-datasource>
+</datasources>