[jboss-svn-commits] JBL Code SVN: r29820 - in labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources: META-INF and 1 other directory.

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

Author: whitingjr
Date: 2009-10-26 14:04:41 -0400 (Mon, 26 Oct 2009)
New Revision: 29820

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml
Log:
Changed configuration.
Added support for xml configuration depending on selected datasource configuration parameter.

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-10-26 18:03:54 UTC (rev 29819)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml	2009-10-26 18:04:41 UTC (rev 29820)
@@ -1,51 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-    xmlns="urn:jboss:bean-deployer:2.0">
+	xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+	xmlns="urn:jboss:bean-deployer:2.0">
 
-    <!-- Enable a JCA datasource available through JNDI -->
-    <!-- bean name="caveatEmptorDatasourceFactory"
-          class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
-        <property name="jndiName">java:/caveatemptorTestingDatasource</property>
+	
+   <!-- bean name="VendorDataSource">
+      <
+   </bean>
 
-        <property name="driverClass">${db-vendor-jdbc-driverClass}</property>
-        <property name="connectionURL">${db-vendor-jdbc-connectionURL}</property>
-        <property name="userName">${db-vendor-jdbc-userName}</property>
+	<bean name="caveatEmptorDatasourceFactory" class="org.jboss.jbossts.tomcat.XADataSourceWrapper">
+		<constructor>
+			<parameter class="java.lang.String">java:/caveatemptorTestingDatasource</parameter>
+			<parameter class="javax.sql.XADataSource">
+				<inject bean="VendorDataSource" />
+			</parameter>
+		</constructor>
+      
+		<property name="connectionURL">${db-vendor-jdbc-connectionURL}</property>
+	</bean>
 
-        <property name="minSize">0</property>
-        <property name="maxSize">10</property>
-        <property name="blockingTimeout">1000</property>
-        <property name="idleTimeout">100000</property>
+	<bean name="caveatemptorTestingDatasource" class="java.lang.Object">
+		<constructor factoryMethod="getDatasource">
+			<factory bean="caveatEmptorDatasourceFactory" />
+		</constructor>
+	</bean-->
+	
+	${datasoure.xml}
 
-        <property name="transactionManager"><inject bean="TransactionManager"/></property>
-        <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
-        <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    </bean-->
-    
-    <bean name="caveatEmptorDatasourceFactory"
-          class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
-        <property name="jndiName">java:/caveatemptorTestingDatasource</property>
 
-        <property name="driverClass">${db-vendor-jdbc-driverClass}</property>
-        <property name="connectionURL">${db-vendor-jdbc-connectionURL}</property>
-        <property name="userName">${db-vendor-jdbc-userName}</property>
-
-        <property name="minSize">0</property>
-        <property name="maxSize">10</property>
-        <property name="blockingTimeout">1000</property>
-        <property name="idleTimeout">100000</property>
-
-        <property name="transactionManager"><inject bean="TransactionManager"/></property>
-        <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
-        <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    </bean>
-
-    <bean name="caveatemptorTestingDatasource" class="java.lang.Object">
-        <constructor factoryMethod="getDatasource">
-            <factory bean="caveatEmptorDatasourceFactory"/>
-        </constructor>
-    </bean>
-    
-
 </deployment>

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml	2009-10-26 18:03:54 UTC (rev 29819)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml	2009-10-26 18:04:41 UTC (rev 29820)
@@ -61,7 +61,7 @@
    <bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
       <property name="transactionManager"><inject bean="TransactionManager"/></property>
    </bean>
-
+   
    <!--
       <bean class="org.jboss.jdbc.HypersonicDatabase"
         name="jboss:service=Hypersonic,database=localDB">
@@ -172,4 +172,4 @@
 
    -->
    
-</deployment>
\ No newline at end of file
+</deployment>

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml	2009-10-26 18:03:54 UTC (rev 29819)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml	2009-10-26 18:04:41 UTC (rev 29820)
@@ -8,7 +8,7 @@
 	<!-- ============================== -->
 
    <appender name="FILE" class="org.apache.log4j.FileAppender">
-      <param name="Target" value="log.txt" />
+      <param name="fileName" value="log.txt" />
       <param name="Threshold" value="TRACE" />
 
       <layout class="org.apache.log4j.PatternLayout">