Author: vhalbert(a)redhat.com Date: 2009-09-30 12:09:30 -0400 (Wed, 30 Sep 2009) New Revision: 1501 Removed: trunk/test-integration/db/src/main/resources/datasources/datasource_mapping.xml Modified: trunk/test-integration/db/src/main/resources/datasources/derby/example_connection.properties trunk/test-integration/db/src/main/resources/datasources/mysql/example_connection.properties trunk/test-integration/db/src/main/resources/datasources/oracle/example_connection.properties trunk/test-integration/db/src/main/resources/datasources/postgres/example_connection.properties trunk/test-integration/db/src/main/resources/datasources/sqlserver/example_connection.properties trunk/test-integration/db/src/main/resources/datasources/sybase/example_connection.properties 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. Deleted: trunk/test-integration/db/src/main/resources/datasources/datasource_mapping.xml =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/datasource_mapping.xml 2009-09-30 16:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/datasources/datasource_mapping.xml 2009-09-30 16:09:30 UTC (rev 1501) @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- ====================================================================== - Aug 26, 2009 9:05:03 AM - - description: This datasource configuration file is used to define the - different datasources that "may be" used during test execution. - I say may be used, because these are all the types that are supported - by Teiid, but only if the defined "dir" exist under the "datasources" - directory that contains a connection.properties file will it actually be used. - - The organization of the datasources splits them between groups XA and Non-XA - related transactional types so that when a test is run the process will obtain - a connection from a datasoure defined for that group. - - To use a datasource(s) in a test, map the model(s) to a datasource indicated here. - The mapping is done in the configuration properties file (see default-config.properties). - - This configuration specifies the following information: - - It indicates the location ("dir") to find the datasource connection - information that is used to populate the connector bindings and create - direct connections to the source. - - - It provides a mapping to the Connector Type that needs - to be specified when deploying the ConnectorBinding and assigning it to - the mapped model (see default.config.properties) - - NOTE: the name of datasource must be unique across all datasources in the file - - vanhalbert - ====================================================================== --> - -<datasourceconfig> - <datasourcetype name="nonxa"> - <datasource name="ds_mysql"> - <property name="dir">mysql</property> - <property name="connectortype">MySQL JDBC Connector</property> - </datasource> - <datasource name="ds_oracle"> - <property name="dir">oracle</property> - <property name="connectortype">Oracle Connector</property> - </datasource> - <datasource name="ds_sqlserver"> - <property name="dir">sqlserver</property> - <property name="connectortype">SQL Server Connector</property> - </datasource> - <datasource name="ds_db2"> - <property name="dir">db2</property> - <property name="connectortype">DB2 Connector</property> - </datasource> - <datasource name="ds_postgres"> - <property name="dir">postgres</property> - <property name="connectortype">PostgreSQL JDBC Connector</property> - </datasource> - - <datasource name="ds_derby"> - <property name="dir">derby</property> - <property name="connectortype">Apache Derby Network Connector</property> - </datasource> - - </datasourcetype> - - <datasourcetype name="xa"> - <datasource name="ds_mysql_xa"> - <property name="dir">mysql</property> - <property name="connectortype">MySQL JDBC XA Connector</property> - </datasource> - <datasource name="ds_oracle_xa"> - <property name="dir">oracle</property> - <property name="connectortype">Oracle XA Connector</property> - </datasource> - <datasource name="ds_sqlserve_xa"> - <property name="dir">sqlserver</property> - <property name="connectortype">SQL Server XA Connector</property> - </datasource> - <datasource name="ds_db2_xa"> - <property name="dir">db2</property> - <property name="connectortype">DB2 XA Connector</property> - </datasource> - <datasource name="ds_postgres_xa"> - <property name="dir">postgres</property> - <property name="connectortype">PostgreSQL XA JDBC Connector</property> - </datasource> - - </datasourcetype> - -</datasourceconfig> \ No newline at end of file Modified: trunk/test-integration/db/src/main/resources/datasources/derby/example_connection.properties =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/derby/example_connection.properties 2009-09-30 16:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/datasources/derby/example_connection.properties 2009-09-30 16:09:30 UTC (rev 1501) @@ -1,4 +1,9 @@ +# db.type must match a ddl folder db.type=derby +# db.connectortype must match a connector type defined in the configuration.xml +db.connectortype=Apache Derby Network XA Connector + + driver=org.apache.derby.jdbc.ClientDriver URL=jdbc:derby://localhost:1527//(derbyinstallloc) User= Modified: trunk/test-integration/db/src/main/resources/datasources/mysql/example_connection.properties =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/mysql/example_connection.properties 2009-09-30 16:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/datasources/mysql/example_connection.properties 2009-09-30 16:09:30 UTC (rev 1501) @@ -1,5 +1,9 @@ -# db.type must match a ddl folder and it also represents the ANT sql datatype used during execution +# db.type must match a ddl folder db.type=mysql +# db.connectortype must match a connector type defined in the configuration.xml +db.connectortype=MySQL JDBC XA Connector + + driver=com.mysql.jdbc.Driver URL=jdbc:mysql://(servername):3306/(databasename) User= Modified: trunk/test-integration/db/src/main/resources/datasources/oracle/example_connection.properties =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/oracle/example_connection.properties 2009-09-30 16:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/datasources/oracle/example_connection.properties 2009-09-30 16:09:30 UTC (rev 1501) @@ -1,5 +1,9 @@ # db.type must match a ddl folder db.type=oracle +# db.connectortype must match a connector type defined in the configuration.xml +db.connectortype=Oracle XA Connector + + driver=oracle.jdbc.OracleDriver URL=jdbc:oracle:thin:@(servername):1521:(sid) User= Modified: trunk/test-integration/db/src/main/resources/datasources/postgres/example_connection.properties =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/postgres/example_connection.properties 2009-09-30 16:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/datasources/postgres/example_connection.properties 2009-09-30 16:09:30 UTC (rev 1501) @@ -1,5 +1,9 @@ # db.type must match a ddl folder db.type=postgres +# db.connectortype must match a connector type defined in the configuration.xml +db.connectortype=PostgreSQL XA JDBC Connector + + driver=org.postgresql.Driver URL=jdbc:postgresql://(servername):5432/(databasename) User= Modified: trunk/test-integration/db/src/main/resources/datasources/sqlserver/example_connection.properties =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/sqlserver/example_connection.properties 2009-09-30 16:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/datasources/sqlserver/example_connection.properties 2009-09-30 16:09:30 UTC (rev 1501) @@ -1,5 +1,9 @@ # db.type must match a ddl folder db.type=sqlserver +# db.connectortype must match a connector type defined in the configuration.xml +db.connectortype=SQL Server XA Connector + + driver=com.microsoft.sqlserver.jdbc.SQLServerDriver URL=jdbc:sqlserver://(servername):1433;databaseName=(databasename) User= Modified: trunk/test-integration/db/src/main/resources/datasources/sybase/example_connection.properties =================================================================== --- trunk/test-integration/db/src/main/resources/datasources/sybase/example_connection.properties 2009-09-30 16:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/datasources/sybase/example_connection.properties 2009-09-30 16:09:30 UTC (rev 1501) @@ -1,5 +1,9 @@ # db.type must match a ddl folder db.type=sybase +# db.connectortype must match a connector type defined in the configuration.xml +db.connectorytype= + + driver=com.mysql.jdbc.Driver URL=jdbc:mysql://(servername):3306/(databasename) User= 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:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/default-config.properties 2009-09-30 16:09:30 UTC (rev 1501) @@ -4,7 +4,7 @@ # local, xa, jndi -transaction-type=local +#transaction-type=local process-batch = 20 connector-batch = 20 @@ -34,20 +34,18 @@ mm.ds-jndiname=mmXA usertxn-jndiname=java:comp/UserTransaction -# === Mode-to-Datasource Mapping ====== -# <model>=<datasource type name> -# This mapping will be used by the set of testcases that load this config file. -# These mapping control what datasource is mapped to which model +# These mappings control what datasource is mapped to which model when the -Dusedatasources=<comma seperated datasource names> option is used +# or the system environment is set. # -# See the resources/datasources/datasource_mapping.xml for the available datasource type names +# By providing the numerical order, it indicates which datasource to assign based on the order in the usedatasources property. # -# <datasource type name> can be the name of either a datasourcegroup or datasource +# If -Dusedatasources is not set, then the datasource will be assigned in the order they are calling to obtain a datasource. # # -pm1=nonxa -pm2=nonxa +pm1=1 +pm2=2 ########################################## 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:08:14 UTC (rev 1500) +++ trunk/test-integration/db/src/main/resources/xa-config.properties 2009-09-30 16:09:30 UTC (rev 1501) @@ -31,20 +31,17 @@ mm.ds-jndiname=mmXA usertxn-jndiname=java:comp/UserTransaction -# === Mode-to-Datasource Mapping ====== -# <model>=<datasource type name> - -# This mapping will be used by the set of testcases that load this config file. -# These mapping control what datasource is mapped to which model +# These mappings control what datasource is mapped to which model when the -Dusedatasources=<comma seperated datasource names> option is used +# or the system environment is set. # -# See the resources/datasources/datasource_mapping.xml for the available datasource type names +# By providing the numerical order, it indicates which datasource to assign based on the order in the usedatasources property. # -# <datasource type name> can be the name of either a datasourcegroup or datasource +# If -Dusedatasources is not set, then the datasource will be assigned in the order they are calling to obtain a datasource. # # -pm1=xa -pm2=xa +pm1=1 +pm2=2 ##########################################