Author: vhalbert(a)redhat.com Date: 2009-09-30 12:34:39 -0400 (Wed, 30 Sep 2009) New Revision: 1503 Modified: trunk/test-integration/db/src/main/resources/default-config.properties trunk/test-integration/db/src/main/resources/xa-config.properties Log: Teiid 773 - changed the following: - the testcase will not use system property to pass in overrides/additions to the loaded config.properties file. Now will use an addProperty() method provided on the abstract testcase that will apply the properties per test. - remove the datasource_mapping.xml. There is no need to distinquish between xa and nonxa connector types. The connector type will be specified in the connection.properties file. - if using the -DuserDataSources property to control datasource, it will imply order based on whats specified. The config.properties file will now map the model to order (i.e., pm1:1), where this order determines which datasource it will correspond to based on the userDataSources property. This mapping is done so that the nightly testing process can control which datasources are being used and can ensure retestability. Modified: trunk/test-integration/db/src/main/resources/default-config.properties =================================================================== --- trunk/test-integration/db/src/main/resources/default-config.properties 2009-09-30 16:25:50 UTC (rev 1502) +++ trunk/test-integration/db/src/main/resources/default-config.properties 2009-09-30 16:34:39 UTC (rev 1503) @@ -21,9 +21,9 @@ URL=jdbc:metamatrix:Transaction@target/classes/transactions/transaction.properties;user=admin;password=teiid User=admin Password=teiid -databasename=Transaction -servername=target/classes/transactions/transaction.properties -portnumber=0 +DatabaseName=Transaction +ServerName=target/classes/transactions/transaction.properties +PortNumber=0 application-name=txn-test # jboss Modified: trunk/test-integration/db/src/main/resources/xa-config.properties =================================================================== --- trunk/test-integration/db/src/main/resources/xa-config.properties 2009-09-30 16:25:50 UTC (rev 1502) +++ trunk/test-integration/db/src/main/resources/xa-config.properties 2009-09-30 16:34:39 UTC (rev 1503) @@ -18,9 +18,9 @@ URL=jdbc:metamatrix:Transaction@target/classes/transactions/transaction.properties;user=admin;password=teiid User=admin Password=teiid -databasename=Transaction -servername=target/classes/transactions/transaction.properties -portnumber=0 +DatabaseName=Transaction +ServerName=target/classes/transactions/transaction.properties +PortNumber=0 application-name=txn-test # jboss