[jboss-svn-commits] JBL Code SVN: r30538 - labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF.

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

Author: whitingjr
Date: 2009-12-08 12:25:37 -0500 (Tue, 08 Dec 2009)
New Revision: 30538

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/persistence.xml
Log:
Refactored codebase to support blended datasources.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml	2009-12-08 15:02:54 UTC (rev 30537)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml	2009-12-08 17:25:37 UTC (rev 30538)
@@ -5,6 +5,7 @@
 	xmlns="urn:jboss:bean-deployer:2.0">
 
 
-	${datasoure.xml}
+	${datasoure.xml.A}
+	${datasoure.xml.B}
 
 </deployment>

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/persistence.xml	2009-12-08 15:02:54 UTC (rev 30537)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/persistence.xml	2009-12-08 17:25:37 UTC (rev 30538)
@@ -11,24 +11,15 @@
             case the microcontainer, see caveatemptor-beans.xml definition.
         -->
        <jta-data-source>java:/caveatemptorTestingDatasourceA</jta-data-source>
-
-       <!-- The path to scan for entity classes, different than the root of this file
-       <jar-file>file:/home/work/local/hibernate/jpwh/caveatemptor.jpa/build/classes</jar-file>
-        -->
-
        <properties>
-          <!-- Only scan and detect annotated entities -->
            <property name="hibernate.archive.autodetection" value="class"/>
-
-          <!-- SQL stdout logging
-           -->
           <property name="hibernate.show_sql" value="false"/>
           <property name="hibernate.format_sql" value="true"/>
           <property name="use_sql_comments" value="false"/>
           <property name="org.hibernate.SQL" value="true"/>
 
           <property name="hibernate.dialect"
-                    value="${db-vendor-hibernate.dialect}"/>
+                    value="${db-vendor-hibernate.dialect.A}"/>
 
            <!-- Put the EntityManagerFactory into JNDI so we can use it manually in tests -->
            <property name="jboss.entity.manager.factory.jndi.name"
@@ -51,28 +42,17 @@
             case the microcontainer, see caveatemptor-beans.xml definition.
         -->
        <jta-data-source>java:/caveatemptorTestingDatasourceB</jta-data-source>
-
-       <!-- The path to scan for entity classes, different than the root of this file
-       <jar-file>file:/home/work/local/hibernate/jpwh/caveatemptor.jpa/build/classes</jar-file>
-        -->
-
        <properties>
           <!-- Only scan and detect annotated entities -->
            <property name="hibernate.archive.autodetection" value="class"/>
-
-          <!-- Only scan and detect hbm.xml files
-          <property name="hibernate.archive.autodetection" value="hbm"/>
-          -->
-
-          <!-- SQL stdout logging
-           -->
+          
           <property name="hibernate.show_sql" value="false"/>
           <property name="hibernate.format_sql" value="true"/>
           <property name="use_sql_comments" value="false"/>
           <property name="org.hibernate.SQL" value="true"/>
 
           <property name="hibernate.dialect"
-                    value="${db-vendor-hibernate.dialect}"/>
+                    value="${db-vendor-hibernate.dialect.B}"/>
 
            <!-- Put the EntityManagerFactory into JNDI so we can use it manually in tests -->
            <property name="jboss.entity.manager.factory.jndi.name"