Author: vhalbert(a)redhat.com Date: 2009-09-18 15:11:06 -0400 (Fri, 18 Sep 2009) New Revision: 1379 Modified: trunk/test-integration/db/src/main/resources/datasources/datasource_mapping.xml trunk/test-integration/db/src/main/resources/datasources/readme.txt Log: Teiid 773 - organize integration test - setting up the product resources needed to execute the teiid-test-integration db tests Modified: trunk/test-integration/db/src/main/resources/datasources/datasource_mapping.xml =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/datasource_mapping.xml 2009-09-18 17:49:42 UTC (rev 1378) +++ trunk/test-integration/db/src/main/resources/datasources/datasource_mapping.xml 2009-09-18 19:11:06 UTC (rev 1379) @@ -31,24 +31,36 @@ <datasourceconfig> <datasourcetype name="nonxa"> - <datasource name="ds_mysql"> - <property name="dir">mysql</property> + <datasource name="ds_mysql_5"> + <property name="dir">mysql_5</property> <property name="connectortype">MySQL JDBC Connector</property> </datasource> - <datasource name="ds_oracle"> - <property name="dir">oracle</property> + <datasource name="ds_oracle_9"> + <property name="dir">oracle_9</property> <property name="connectortype">Oracle Connector</property> </datasource> - <datasource name="ds_sqlserver"> - <property name="dir">sqlserver</property> + <datasource name="ds_oracle_10"> + <property name="dir">oracle_10</property> + <property name="connectortype">Oracle Connector</property> + </datasource> + <datasource name="ds_oracle_11"> + <property name="dir">oracle_11</property> + <property name="connectortype">Oracle Connector</property> + </datasource> + <datasource name="ds_sqlserver_2005"> + <property name="dir">sqlserver_2005</property> <property name="connectortype">SQL Server Connector</property> </datasource> - <datasource name="ds_db2"> - <property name="dir">db2</property> + <datasource name="ds_sqlserver_2008"> + <property name="dir">sqlserver_2008</property> + <property name="connectortype">SQL Server Connector</property> + </datasource> + <datasource name="ds_db2_9"> + <property name="dir">db2_9</property> <property name="connectortype">DB2 Connector</property> </datasource> - <datasource name="ds_postgres"> - <property name="dir">postgres</property> + <datasource name="ds_postgres_81"> + <property name="dir">postgres_81</property> <property name="connectortype">PostgreSQL JDBC Connector</property> </datasource> @@ -60,24 +72,36 @@ </datasourcetype> <datasourcetype name="xa"> - <datasource name="ds_mysql_xa"> - <property name="dir">mysql</property> + <datasource name="ds_mysql_5_xa"> + <property name="dir">mysql_5</property> <property name="connectortype">MySQL JDBC XA Connector</property> </datasource> - <datasource name="ds_oracle_xa"> - <property name="dir">oracle</property> + <datasource name="ds_oracle_11_xa"> + <property name="dir">oracle_11</property> <property name="connectortype">Oracle XA Connector</property> + </datasource> + <datasource name="ds_oracle_10_xa"> + <property name="dir">oracle_10</property> + <property name="connectortype">Oracle XA Connector</property> + </datasource> + <datasource name="ds_oracle_9_xa"> + <property name="dir">oracle_9</property> + <property name="connectortype">Oracle XA Connector</property> </datasource> - <datasource name="ds_sqlserver"> - <property name="dir">sqlserver</property> + <datasource name="ds_sqlserver_2005"> + <property name="dir">sqlserver_2005</property> <property name="connectortype">SQL Server XA Connector</property> </datasource> - <datasource name="ds_db2_xa"> - <property name="dir">db2</property> + <datasource name="ds_sqlserver_2008"> + <property name="dir">sqlserver_2008</property> + <property name="connectortype">SQL Server XA Connector</property> + </datasource> + <datasource name="ds_db2_9_xa"> + <property name="dir">db2_9</property> <property name="connectortype">DB2 XA Connector</property> </datasource> - <datasource name="ds_postgres_xa"> - <property name="dir">postgres</property> + <datasource name="ds_postgres_81_xa"> + <property name="dir">postgres_81</property> <property name="connectortype">PostgreSQL XA JDBC Connector</property> </datasource> Modified: trunk/test-integration/db/src/main/resources/datasources/readme.txt =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/readme.txt 2009-09-18 17:49:42 UTC (rev 1378) +++ trunk/test-integration/db/src/main/resources/datasources/readme.txt 2009-09-18 19:11:06 UTC (rev 1379) @@ -1,36 +1 @@ -the datasources directory is the location to define each database schema that can be used during the running of the tests -a datasource here is defined as a unique connection to a specific schema - -To setup a datasource, do the following: - -1. open datasource_mapping.xml and find the datasource you would like to setup. - Use the name of the directory ("dir") as the name of the folder to create for the datasource. -1. create the directory (if it doesn't exist) -2. create (or place) a connection.properties file in the newly created directory. See the - example_connection.properties in the derby directory as a starting point. - - -NOTE: The datasource_mapping.xml has groupings by datasource type. This is also a mechinism for creating groupings -for special usecases. An example would be to do the following: - -- add 2 different groups to datasource_mapping.xml - - <datasourcetype name="TestIT"> - <datasource name="mysqlmyA"> - <property name="dir">mysql</property> - <property name="connectortype">MySQL JDBC XA Connector</property> - </datasource> - - <datasource name="oraclemyB"> - <property name="dir">oracle</property> - <property name="connectortype">Oracle JDBC XA Connector</property> - </datasource> - </datasourcetype> - - -- then, in the config properties file, map the models to each datasourcetype - -pm1=mysqlmyA -pm2=oraclemyB - -This force the association between the model and datasource. \ No newline at end of file +These datasources are used for product testing \ No newline at end of file