[teiid-commits] teiid SVN: r2216 - in trunk/test-integration/db/src/main: resources and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2010-06-10 13:04:23 -0400 (Thu, 10 Jun 2010)
New Revision: 2216

Modified:
   trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java
   trunk/test-integration/db/src/main/resources/default-config.properties
Log:
TEIID-889 - cleanup

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java	2010-06-10 16:52:36 UTC (rev 2215)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java	2010-06-10 17:04:23 UTC (rev 2216)
@@ -90,7 +90,7 @@
 	}
 
 	// the DO_NO_USE_DEFAULT will be passed in when the test are run from maven and no property is passed in for UseDataSources 
-	private static final String DO_NOT_USE_DEFAULT="${usedatasources}";
+	private static final String DO_NOT_USE_DEFAULT="${" + ConfigPropertyNames.USE_DATASOURCES_PROP + "}";
 		
 	private Properties configprops;
 	

Modified: trunk/test-integration/db/src/main/resources/default-config.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/default-config.properties	2010-06-10 16:52:36 UTC (rev 2215)
+++ trunk/test-integration/db/src/main/resources/default-config.properties	2010-06-10 17:04:23 UTC (rev 2216)
@@ -17,14 +17,10 @@
 driver=org.teiid.jdbc.TeiidDriver
 URL=jdbc:metamatrix:Transaction at mm://127.0.0.1:31000
 
-#;user=admin;password=admin
-
-
 User=admin
 Password=teiid
 DatabaseName=Transaction
 ServerName=localhost
-#ServerName=target/classes/transactions/transaction.properties
 PortNumber=31000
 application-name=txn-test