[hibernate-commits] Hibernate SVN: r16235 - in core/trunk: tutorials and 1 other directory.

Author: jcosta(a)redhat.com Date: 2009-03-31 06:15:56 -0400 (Tue, 31 Mar 2009) New Revision: 16235 Modified: core/trunk/testsuite/pom.xml core/trunk/tutorials/pom.xml Log: HHH-3842 - Updated pom.xml files to use consistent profile names for the databases in QA Lab. Modified: core/trunk/testsuite/pom.xml =================================================================== --- core/trunk/testsuite/pom.xml 2009-03-31 07:07:56 UTC (rev 16234) +++ core/trunk/testsuite/pom.xml 2009-03-31 10:15:56 UTC (rev 16235) @@ -126,9 +126,9 @@ <id>h2</id> <dependencies> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.1.103</version> + <groupId>org.h2database</groupId> + <artifactId>h2database</artifactId> + <version>1.0.20061217</version> </dependency> </dependencies> <properties> @@ -162,16 +162,16 @@ <properties> <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.ur... - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/platformae</jdbc.url> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation /> </properties> </profile> <!-- The PostgreSQL test envionment --> <profile> - <id>pgsql8</id> + <id>postgresql823</id> <dependencies> <dependency> <groupId>postgresql</groupId> @@ -183,9 +183,9 @@ <properties> <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:platformae</jdbc.url> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation /> </properties> </profile> @@ -196,51 +196,34 @@ ################################################################### --> - <!-- The Oracle9i test envionment --> + <!-- The DB2 8.x test envionment (using 9x drivers)--> <profile> - <id>oracle9i</id> + <id>db2v82</id> <dependencies> <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> - <!-- use the 10g drivers which are surprisingly largely bug free --> - <version>10.0.2.0</version> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> - <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> - - <!-- The Oracle10g test envionment --> - <profile> - <id>oracle10g</id> - <dependencies> <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> - <!-- use the 10g drivers which are surprisingly largely bug free --> - <version>10.0.2.0</version> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> </dependency> </dependencies> <properties> - <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> - <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>pltfrmae</jdbc.user> + <jdbc.pass>pltfrmae</jdbc.pass> <jdbc.isolation /> </properties> </profile> - <!-- The DB2 8.x test envionment (using 9x drivers)--> + <!-- The DB2 9.x test envionment (using 9x drivers)--> <profile> - <id>db2-8</id> + <id>db2v91</id> <dependencies> <dependency> <groupId>com.ibm</groupId> @@ -256,75 +239,78 @@ <properties> <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> - <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> - <jdbc.user>hiber</jdbc.user> - <jdbc.pass>hiber</jdbc.pass> + <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>pltfrmae</jdbc.user> + <jdbc.pass>pltfrmae</jdbc.pass> <jdbc.isolation /> </properties> </profile> - <!-- The Sybase 12 test envionment --> + <!-- The Oracle9i test envionment --> <profile> - <id>sybase12</id> + <id>oracle9i</id> <dependencies> <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>6.0.5</version> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <!-- use the 10g drivers which are surprisingly largely bug free --> + <version>10.0.2.0</version> </dependency> </dependencies> <properties> - <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect> - <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> - <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation /> </properties> </profile> + <!-- The Oracle10g test envionment --> <profile> - <id>sybase15</id> + <id>oracle10g</id> <dependencies> <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>6.0.5</version> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <!-- use the 10g drivers which are surprisingly largely bug free --> + <version>10.0.2.0</version> </dependency> </dependencies> <properties> - <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> - <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> - <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibernate</jdbc.url> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url> <jdbc.user>hibernate</jdbc.user> <jdbc.pass>hibernate</jdbc.pass> <jdbc.isolation /> </properties> </profile> - <!-- The SQLServer2005 (jTDS) test envionment --> + <!-- The Sybase 15 test envionment --> <profile> - <id>sqlserver-jtds</id> + <id>sybase15</id> <dependencies> <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>1.2</version> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> </dependency> </dependencies> <properties> - <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> - <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> + <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> + <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/platformae</jdbc.url> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation /> </properties> </profile> <!-- The SQLServer2005 (MS JDBC) test envionment --> <profile> - <id>sqlserver-msjdbc</id> + <id>mssql2005</id> <dependencies> <dependency> <groupId>com.microsoft.sqlserver</groupId> @@ -336,8 +322,8 @@ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation>4096</jdbc.isolation> </properties> </profile> Modified: core/trunk/tutorials/pom.xml =================================================================== --- core/trunk/tutorials/pom.xml 2009-03-31 07:07:56 UTC (rev 16234) +++ core/trunk/tutorials/pom.xml 2009-03-31 10:15:56 UTC (rev 16235) @@ -206,16 +206,16 @@ <properties> <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.ur... - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/platformae</jdbc.url> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation /> </properties> </profile> <!-- The PostgreSQL test envionment --> <profile> - <id>pgsql8</id> + <id>postgresql823</id> <dependencies> <dependency> <groupId>postgresql</groupId> @@ -227,9 +227,9 @@ <properties> <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:platformae</jdbc.url> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation /> </properties> </profile> @@ -240,6 +240,56 @@ ################################################################### --> + <!-- The DB2 8.x test envionment (using 9x drivers)--> + <profile> + <id>db2v82</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>pltfrmae</jdbc.user> + <jdbc.pass>pltfrmae</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The DB2 9.x test envionment (using 9x drivers)--> + <profile> + <id>db2v91</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>pltfrmae</jdbc.user> + <jdbc.pass>pltfrmae</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + <!-- The Oracle9i test envionment --> <profile> <id>oracle9i</id> @@ -255,8 +305,8 @@ <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation /> </properties> </profile> @@ -276,80 +326,35 @@ <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.user>hibernate</jdbc.user> + <jdbc.pass>hibernate</jdbc.pass> <jdbc.isolation /> </properties> </profile> - <!-- The DB2 8.x test envionment (using 9x drivers)--> + <!-- The Sybase 15 test envionment --> <profile> - <id>db2-8</id> + <id>sybase15</id> <dependencies> <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.1.57</version> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.1.57</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> - <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> - <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> - <jdbc.user>hiber</jdbc.user> - <jdbc.pass>hiber</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> - - <!-- The Sybase 12 test envionment --> - <profile> - <id>sybase12</id> - <dependencies> - <dependency> <groupId>com.sybase</groupId> <artifactId>jconnect</artifactId> <version>6.0.5</version> </dependency> </dependencies> <properties> - <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect> + <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> - <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/platformae</jdbc.url> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation /> </properties> </profile> - <!-- The SQLServer2005 (jTDS) test envionment --> - <profile> - <id>sqlserver-jtds</id> - <dependencies> - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>1.2</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> - <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> - <!-- The SQLServer2005 (MS JDBC) test envionment --> <profile> - <id>sqlserver-msjdbc</id> + <id>mssql2005</id> <dependencies> <dependency> <groupId>com.microsoft.sqlserver</groupId> @@ -361,8 +366,8 @@ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.user>platformae</jdbc.user> + <jdbc.pass>platformae</jdbc.pass> <jdbc.isolation>4096</jdbc.isolation> </properties> </profile>