[jboss-cvs] JBossAS SVN: r110984 - projects/jboss-jca/branches/performance/jmeter/src/main/resources.

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

Author: whitingjr
Date: 2011-03-21 13:22:18 -0400 (Mon, 21 Mar 2011)
New Revision: 110984

Modified:
   projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-ds.xml
Log:
Added two properties to define the username and password in ds xml.

Modified: projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-ds.xml
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-ds.xml	2011-03-21 17:02:49 UTC (rev 110983)
+++ projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-ds.xml	2011-03-21 17:22:18 UTC (rev 110984)
@@ -23,49 +23,27 @@
 <datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="SampleDS" pool-name="SampleDS">
-    <!-- 
-    <connection-url>jdbc:hsqldb:mem:test</connection-url>
-     
-    <connection-url>jdbc:postgresql://whitingjrlite.localdomain/jca</connection-url>
-    -->
     <connection-url>${db-vendor.connectionURL}</connection-url>
-    <!-- The driver class -->
-    <!--
-    <driver-class>org.hsqldb.jdbcDriver</driver-class>
-    <driver-class>org.postgresql.Driver</driver-class>
-     -->
     <driver-class>${db-vendor.driverClass}</driver-class>
     <pool>
       <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
       <min-pool-size>5</min-pool-size>
       <!-- The maximum connections in a pool/sub-pool -->
       <max-pool-size>300</max-pool-size>
-      <!-- The login and password -->
     </pool>
     <security>
-      <!-- 
-      <user-name>sa</user-name>
-      <password></password>
-       -->
-       <user-name>sa</user-name>
-      <password></password>
+      <!-- The login and password -->
+       <user-name>${db-vendor.userName}</user-name>
+      <password>${db-vendor.password}</password>
     </security>
     <validation>
-       <!--valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.ValidConnectionChecker</valid-connection-checker-class-name-->
     </validation>
-    <time-out>
-      <!-- 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>
     
     <statement>
       <!-- Whether to check all statements are closed when the connection is returned to the pool, this is a debugging feature 
         that should be turned off in production 
         Turned off for performance optimisation.-->
       <track-statements>false</track-statements>
-      <!-- HSQL DB benefits from prepared statement caching -->
       <prepared-statement-cache-size>32</prepared-statement-cache-size>
     </statement>
   </datasource>