Author: bdaw Date: 2009-11-13 14:34:14 -0500 (Fri, 13 Nov 2009) New Revision: 944 Modified: idm/trunk/idm-testsuite/pom.xml idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml idm/trunk/parent/pom.xml Log: - changes for hudson Modified: idm/trunk/idm-testsuite/pom.xml =================================================================== --- idm/trunk/idm-testsuite/pom.xml 2009-11-13 17:10:29 UTC (rev 943) +++ idm/trunk/idm-testsuite/pom.xml 2009-11-13 19:34:14 UTC (rev 944) @@ -138,20 +138,7 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-604.jdbc3</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>net.sourceforge.jtds</groupId> <artifactId>jtds</artifactId> <version>1.2.2</version> Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-13 17:10:29 UTC (rev 943) +++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-13 19:34:14 UTC (rev 944) @@ -31,7 +31,7 @@ <!--<password>jbidentity</password>--> <!--</datasource>--> <datasource> - <datasource-name>sybase152</datasource-name> + <datasource-name>sybase152-jtds</datasource-name> <connection-url>jdbc:jtds:sybase://dev77.qa.atl2.redhat.com:4100/jbidentity</connection-url> <driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class> <user-name>jbidentity</user-name> @@ -39,7 +39,7 @@ </datasource> <datasource> - <datasource-name>sybase152-jconnect</datasource-name> + <datasource-name>sybase152</datasource-name> <connection-url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:4100/jbidentity</connection-url> <driver-class>com.sybase.jdbc3.jdbc.SybDriver</driver-class> <user-name>jbidentity</user-name> @@ -104,20 +104,35 @@ </datasource> <datasource> - <datasource-name>sqlserver</datasource-name> + <datasource-name>sqlserver2005-jtds</datasource-name> <connection-url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/identity</connection-url> <driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class> <user-name>identity</user-name> <password>identity</password> </datasource> <datasource> - <datasource-name>sqlserver2</datasource-name> + <datasource-name>sqlserver2005</datasource-name> <connection-url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918;databaseName=identity</connection-url> <driver-class>com.microsoft.sqlserver.jdbc.SQLServerDriver</driver-class> <user-name>identity</user-name> <password>identity</password> </datasource> + <datasource> + <datasource-name>sqlserver2008-jtds</datasource-name> + <connection-url>jdbc:jtds:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433/identity</connection-url> + <driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class> + <user-name>identity</user-name> + <password>identity</password> + </datasource> + <datasource> + <datasource-name>sqlserver2008</datasource-name> + <connection-url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433;databaseName=identity</connection-url> + <driver-class>com.microsoft.sqlserver.jdbc.SQLServerDriver</driver-class> + <user-name>identity</user-name> + <password>identity</password> + </datasource> + <datasource> <datasource-name>oracle9i</datasource-name> <connection-url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</connection-url> @@ -151,10 +166,17 @@ </datasource> <datasource> - <datasource-name>mysql5</datasource-name> + <datasource-name>mysql51</datasource-name> <connection-url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/identity?j... <driver-class>com.mysql.jdbc.Driver</driver-class> <user-name>identity</user-name> <password>identity</password> </datasource> + <datasource> + <datasource-name>mysql50</datasource-name> + <connection-url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/identity?j... + <driver-class>com.mysql.jdbc.Driver</driver-class> + <user-name>identity</user-name> + <password>identity</password> + </datasource> </datasources> Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-13 17:10:29 UTC (rev 943) +++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-13 19:34:14 UTC (rev 944) @@ -134,7 +134,7 @@ </configuration> <!-- The sqlserver configuration --> <configuration> - <configuration-name>sqlserver</configuration-name> + <configuration-name>sqlserver2005</configuration-name> <properties> <property> <name>hibernate.dialect</name> @@ -143,7 +143,7 @@ </properties> </configuration> <configuration> - <configuration-name>sqlserver2</configuration-name> + <configuration-name>sqlserver2005-jtds</configuration-name> <properties> <property> <name>hibernate.dialect</name> @@ -151,6 +151,24 @@ </property> </properties> </configuration> + <configuration> + <configuration-name>sqlserver2008</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.SQLServerDialect</value> + </property> + </properties> + </configuration> + <configuration> + <configuration-name>sqlserver2008-jtds</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.SQLServerDialect</value> + </property> + </properties> + </configuration> <!-- The mysql 4 configuration --> <configuration> <configuration-name>mysql4</configuration-name> @@ -172,7 +190,7 @@ </configuration> <!-- The mysql 5 configuration --> <configuration> - <configuration-name>mysql5</configuration-name> + <configuration-name>mysql50</configuration-name> <properties> <property> <name>hibernate.dialect</name> @@ -181,6 +199,15 @@ </properties> </configuration> <configuration> + <configuration-name>mysql51</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.MySQLInnoDBDialect</value> + </property> + </properties> + </configuration> + <configuration> <configuration-name>mysql5-local</configuration-name> <properties> <property> @@ -218,7 +245,7 @@ </properties> </configuration> <configuration> - <configuration-name>sybase152-jconnect</configuration-name> + <configuration-name>sybase152-jtds</configuration-name> <properties> <property> <name>hibernate.dialect</name> Modified: idm/trunk/parent/pom.xml =================================================================== --- idm/trunk/parent/pom.xml 2009-11-13 17:10:29 UTC (rev 943) +++ idm/trunk/parent/pom.xml 2009-11-13 19:34:14 UTC (rev 944) @@ -80,8 +80,172 @@ <!-- Profiles --> <profiles> - <profile> + <id>hudson-jdbc-drivers</id> + <repositories> + <repository> + <id>qa-jdbc-drivers</id> + <url>http://www.qa.jboss.com/jdbc-drivers/maven2/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + </profile> + <profile> + <id>hudson-ojdbc14</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>10.2.0.4</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-jconnect</id> + <dependencies> + <dependency> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-ojdbc5</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-ojdbc6</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc6</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-db2jcc-31</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-db2jcc-38</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.8.47</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.8.47</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-db2jcc-357</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.57.86</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.57.86</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-msjdbc</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>2.0.1008.2</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-postgresql-82</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-postgresql-83</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-604</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-mysql-508</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.8</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hudson-mysql-517</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.7</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>provided-jdbc-driver</id> <dependencies> <dependency>