October 2009 - hibernate-commits - Jboss List Archives

Hibernate SVN: r17783 - in core/branches/Branch_3_2/src/org/hibernate: hql/ast/exec and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-10-16 12:22:06 -0400 (Fri, 16 Oct 2009) New Revision: 17783 Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java core/branches/Branch_3_2/src/org/hibernate/dialect/MySQLDialect.java core/branches/Branch_3_2/src/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java Log: HHH-4486 : MySQL [DROP TEMPORARY TABLE] support Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java 2009-10-16 16:21:02 UTC (rev 17782) +++ core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java 2009-10-16 16:22:06 UTC (rev 17783) @@ -1091,6 +1091,15 @@ } /** + * Command used to drop a temporary table. + * + * @return The command used to drop a temporary table. + */ + public String getDropTemporaryTableString() { + return "drop table"; + } + + /** * Does the dialect require that temporary table DDL statements occur in * isolation from other statements? This would be the case if the creation * would cause any current transaction to get committed implicitly. Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/MySQLDialect.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/dialect/MySQLDialect.java 2009-10-16 16:21:02 UTC (rev 17782) +++ core/branches/Branch_3_2/src/org/hibernate/dialect/MySQLDialect.java 2009-10-16 16:22:06 UTC (rev 17783) @@ -255,6 +255,16 @@ return "create temporary table if not exists"; } + public String getDropTemporaryTableString() { + return "drop temporary table"; + } + + public Boolean performTemporaryTableDDLInIsolation() { + // because we [drop *temporary* table...] we do not + // have to perform these in isolation. + return Boolean.FALSE; + } + public String getCastTypeName(int code) { if ( code==Types.INTEGER ) { return "signed"; @@ -298,11 +308,7 @@ return true; } - public Boolean performTemporaryTableDDLInIsolation() { - return Boolean.FALSE; - } - // Overridden informational metadata ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public boolean supportsEmptyInList() { Modified: core/branches/Branch_3_2/src/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java 2009-10-16 16:21:02 UTC (rev 17782) +++ core/branches/Branch_3_2/src/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java 2009-10-16 16:22:06 UTC (rev 17783) @@ -158,8 +158,10 @@ public void doWork(Connection connection) throws HibernateException { Statement stmnt = null; try { + final String command = session.getFactory().getSettings().getDialect().getDropTemporaryTableString() + + " " + persister.getTemporaryIdTableName(); stmnt = connection.createStatement(); - stmnt.executeUpdate( "drop table " + persister.getTemporaryIdTableName() ); + stmnt.executeUpdate( command ); } catch( Throwable t ) { log.warn( "unable to drop temporary id table after use [" + t.getMessage() + "]" );

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17782 - in core/trunk/core/src/main/java/org/hibernate: hql/ast/exec and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-10-16 12:21:02 -0400 (Fri, 16 Oct 2009) New Revision: 17782 Modified: core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java core/trunk/core/src/main/java/org/hibernate/dialect/MySQLDialect.java core/trunk/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java Log: HHH-4486 : MySQL [DROP TEMPORARY TABLE] support Modified: core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java 2009-10-16 15:34:39 UTC (rev 17781) +++ core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java 2009-10-16 16:21:02 UTC (rev 17782) @@ -1092,6 +1092,15 @@ } /** + * Command used to drop a temporary table. + * + * @return The command used to drop a temporary table. + */ + public String getDropTemporaryTableString() { + return "drop table"; + } + + /** * Does the dialect require that temporary table DDL statements occur in * isolation from other statements? This would be the case if the creation * would cause any current transaction to get committed implicitly. Modified: core/trunk/core/src/main/java/org/hibernate/dialect/MySQLDialect.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/dialect/MySQLDialect.java 2009-10-16 15:34:39 UTC (rev 17781) +++ core/trunk/core/src/main/java/org/hibernate/dialect/MySQLDialect.java 2009-10-16 16:21:02 UTC (rev 17782) @@ -281,6 +281,16 @@ return "create temporary table if not exists"; } + public String getDropTemporaryTableString() { + return "drop temporary table"; + } + + public Boolean performTemporaryTableDDLInIsolation() { + // because we [drop *temporary* table...] we do not + // have to perform these in isolation. + return Boolean.FALSE; + } + public String getCastTypeName(int code) { if ( code==Types.INTEGER ) { return "signed"; @@ -324,11 +334,7 @@ return true; } - public Boolean performTemporaryTableDDLInIsolation() { - return Boolean.FALSE; - } - // Overridden informational metadata ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public boolean supportsEmptyInList() { Modified: core/trunk/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java 2009-10-16 15:34:39 UTC (rev 17781) +++ core/trunk/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java 2009-10-16 16:21:02 UTC (rev 17782) @@ -28,7 +28,6 @@ import java.sql.Connection; import java.sql.Statement; import java.util.List; -import java.util.Iterator; import java.util.Collections; import org.hibernate.HibernateException; @@ -182,8 +181,10 @@ public void doWork(Connection connection) throws HibernateException { Statement stmnt = null; try { + final String command = session.getFactory().getSettings().getDialect().getDropTemporaryTableString() + + " " + persister.getTemporaryIdTableName(); stmnt = connection.createStatement(); - stmnt.executeUpdate( "drop table " + persister.getTemporaryIdTableName() ); + stmnt.executeUpdate( command ); } catch( Throwable t ) { log.warn( "unable to drop temporary id table after use [" + t.getMessage() + "]" );

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17781 - core/trunk/core/src/main/java/org/hibernate/engine/jdbc.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-10-16 11:34:39 -0400 (Fri, 16 Oct 2009) New Revision: 17781 Modified: core/trunk/core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java core/trunk/core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java Log: HHH-2412 - Support for JDBC4 Modified: core/trunk/core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java 2009-10-16 14:22:29 UTC (rev 17780) +++ core/trunk/core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java 2009-10-16 15:34:39 UTC (rev 17781) @@ -104,6 +104,15 @@ stream.close(); return null; } + if ( "toString".equals( method.getName() ) ) { + return this.toString(); + } + if ( "equals".equals( method.getName() ) ) { + return Boolean.valueOf( proxy == args[0] ); + } + if ( "hashCode".equals( method.getName() ) ) { + return new Integer( this.hashCode() ); + } throw new UnsupportedOperationException( "Blob may not be manipulated from creating session" ); } Modified: core/trunk/core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java 2009-10-16 14:22:29 UTC (rev 17780) +++ core/trunk/core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java 2009-10-16 15:34:39 UTC (rev 17781) @@ -106,6 +106,15 @@ reader.close(); return null; } + if ( "toString".equals( method.getName() ) ) { + return this.toString(); + } + if ( "equals".equals( method.getName() ) ) { + return Boolean.valueOf( proxy == args[0] ); + } + if ( "hashCode".equals( method.getName() ) ) { + return new Integer( this.hashCode() ); + } throw new UnsupportedOperationException( "Clob may not be manipulated from creating session" ); }

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17780 - in core/trunk: jdbc4-testing and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-10-16 10:22:29 -0400 (Fri, 16 Oct 2009) New Revision: 17780 Modified: core/trunk/cache-infinispan/pom.xml core/trunk/jdbc4-testing/pom.xml Log: HHH-4499 : JDK 1.6 and modules Modified: core/trunk/cache-infinispan/pom.xml =================================================================== --- core/trunk/cache-infinispan/pom.xml 2009-10-16 13:22:28 UTC (rev 17779) +++ core/trunk/cache-infinispan/pom.xml 2009-10-16 14:22:29 UTC (rev 17780) @@ -86,16 +86,17 @@ <configuration> <source>1.6</source> <target>1.6</target> + <compilerVersion>1.6</compilerVersion> + <executable>${jdk16_home}/bin/javac</executable> + <fork>true</fork> <verbose>true</verbose> - <fork>true</fork> - <executable>${jdbc4_jdk}/javac</executable> - <compilerVersion>1.6</compilerVersion> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <jvm>${jdk16_home}/bin/java</jvm> <excludes>  <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude> Modified: core/trunk/jdbc4-testing/pom.xml =================================================================== --- core/trunk/jdbc4-testing/pom.xml 2009-10-16 13:22:28 UTC (rev 17779) +++ core/trunk/jdbc4-testing/pom.xml 2009-10-16 14:22:29 UTC (rev 17780) @@ -31,11 +31,6 @@ <relativePath>../parent/pom.xml</relativePath> </parent> - <properties> -  - <jdbc4_jdk>/opt/java/jdk-1.6</jdbc4_jdk> - </properties> - <artifactId>hibernate-jdbc4-testing</artifactId> <name>JDBC4-JdbcSupport Testing</name> <description>Test support of JDBC4 through JdbcSupport</description> @@ -48,17 +43,17 @@ <configuration> <source>1.6</source> <target>1.6</target> - <verbose>true</verbose> - <fork>true</fork> - <executable>${jdbc4_jdk}/javac</executable> <compilerVersion>1.6</compilerVersion> + <executable>${jdk16_home}/bin/javac</executable> + <fork>true</fork> + <verbose>true</verbose> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <jvm>${jdbc4_jdk}/bin/java</jvm> + <jvm>${jdk16_home}/bin/java</jvm> </configuration> </plugin> </plugins>

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17779 - in core/trunk/annotations/src/test: java/org/hibernate/test/annotations/bytecode and 24 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-10-16 09:22:28 -0400 (Fri, 16 Oct 2009) New Revision: 17779 Added: core/trunk/annotations/src/test/resources/org/ core/trunk/annotations/src/test/resources/org/hibernate/ core/trunk/annotations/src/test/resources/org/hibernate/test/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml Removed: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java Log: HHH-4498 Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - - - -<hibernate-mapping package="org.hibernate.test.annotations"> - - <class name="Boat" table="BoatInXml"> - - <id name="id"> - <generator class="native"/> - </id> - - <property name="size" column="boat_size"/> - - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - - - -<hibernate-mapping package="org.hibernate.test.annotations"> - - <joined-subclass name="Ferry" table="FerryJoined" extends="org.hibernate.test.annotations.Boat"> - <key column="id"/> - <property name="sea"/> - - </joined-subclass> - -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping package="org.hibernate.test.annotations.bytecode"> - <class name="Hammer"> - <id name="id" type="java.lang.Long"> - <generator class="increment"/> - </id> - </class> -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entity-mappings - xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" - version="1.0"> -</entity-mappings> Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2009-10-16 13:22:28 UTC (rev 17779) @@ -16,8 +16,8 @@ try { cfg.addAnnotatedClass( Flight.class ); cfg.addAnnotatedClass( org.hibernate.test.annotations.Flight.class ); - cfg.addResource( "org/hibernate/test/annotations/orm.xml"); - cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml"); + cfg.addResource( "org/hibernate/test/annotations/orm.xml" ); + cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml" ); cfg.buildSessionFactory(); fail( "Should not be able to map the same entity name twice" ); } Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="1.0" - > - <table-generator name="EMP_GEN" table="GENERATOR_TABLE" - pk-column-name="pkey" pk-column-value="EMP" - value-column-name="hi" allocation-size="20"/> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,11 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> - <mapping resource="org/hibernate/test/annotations/Boat.hbm.xml"/> - <mapping package="org.hibernate.test.annotations"/> - <mapping class="org.hibernate.test.annotations.Plane"/> - </session-factory> -</hibernate-configuration> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping package="org.hibernate.test.annotations.inheritance.joined"> - - <class name="Parent"> - <id name="id"> - <generator class="native"/> - </id> - <set name="financialAssets" fetch="join" cascade="refresh" inverse="true"> - <key column="PARENT_ID"/> - <one-to-many class="FinancialAsset"/> - </set> - <set name="propertyAssets" fetch="join" cascade="refresh" inverse="true"> - <key column="PARENT_ID"/> - <one-to-many class="PropertyAsset"/> - </set> - </class> - <class name="Asset"> - <id name="id"> - <generator class="native"/> - </id> - <many-to-one name="parent" column="PARENT_ID" property-ref="parent"/> - <joined-subclass name="FinancialAsset"> - <key column="ID"/> - <property name="price"/> - </joined-subclass> - <joined-subclass name="PropertyAsset"> - <key column="ID"/> - <property name="price"/> - </joined-subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - - - -<hibernate-mapping package="org.hibernate.test.annotations.loader"> - - <sql-query name="loadByTeam"> - <load-collection alias="p" role="Team.players"/> - select {p.*} from Player p where p.team_id = ? - </sql-query> - -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="1.0" - > - <sequence-generator name="SEQ_GEN" sequence-name="my_sequence"/> - <table-generator name="EMP_GEN" table="GENERATOR_TABLE" - pk-column-name="pkey" pk-column-value="EMP" - value-column-name="hi" allocation-size="20"/> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="1.0" - > - <named-query name="plane.getAll"> - <query>select p from Plane p</query> - </named-query> - <named-native-query name="night.getAll.bySQL" result-set-mapping="sqlmapping"> - <query>select id, night_duration, night_date as dte, area_id from Night where night_duration > ?</query> - </named-native-query> - <named-native-query name="getAreaByNative" result-class="org.hibernate.test.annotations.query.Area"> - <query>select * from tbl_area</query> - </named-native-query> - <sql-result-set-mapping name="sqlmapping"> - <entity-result entity-class="org.hibernate.test.annotations.query.Night"> - <field-result name="id" column="id"/> - <field-result name="duration" column="night_duration"/> - <field-result name="date" column="dte"/> - <field-result name="area" column="area_id"/> - </entity-result> - </sql-result-set-mapping> -</entity-mappings> \ No newline at end of file Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java 2009-10-16 13:22:28 UTC (rev 17779) @@ -75,7 +75,8 @@ public class JPAOverridenAnnotationReaderTest extends TestCase { public void testMappedSuperclassAnnotations() throws Exception { XMLContext context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" + ); JPAOverridenAnnotationReader reader = new JPAOverridenAnnotationReader( Organization.class, context ); assertTrue( reader.isAnnotationPresent( MappedSuperclass.class ) ); } @@ -212,7 +213,8 @@ public void testEntityRelatedAnnotationsMetadataComplete() throws Exception { XMLContext context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" + ); JPAOverridenAnnotationReader reader = new JPAOverridenAnnotationReader( Administration.class, context ); assertNotNull( reader.getAnnotation( Entity.class ) ); assertEquals( @@ -269,7 +271,8 @@ assertEquals( TemporalType.DATE, reader.getAnnotation( Temporal.class ).value() ); context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" + ); method = Administration.class.getDeclaredMethod( "getId" ); reader = new JPAOverridenAnnotationReader( method, context ); assertNotNull( @@ -295,7 +298,8 @@ public void testBasicRelatedAnnotations() throws Exception { XMLContext context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" + ); Field field = BusTrip.class.getDeclaredField( "status" ); JPAOverridenAnnotationReader reader = new JPAOverridenAnnotationReader( field, context ); assertNotNull( reader.getAnnotation( Enumerated.class ) ); @@ -354,7 +358,8 @@ assertEquals( "test", reader.getAnnotation( OneToOne.class ).mappedBy() ); context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" + ); field = BusTrip.class.getDeclaredField( "players" ); reader = new JPAOverridenAnnotationReader( field, context ); assertNotNull( reader.getAnnotation( OneToMany.class ) ); Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java 2009-10-16 13:22:28 UTC (rev 17779) @@ -23,7 +23,8 @@ XMLHelper xmlHelper = new XMLHelper(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); InputStream is = cl.getResourceAsStream( - "org/hibernate/test/annotations/reflection/orm.xml" ); + "org/hibernate/test/annotations/reflection/orm.xml" + ); assertNotNull( "ORM.xml not found", is ); XMLContext context = new XMLContext(); List errors = new ArrayList(); Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" - version="1.0" - > - <persistence-unit-metadata> - <xml-mapping-metadata-complete/> - <persistence-unit-defaults> - <schema>myschema</schema> - <catalog>mycatalog</catalog> - <cascade-persist/> - </persistence-unit-defaults> - </persistence-unit-metadata> - <package>org.hibernate.test.annotations.reflection</package> - <mapped-superclass class="Organization"> - <attributes> - <basic name="organizationId"/> - </attributes> - </mapped-superclass> - <entity class="Administration"> - <attributes> - <id name="id"/> - </attributes> - </entity> - <entity class="Match"> - </entity> - <entity class="SocialSecurityMoralAccount"/> - <entity class="BusTrip" access="FIELD"> - <attributes> - <embedded-id name="id"> - <attribute-override name="busDriver"> - <column name="fld_busdriver"/> - </attribute-override> - </embedded-id> - <basic name="status" optional="false"> - <enumerated>STRING</enumerated> - </basic> - <basic name="serial" optional="true"> - <column name="serialbytes"/> - <lob/> - </basic> - <basic name="terminusTime" fetch="LAZY"> - <temporal>TIMESTAMP</temporal> - </basic> - <one-to-many name="players"> - <map-key name="name"/> - <join-column name="driver"/> - <join-column name="number"/> - </one-to-many> - <many-to-many name="roads" target-entity="Administration"> - <order-by>maxSpeed</order-by> - <join-table name="bus_road"> - <join-column name="driver"/> - <join-column name="number"/> - <inverse-join-column name="road_id"/> - <unique-constraint> - <column-name>driver</column-name> - <column-name>number</column-name> - </unique-constraint> - </join-table> - </many-to-many> - </attributes> - </entity> - <embeddable class="BusTripPk" access="FIELD"> - <attributes> - <basic name="busDriver"> - <column name="busdriver"/> - </basic> - <basic name="busNumber"> - <column name="busnumber"/> - </basic> - </attributes> - </embeddable> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" - version="1.0" - > - <persistence-unit-metadata> - <persistence-unit-defaults> - <schema>myschema</schema> - <catalog>mycatalog</catalog> - <cascade-persist/> - <entity-listeners> - <entity-listener class="org.hibernate.test.annotations.reflection.OtherLogListener"> - <post-update method-name="log"/> - </entity-listener> - </entity-listeners> - </persistence-unit-defaults> - </persistence-unit-metadata> - <package>org.hibernate.test.annotations.reflection</package> - <entity class="Administration"> - <table name="tbl_admin"> - <unique-constraint> - <column-name>firstname</column-name> - <column-name>lastname</column-name> - </unique-constraint> - </table> - <secondary-table name="admin2"> - <primary-key-join-column name="admin_id" referenced-column-name="id"/> - <unique-constraint> - <column-name>address</column-name> - </unique-constraint> - </secondary-table> - <sequence-generator name="seqhilo" sequence-name="seqhilo"/> - <table-generator name="table" table="tablehilo"/> - <entity-listeners> - <entity-listener class="LogListener"> - <pre-persist method-name="log"/> - <post-load method-name="noLog"/> - </entity-listener> - </entity-listeners> - <pre-persist method-name="calculate"/> - <attributes> - <id name="id"> - <column name="fld_id"/> - <generated-value generator="generator" strategy="SEQUENCE"/> - <temporal>DATE</temporal> - <sequence-generator name="generator" sequence-name="seq"/> - </id> - <version name="version"/> - <one-to-one name="defaultBusTrip" fetch="LAZY" mapped-by="test"> - <primary-key-join-column name="pk"/> - <cascade> - <cascade-all/> - <cascade-persist/> - <cascade-merge/> - <cascade-remove/> - <cascade-refresh/> - </cascade> - </one-to-one> - <transient name="transientField"/> - </attributes> - </entity> - <entity class="Match"> - <inheritance strategy="JOINED"/> - <named-query name="allmatches"> - <query>select m from Match m</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-query> - <named-query name="matchbyid"> - <query>select m from Match m where m.id = :id</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-query> - <named-native-query name="allmatches" result-set-mapping="matchrs"> - <query>select m from Match m</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-native-query> - <named-native-query name="matchbyid" result-set-mapping="matchrs"> - <query>select m from Match m where m.id = :id</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-native-query> - <sql-result-set-mapping name="matchrs"> - <entity-result entity-class="org.hibernate.test.annotations.reflection.Match"> - <field-result name="competitor1Point" column="competitor1Point"/> - </entity-result> - <column-result name="competitor1Point"/> - </sql-result-set-mapping> - <exclude-default-listeners/> - <exclude-superclass-listeners/> - <entity-listeners> - <entity-listener class="LogListener"> - <pre-persist method-name="log"/> - <post-load method-name="noLog"/> - </entity-listener> - </entity-listeners> - <attributes> - <embedded name="playerASSN"/> - </attributes> - </entity> - <entity class="TennisMatch"> - <primary-key-join-column name="id"/> - <attribute-override name="net"> - <column name="fld_net"/> - </attribute-override> - <attribute-override name="ground"> - <column name="fld_ground" unique="true" scale="2"/> - </attribute-override> - <association-override name="referer"> - <join-column name="referer_id" referenced-column-name="id"/> - </association-override> - </entity> - <entity class="SocialSecurityPhysicalAccount"> - <id-class class="org.hibernate.test.annotations.reflection.SocialSecurityNumber"/> - <discriminator-value>Physical</discriminator-value> - <discriminator-column length="34"/> - </entity> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="1.0" - > -  - <persistence-unit-metadata> - <persistence-unit-defaults> - <cascade-persist/> - </persistence-unit-defaults> - </persistence-unit-metadata> - <package>org.hibernate.test.annotations.xml.ejb3</package> - <table-generator name="generator" table="table_id"/> - <named-query name="manufacturer.findAll"> - <query>select m from Manufacturer m</query> - </named-query> - <entity class="Model" access="PROPERTY" name="ModelZ" metadata-complete="true"> - <table name="ModelZ"> - </table> - <inheritance strategy="JOINED"/> - <attributes> - <id name="id"> - <column name="fld_id"/> - <generated-value strategy="TABLE" generator="generator"/> - </id> - <basic name="unknownProperty"/> - <many-to-one name="manufacturer" fetch="LAZY"> - <join-column name="manufacturer_pk"/> - </many-to-one> - </attributes> - </entity> - <entity class="CarModel" metadata-complete="true"> - <primary-key-join-column name="model_id"/> - <inheritance strategy="JOINED"/> - <named-query name="allModelsPerManufacturer"> - <query>from ModelZ m where m.manufacturer = :manufacturer</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-query> - <exclude-default-listeners/> - <exclude-superclass-listeners/> - <attributes> - <basic name="year" optional="false"> - <temporal>DATE</temporal> - </basic> - </attributes> - </entity> - <entity class="Manufacturer"> - <attributes> - <id name="id"> - <generated-value strategy="AUTO"/> - </id> - <one-to-many name="models" mapped-by="manufacturer"/> - </attributes> - </entity> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" - version="1.0" - > - <package>org.hibernate.test.annotations.xml.ejb3</package> - <entity class="Light" access="FIELD" metadata-complete="true"> - <attributes> - <id name="name"> - <column name="fld_id"/> - </id> - <basic name="power"></basic> - </attributes> - </entity> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" - version="1.0" - > - <package>org.hibernate.test.annotations.xml.ejb3</package> - <entity class="Lighter" access="FIELD" metadata-complete="true"> - <attributes> - <id name="name"> - <column name="fld_id"/> - </id> - <basic name="power"></basic> - </attributes> - </entity> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping> - <class name="org.hibernate.test.annotations.xml.hbm.AImpl" table="A" - proxy="org.hibernate.test.annotations.xml.hbm.A"> - <id name="AId" column="aID" type="java.lang.Integer"> - <generator class="identity"/> - </id> - </class> -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping> - <joined-subclass name="org.hibernate.test.annotations.xml.hbm.BImpl" table="B" - proxy="org.hibernate.test.annotations.xml.hbm.B" - extends="org.hibernate.test.annotations.xml.hbm.AImpl"> - <key column="aID"/> - <property name="BId" column="bID" type="java.lang.Integer" - not-null="true"/> - </joined-subclass> -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping package="org.hibernate.test.annotations.xml.hbm"> - - <class name="CloudType"> - <id name="id"> - <generator class="native"/> - </id> - <property name="name"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping package="org.hibernate.test.annotations.xml.hbm"> - - <class name="Government"> - <id name="id"> - <generator class="native"/> - </id> - <property name="name"/> - <many-to-one name="primeMinister" column="primeMinister_id"/> - </class> - -</hibernate-mapping> \ No newline at end of file Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2009-10-16 13:02:53 UTC (rev 17778) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2009-10-16 13:22:28 UTC (rev 17779) @@ -8,6 +8,7 @@ * @author Emmanuel Bernard */ public class HbmWithIdentityTest extends TestCase { + public void testManyToOneAndInterface() throws Exception { Session s = openSession(); s.getTransaction().begin(); @@ -21,16 +22,14 @@ s.getTransaction().rollback(); s.close(); } - + @Override protected boolean runForCurrentDialect() { return super.runForCurrentDialect() && getDialect().supportsIdentityColumns(); } - - protected Class[] getMappings() { - return new Class[]{ + return new Class[] { Sky.class, ZImpl.class @@ -39,9 +38,10 @@ @Override protected String[] getXmlFiles() { - return new String[]{ + return new String[] { "org/hibernate/test/annotations/xml/hbm/A.hbm.xml", - "org/hibernate/test/annotations/xml/hbm/B.hbm.xml" + "org/hibernate/test/annotations/xml/hbm/B.hbm.xml", + "org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml" }; } } Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + + + +<hibernate-mapping package="org.hibernate.test.annotations"> + + <class name="Boat" table="BoatInXml"> + + <id name="id"> + <generator class="native"/> + </id> + + <property name="size" column="boat_size"/> + + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + + + +<hibernate-mapping package="org.hibernate.test.annotations"> + + <joined-subclass name="Ferry" table="FerryJoined" extends="org.hibernate.test.annotations.Boat"> + <key column="id"/> + <property name="sea"/> + + </joined-subclass> + +</hibernate-mapping> \ No newline at end of file Property changes on: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.hibernate.test.annotations.bytecode"> + <class name="Hammer"> + <id name="id" type="java.lang.Long"> + <generator class="increment"/> + </id> + </class> +</hibernate-mapping> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<entity-mappings + xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" + version="1.0"> +</entity-mappings> Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + > + <table-generator name="EMP_GEN" table="GENERATOR_TABLE" + pk-column-name="pkey" pk-column-value="EMP" + value-column-name="hi" allocation-size="20"/> +</entity-mappings> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,11 @@ +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + <mapping resource="org/hibernate/test/annotations/Boat.hbm.xml"/> + <mapping package="org.hibernate.test.annotations"/> + <mapping class="org.hibernate.test.annotations.Plane"/> + </session-factory> +</hibernate-configuration> \ No newline at end of file Property changes on: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,36 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.hibernate.test.annotations.inheritance.joined"> + + <class name="Parent"> + <id name="id"> + <generator class="native"/> + </id> + <set name="financialAssets" fetch="join" cascade="refresh" inverse="true"> + <key column="PARENT_ID"/> + <one-to-many class="FinancialAsset"/> + </set> + <set name="propertyAssets" fetch="join" cascade="refresh" inverse="true"> + <key column="PARENT_ID"/> + <one-to-many class="PropertyAsset"/> + </set> + </class> + <class name="Asset"> + <id name="id"> + <generator class="native"/> + </id> + <many-to-one name="parent" column="PARENT_ID" property-ref="parent"/> + <joined-subclass name="FinancialAsset"> + <key column="ID"/> + <property name="price"/> + </joined-subclass> + <joined-subclass name="PropertyAsset"> + <key column="ID"/> + <property name="price"/> + </joined-subclass> + </class> + +</hibernate-mapping> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + + + +<hibernate-mapping package="org.hibernate.test.annotations.loader"> + + <sql-query name="loadByTeam"> + <load-collection alias="p" role="Team.players"/> + select {p.*} from Player p where p.team_id = ? + </sql-query> + +</hibernate-mapping> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + > + <sequence-generator name="SEQ_GEN" sequence-name="my_sequence"/> + <table-generator name="EMP_GEN" table="GENERATOR_TABLE" + pk-column-name="pkey" pk-column-value="EMP" + value-column-name="hi" allocation-size="20"/> +</entity-mappings> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + > + <named-query name="plane.getAll"> + <query>select p from Plane p</query> + </named-query> + <named-native-query name="night.getAll.bySQL" result-set-mapping="sqlmapping"> + <query>select id, night_duration, night_date as dte, area_id from Night where night_duration > ?</query> + </named-native-query> + <named-native-query name="getAreaByNative" result-class="org.hibernate.test.annotations.query.Area"> + <query>select * from tbl_area</query> + </named-native-query> + <sql-result-set-mapping name="sqlmapping"> + <entity-result entity-class="org.hibernate.test.annotations.query.Night"> + <field-result name="id" column="id"/> + <field-result name="duration" column="night_duration"/> + <field-result name="date" column="dte"/> + <field-result name="area" column="area_id"/> + </entity-result> + </sql-result-set-mapping> +</entity-mappings> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" + version="1.0" + > + <persistence-unit-metadata> + <xml-mapping-metadata-complete/> + <persistence-unit-defaults> + <schema>myschema</schema> + <catalog>mycatalog</catalog> + <cascade-persist/> + </persistence-unit-defaults> + </persistence-unit-metadata> + <package>org.hibernate.test.annotations.reflection</package> + <mapped-superclass class="Organization"> + <attributes> + <basic name="organizationId"/> + </attributes> + </mapped-superclass> + <entity class="Administration"> + <attributes> + <id name="id"/> + </attributes> + </entity> + <entity class="Match"> + </entity> + <entity class="SocialSecurityMoralAccount"/> + <entity class="BusTrip" access="FIELD"> + <attributes> + <embedded-id name="id"> + <attribute-override name="busDriver"> + <column name="fld_busdriver"/> + </attribute-override> + </embedded-id> + <basic name="status" optional="false"> + <enumerated>STRING</enumerated> + </basic> + <basic name="serial" optional="true"> + <column name="serialbytes"/> + <lob/> + </basic> + <basic name="terminusTime" fetch="LAZY"> + <temporal>TIMESTAMP</temporal> + </basic> + <one-to-many name="players"> + <map-key name="name"/> + <join-column name="driver"/> + <join-column name="number"/> + </one-to-many> + <many-to-many name="roads" target-entity="Administration"> + <order-by>maxSpeed</order-by> + <join-table name="bus_road"> + <join-column name="driver"/> + <join-column name="number"/> + <inverse-join-column name="road_id"/> + <unique-constraint> + <column-name>driver</column-name> + <column-name>number</column-name> + </unique-constraint> + </join-table> + </many-to-many> + </attributes> + </entity> + <embeddable class="BusTripPk" access="FIELD"> + <attributes> + <basic name="busDriver"> + <column name="busdriver"/> + </basic> + <basic name="busNumber"> + <column name="busnumber"/> + </basic> + </attributes> + </embeddable> +</entity-mappings> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" + version="1.0" + > + <persistence-unit-metadata> + <persistence-unit-defaults> + <schema>myschema</schema> + <catalog>mycatalog</catalog> + <cascade-persist/> + <entity-listeners> + <entity-listener class="org.hibernate.test.annotations.reflection.OtherLogListener"> + <post-update method-name="log"/> + </entity-listener> + </entity-listeners> + </persistence-unit-defaults> + </persistence-unit-metadata> + <package>org.hibernate.test.annotations.reflection</package> + <entity class="Administration"> + <table name="tbl_admin"> + <unique-constraint> + <column-name>firstname</column-name> + <column-name>lastname</column-name> + </unique-constraint> + </table> + <secondary-table name="admin2"> + <primary-key-join-column name="admin_id" referenced-column-name="id"/> + <unique-constraint> + <column-name>address</column-name> + </unique-constraint> + </secondary-table> + <sequence-generator name="seqhilo" sequence-name="seqhilo"/> + <table-generator name="table" table="tablehilo"/> + <entity-listeners> + <entity-listener class="LogListener"> + <pre-persist method-name="log"/> + <post-load method-name="noLog"/> + </entity-listener> + </entity-listeners> + <pre-persist method-name="calculate"/> + <attributes> + <id name="id"> + <column name="fld_id"/> + <generated-value generator="generator" strategy="SEQUENCE"/> + <temporal>DATE</temporal> + <sequence-generator name="generator" sequence-name="seq"/> + </id> + <version name="version"/> + <one-to-one name="defaultBusTrip" fetch="LAZY" mapped-by="test"> + <primary-key-join-column name="pk"/> + <cascade> + <cascade-all/> + <cascade-persist/> + <cascade-merge/> + <cascade-remove/> + <cascade-refresh/> + </cascade> + </one-to-one> + <transient name="transientField"/> + </attributes> + </entity> + <entity class="Match"> + <inheritance strategy="JOINED"/> + <named-query name="allmatches"> + <query>select m from Match m</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-query> + <named-query name="matchbyid"> + <query>select m from Match m where m.id = :id</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-query> + <named-native-query name="allmatches" result-set-mapping="matchrs"> + <query>select m from Match m</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-native-query> + <named-native-query name="matchbyid" result-set-mapping="matchrs"> + <query>select m from Match m where m.id = :id</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-native-query> + <sql-result-set-mapping name="matchrs"> + <entity-result entity-class="org.hibernate.test.annotations.reflection.Match"> + <field-result name="competitor1Point" column="competitor1Point"/> + </entity-result> + <column-result name="competitor1Point"/> + </sql-result-set-mapping> + <exclude-default-listeners/> + <exclude-superclass-listeners/> + <entity-listeners> + <entity-listener class="LogListener"> + <pre-persist method-name="log"/> + <post-load method-name="noLog"/> + </entity-listener> + </entity-listeners> + <attributes> + <embedded name="playerASSN"/> + </attributes> + </entity> + <entity class="TennisMatch"> + <primary-key-join-column name="id"/> + <attribute-override name="net"> + <column name="fld_net"/> + </attribute-override> + <attribute-override name="ground"> + <column name="fld_ground" unique="true" scale="2"/> + </attribute-override> + <association-override name="referer"> + <join-column name="referer_id" referenced-column-name="id"/> + </association-override> + </entity> + <entity class="SocialSecurityPhysicalAccount"> + <id-class class="org.hibernate.test.annotations.reflection.SocialSecurityNumber"/> + <discriminator-value>Physical</discriminator-value> + <discriminator-column length="34"/> + </entity> +</entity-mappings> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + > +  + <persistence-unit-metadata> + <persistence-unit-defaults> + <cascade-persist/> + </persistence-unit-defaults> + </persistence-unit-metadata> + <package>org.hibernate.test.annotations.xml.ejb3</package> + <table-generator name="generator" table="table_id"/> + <named-query name="manufacturer.findAll"> + <query>select m from Manufacturer m</query> + </named-query> + <entity class="Model" access="PROPERTY" name="ModelZ" metadata-complete="true"> + <table name="ModelZ"> + </table> + <inheritance strategy="JOINED"/> + <attributes> + <id name="id"> + <column name="fld_id"/> + <generated-value strategy="TABLE" generator="generator"/> + </id> + <basic name="unknownProperty"/> + <many-to-one name="manufacturer" fetch="LAZY"> + <join-column name="manufacturer_pk"/> + </many-to-one> + </attributes> + </entity> + <entity class="CarModel" metadata-complete="true"> + <primary-key-join-column name="model_id"/> + <inheritance strategy="JOINED"/> + <named-query name="allModelsPerManufacturer"> + <query>from ModelZ m where m.manufacturer = :manufacturer</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-query> + <exclude-default-listeners/> + <exclude-superclass-listeners/> + <attributes> + <basic name="year" optional="false"> + <temporal>DATE</temporal> + </basic> + </attributes> + </entity> + <entity class="Manufacturer"> + <attributes> + <id name="id"> + <generated-value strategy="AUTO"/> + </id> + <one-to-many name="models" mapped-by="manufacturer"/> + </attributes> + </entity> +</entity-mappings> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" + version="1.0" + > + <package>org.hibernate.test.annotations.xml.ejb3</package> + <entity class="Light" access="FIELD" metadata-complete="true"> + <attributes> + <id name="name"> + <column name="fld_id"/> + </id> + <basic name="power"></basic> + </attributes> + </entity> +</entity-mappings> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" + version="1.0" + > + <package>org.hibernate.test.annotations.xml.ejb3</package> + <entity class="Lighter" access="FIELD" metadata-complete="true"> + <attributes> + <id name="name"> + <column name="fld_id"/> + </id> + <basic name="power"></basic> + </attributes> + </entity> +</entity-mappings> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + <class name="org.hibernate.test.annotations.xml.hbm.AImpl" table="A" + proxy="org.hibernate.test.annotations.xml.hbm.A"> + <id name="AId" column="aID" type="java.lang.Integer"> + <generator class="identity"/> + </id> + </class> +</hibernate-mapping> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + <joined-subclass name="org.hibernate.test.annotations.xml.hbm.BImpl" table="B" + proxy="org.hibernate.test.annotations.xml.hbm.B" + extends="org.hibernate.test.annotations.xml.hbm.AImpl"> + <key column="aID"/> + <property name="BId" column="bID" type="java.lang.Integer" + not-null="true"/> + </joined-subclass> +</hibernate-mapping> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.hibernate.test.annotations.xml.hbm"> + + <class name="CloudType"> + <id name="id"> + <generator class="native"/> + </id> + <property name="name"/> + </class> + +</hibernate-mapping> \ No newline at end of file Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml) =================================================================== --- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml (rev 0) +++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml 2009-10-16 13:22:28 UTC (rev 17779) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.hibernate.test.annotations.xml.hbm"> + + <class name="Government"> + <id name="id"> + <generator class="native"/> + </id> + <property name="name"/> + <many-to-one name="primeMinister" column="primeMinister_id"/> + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17778 - in core/trunk/annotations/src/test/java/org/hibernate/test/annotations: manytoonewithformula and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-10-16 09:02:53 -0400 (Fri, 16 Oct 2009) New Revision: 17778 Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/SkipForDialect.java Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java Log: HHH-4497 Skipping ManyToOneWithFormulaTest.testManyToOneToPkWithOnlyFormula for now. Added a SkipForDialectAnnotation as counterpart for RequiresDialect Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/SkipForDialect.java (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/RequiresDialect.java) =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/SkipForDialect.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/SkipForDialect.java 2009-10-16 13:02:53 UTC (rev 17778) @@ -0,0 +1,22 @@ +// $Id$ +package org.hibernate.test.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.hibernate.dialect.Dialect; + +/** + * Annotations used to mark a test to be specific to a given dialect. + * + * @author Hardy Ferentschik + */ +@Target({ ElementType.METHOD, ElementType.TYPE }) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface SkipForDialect { + Class<? extends Dialect>[] value(); + + String comment(); +} \ No newline at end of file Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java 2009-10-16 12:35:19 UTC (rev 17777) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java 2009-10-16 13:02:53 UTC (rev 17778) @@ -56,6 +56,11 @@ */ private final Set<Class<? extends Dialect>> requiredDialectList = new HashSet<Class<? extends Dialect>>(); + /** + * List of dialects for which the current {@code runMethod} should be skipped. + */ + private final Set<Class<? extends Dialect>> skipForDialectList = new HashSet<Class<? extends Dialect>>(); + public TestCase() { super(); } @@ -121,6 +126,7 @@ private void setRunTestFlag(Method runMethod) { updateRequiredDialectList( runMethod ); + updateSkipForDialectList( runMethod ); if ( runForCurrentDialect() ) { runTest = true; @@ -150,19 +156,44 @@ } } + private void updateSkipForDialectList(Method runMethod) { + skipForDialectList.clear(); + + SkipForDialect skipForDialectMethodAnn = runMethod.getAnnotation( SkipForDialect.class ); + if ( skipForDialectMethodAnn != null ) { + Class<? extends Dialect>[] skipDialects = skipForDialectMethodAnn.value(); + skipForDialectList.addAll( Arrays.asList( skipDialects ) ); + } + + SkipForDialect skipForDialectClassAnn = getClass().getAnnotation( SkipForDialect.class ); + if ( skipForDialectClassAnn != null ) { + Class<? extends Dialect>[] skipDialects = skipForDialectClassAnn.value(); + skipForDialectList.addAll( Arrays.asList( skipDialects ) ); + } + } + protected boolean runForCurrentDialect() { - if ( requiredDialectList.isEmpty() ) { - return true; + boolean runTestForCurrentDialect = true; + + // check whether the current dialect is assignableFrom from any of the specified required dialects. + for ( Class<? extends Dialect> dialect : requiredDialectList ) { + if ( dialect.isAssignableFrom( Dialect.getDialect().getClass() ) ) { + runTestForCurrentDialect = true; + break; + } + runTestForCurrentDialect = false; } - else { - // check whether the current dialect is assignableFrom from any of the specified required dialects. - for ( Class<? extends Dialect> dialect : requiredDialectList ) { - if ( dialect.isAssignableFrom( Dialect.getDialect().getClass() ) ) { - return true; - } + + // check whether the current dialect is assignableFrom from any of the specified skip for dialects. + for ( Class<? extends Dialect> dialect : skipForDialectList ) { + if ( dialect.isAssignableFrom( Dialect.getDialect().getClass() ) ) { + runTestForCurrentDialect = false; + break; } - return false; + runTestForCurrentDialect = true; } + + return runTestForCurrentDialect; } private void runTestMethod(Method runMethod) throws Throwable { Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java 2009-10-16 12:35:19 UTC (rev 17777) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java 2009-10-16 13:02:53 UTC (rev 17778) @@ -24,11 +24,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ - package org.hibernate.test.annotations.manytoonewithformula; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.dialect.HSQLDialect; +import org.hibernate.test.annotations.SkipForDialect; import org.hibernate.test.annotations.TestCase; /** @@ -39,13 +40,13 @@ public ManyToOneWithFormulaTest(String x) { super( x ); } - + public void testManyToOneFromNonPk() throws Exception { Session s = openSession(); Transaction tx = s.beginTransaction(); Menu menu = new Menu(); menu.setOrderNbr( "123" ); - menu.setDefault("F"); + menu.setDefault( "F" ); s.persist( menu ); FoodItem foodItem = new FoodItem(); foodItem.setItem( "Mouse" ); @@ -53,65 +54,66 @@ s.persist( foodItem ); s.flush(); s.clear(); - foodItem = (FoodItem) s.get( FoodItem.class, foodItem.getId() ); + foodItem = ( FoodItem ) s.get( FoodItem.class, foodItem.getId() ); assertNotNull( foodItem.getOrder() ); assertEquals( "123", foodItem.getOrder().getOrderNbr() ); tx.rollback(); s.close(); } - + public void testManyToOneFromPk() throws Exception { Session s = openSession(); Transaction tx = s.beginTransaction(); - + Company company = new Company(); s.persist( company ); - + Person person = new Person(); - person.setDefaultFlag("T"); - person.setCompanyId(company.getId()); - s.persist(person); - + person.setDefaultFlag( "T" ); + person.setCompanyId( company.getId() ); + s.persist( person ); + s.flush(); s.clear(); - - company = (Company) s.get( Company.class, company.getId() ); + + company = ( Company ) s.get( Company.class, company.getId() ); assertNotNull( company.getDefaultContactPerson() ); assertEquals( person.getId(), company.getDefaultContactPerson().getId() ); tx.rollback(); s.close(); } + @SkipForDialect(value = { HSQLDialect.class }, comment = "The used join conditions does not work in HSQLDB. See HHH-4497") public void testManyToOneToPkWithOnlyFormula() throws Exception { Session s = openSession(); Transaction tx = s.beginTransaction(); - + Language language = new Language(); - language.setCode("EN"); - language.setName("English"); + language.setCode( "EN" ); + language.setName( "English" ); s.persist( language ); - + Message msg = new Message(); - msg.setLanguageCode("en"); - msg.setLanguageName("English"); - s.persist(msg); - + msg.setLanguageCode( "en" ); + msg.setLanguageName( "English" ); + s.persist( msg ); + s.flush(); s.clear(); - - msg = (Message) s.get( Message.class, msg.getId() ); - assertNotNull( msg.getLanguage()); + + msg = ( Message ) s.get( Message.class, msg.getId() ); + assertNotNull( msg.getLanguage() ); assertEquals( "EN", msg.getLanguage().getCode() ); tx.rollback(); s.close(); } - + /** * @see org.hibernate.test.annotations.TestCase#getMappings() */ protected java.lang.Class<?>[] getMappings() { - return new java.lang.Class[]{ + return new java.lang.Class[] { Menu.class, FoodItem.class, Company.class,

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17777 - search/branches/v3_1_1_GA_CP.

by hibernate-commits＠lists.jboss.org

Author: jcosta(a)redhat.com Date: 2009-10-16 08:35:19 -0400 (Fri, 16 Oct 2009) New Revision: 17777 Modified: search/branches/v3_1_1_GA_CP/pom.xml Log: HSEARCH-404 - Updated database profiles in pom.xml Modified: search/branches/v3_1_1_GA_CP/pom.xml =================================================================== --- search/branches/v3_1_1_GA_CP/pom.xml 2009-10-16 12:32:50 UTC (rev 17776) +++ search/branches/v3_1_1_GA_CP/pom.xml 2009-10-16 12:35:19 UTC (rev 17777) @@ -297,93 +297,98 @@ <jdbc.isolation/> </properties> </profile> +  + +  <profile> - <id>postgresql</id> + <id>mysql5</id> <dependencies> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-603.jdbc3</version> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> </dependency> </dependencies> <properties> - <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> - <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://localhost:5432/hibernate</jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> + +  <profile> - <id>mysql</id> + <id>mysql51</id> <dependencies> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> + <version>5.0.5</version> </dependency> </dependencies> <properties> <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql://localhost/hibernate</jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> + +  <profile> - <id>sqlserver</id> + <id>mysql51-cluster</id> <dependencies> <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>1.2</version> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.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://ec2-67-202-7-25.compute-1.amazonaws.com:1433;DatabaseName=hibernate - </jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> -  - -  +  <profile> - <id>mysql5</id> + <id>postgresql824</id> <dependencies> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504</version> + <classifier>jdbc3</classifier> </dependency> </dependencies> <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/hibbr330</jdbc.url> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> -  +  <profile> - <id>postgresql823</id> + <id>postgresql837</id> <dependencies> <dependency> <groupId>postgresql</groupId> @@ -395,7 +400,7 @@ <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:hibbr330</jdbc.url> + <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> @@ -433,19 +438,19 @@ </properties> </profile> -  +  <profile> <id>db2v91</id> <dependencies> <dependency> <groupId>com.ibm</groupId> <artifactId>db2jcc</artifactId> - <version>3.1.57</version> + <version>3.8.47</version> </dependency> <dependency> <groupId>com.ibm</groupId> <artifactId>db2jcc_license_cu</artifactId> - <version>3.1.57</version> + <version>3.8.47</version> </dependency> </dependencies> <properties> @@ -458,6 +463,31 @@ </properties> </profile> +  + <profile> + <id>db2v97</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.57.82</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.57.82</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://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  <profile> <id>oracle9i</id> @@ -493,13 +523,53 @@ <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.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> +  + <profile> + <id>oracle11g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</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:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> + +  + <profile> + <id>oracle11gRAC</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</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:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  <profile> <id>sybase15</id> @@ -513,7 +583,7 @@ <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/hibbr330</jdbc.url> + <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbr330</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> @@ -540,6 +610,26 @@ </properties> </profile> +  + <profile> + <id>mssql2008</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> +

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17776 - search/trunk.

by hibernate-commits＠lists.jboss.org

Author: jcosta(a)redhat.com Date: 2009-10-16 08:32:50 -0400 (Fri, 16 Oct 2009) New Revision: 17776 Modified: search/trunk/pom.xml Log: HSEARCH-404 - Updated database profiles in pom.xml Modified: search/trunk/pom.xml =================================================================== --- search/trunk/pom.xml 2009-10-16 12:32:24 UTC (rev 17775) +++ search/trunk/pom.xml 2009-10-16 12:32:50 UTC (rev 17776) @@ -349,93 +349,98 @@ <jdbc.isolation/> </properties> </profile> +  + +  <profile> - <id>postgresql</id> + <id>mysql5</id> <dependencies> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-603.jdbc3</version> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> </dependency> </dependencies> <properties> - <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> - <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://localhost:5432/hibernate</jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> + +  <profile> - <id>mysql</id> + <id>mysql51</id> <dependencies> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> + <version>5.0.5</version> </dependency> </dependencies> <properties> <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql://localhost/hibernate</jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> + +  <profile> - <id>sqlserver</id> + <id>mysql51-cluster</id> <dependencies> <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>1.2</version> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.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://ec2-67-202-7-25.compute-1.amazonaws.com:1433;DatabaseName=hibernate - </jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> -  - -  +  <profile> - <id>mysql5</id> + <id>postgresql824</id> <dependencies> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504</version> + <classifier>jdbc3</classifier> </dependency> </dependencies> <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/hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> -  +  <profile> - <id>postgresql823</id> + <id>postgresql837</id> <dependencies> <dependency> <groupId>postgresql</groupId> @@ -447,9 +452,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:hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> @@ -479,37 +484,62 @@ <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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> -  +  <profile> <id>db2v91</id> <dependencies> <dependency> <groupId>com.ibm</groupId> <artifactId>db2jcc</artifactId> - <version>3.1.57</version> + <version>3.8.47</version> </dependency> <dependency> <groupId>com.ibm</groupId> <artifactId>db2jcc_license_cu</artifactId> - <version>3.1.57</version> + <version>3.8.47</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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> +  + <profile> + <id>db2v97</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.57.82</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.57.82</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://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  <profile> <id>oracle9i</id> @@ -525,8 +555,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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> @@ -545,13 +575,53 @@ <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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> +  + <profile> + <id>oracle11g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</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:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> + +  + <profile> + <id>oracle11gRAC</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</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:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  <profile> <id>sybase15</id> @@ -565,9 +635,9 @@ <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/hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> @@ -586,12 +656,32 @@ <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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation>4096</jdbc.isolation> </properties> </profile> +  + <profile> + <id>mssql2008</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> +

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17775 - search/branches/Branch_3_1.

by hibernate-commits＠lists.jboss.org

Author: jcosta(a)redhat.com Date: 2009-10-16 08:32:24 -0400 (Fri, 16 Oct 2009) New Revision: 17775 Modified: search/branches/Branch_3_1/pom.xml Log: HSEARCH-404 - Updated database profiles in pom.xml Modified: search/branches/Branch_3_1/pom.xml =================================================================== --- search/branches/Branch_3_1/pom.xml 2009-10-16 12:10:32 UTC (rev 17774) +++ search/branches/Branch_3_1/pom.xml 2009-10-16 12:32:24 UTC (rev 17775) @@ -297,93 +297,98 @@ <jdbc.isolation/> </properties> </profile> +  + +  <profile> - <id>postgresql</id> + <id>mysql5</id> <dependencies> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-603.jdbc3</version> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> </dependency> </dependencies> <properties> - <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> - <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://localhost:5432/hibernate</jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> + +  <profile> - <id>mysql</id> + <id>mysql51</id> <dependencies> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> + <version>5.0.5</version> </dependency> </dependencies> <properties> <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql://localhost/hibernate</jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> + +  <profile> - <id>sqlserver</id> + <id>mysql51-cluster</id> <dependencies> <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>1.2</version> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.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://ec2-67-202-7-25.compute-1.amazonaws.com:1433;DatabaseName=hibernate - </jdbc.url> - <jdbc.user>hibernate</jdbc.user> - <jdbc.pass>hibernate</jdbc.pass> + <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> -  - -  +  <profile> - <id>mysql5</id> + <id>postgresql824</id> <dependencies> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504</version> + <classifier>jdbc3</classifier> </dependency> </dependencies> <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/hibbr330</jdbc.url> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> -  +  <profile> - <id>postgresql823</id> + <id>postgresql837</id> <dependencies> <dependency> <groupId>postgresql</groupId> @@ -395,7 +400,7 @@ <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:hibbr330</jdbc.url> + <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> @@ -433,19 +438,19 @@ </properties> </profile> -  +  <profile> <id>db2v91</id> <dependencies> <dependency> <groupId>com.ibm</groupId> <artifactId>db2jcc</artifactId> - <version>3.1.57</version> + <version>3.8.47</version> </dependency> <dependency> <groupId>com.ibm</groupId> <artifactId>db2jcc_license_cu</artifactId> - <version>3.1.57</version> + <version>3.8.47</version> </dependency> </dependencies> <properties> @@ -458,6 +463,31 @@ </properties> </profile> +  + <profile> + <id>db2v97</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.57.82</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.57.82</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://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  <profile> <id>oracle9i</id> @@ -493,13 +523,53 @@ <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.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> </properties> </profile> +  + <profile> + <id>oracle11g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</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:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> + +  + <profile> + <id>oracle11gRAC</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</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:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  <profile> <id>sybase15</id> @@ -513,7 +583,7 @@ <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/hibbr330</jdbc.url> + <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbr330</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/> @@ -540,6 +610,26 @@ </properties> </profile> +  + <profile> + <id>mssql2008</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> +

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r17774 - in core/trunk: cache-infinispan and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-10-16 08:10:32 -0400 (Fri, 16 Oct 2009) New Revision: 17774 Modified: core/trunk/cache-infinispan/pom.xml core/trunk/jdbc4-testing/pom.xml core/trunk/pom.xml Log: moved the jdk6 based modules into a profile to be able to skip them. Also removed the /bin part of the javac command Modified: core/trunk/cache-infinispan/pom.xml =================================================================== --- core/trunk/cache-infinispan/pom.xml 2009-10-16 01:02:14 UTC (rev 17773) +++ core/trunk/cache-infinispan/pom.xml 2009-10-16 12:10:32 UTC (rev 17774) @@ -84,8 +84,12 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> + <verbose>true</verbose> + <fork>true</fork> + <executable>${jdbc4_jdk}/javac</executable> + <compilerVersion>1.6</compilerVersion> </configuration> </plugin> <plugin> Modified: core/trunk/jdbc4-testing/pom.xml =================================================================== --- core/trunk/jdbc4-testing/pom.xml 2009-10-16 01:02:14 UTC (rev 17773) +++ core/trunk/jdbc4-testing/pom.xml 2009-10-16 12:10:32 UTC (rev 17774) @@ -50,7 +50,7 @@ <target>1.6</target> <verbose>true</verbose> <fork>true</fork> - <executable>${jdbc4_jdk}/bin/javac</executable> + <executable>${jdbc4_jdk}/javac</executable> <compilerVersion>1.6</compilerVersion> </configuration> </plugin> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-10-16 01:02:14 UTC (rev 17773) +++ core/trunk/pom.xml 2009-10-16 12:10:32 UTC (rev 17774) @@ -21,7 +21,6 @@ <module>core</module> <module>cache-ehcache</module> <module>cache-jbosscache</module> - <module>cache-infinispan</module> <module>cache-oscache</module> <module>cache-swarmcache</module> <module>connection-c3p0</module> @@ -33,7 +32,6 @@ <module>testing</module> <module>testsuite</module> <module>jdbc3-testing</module> - <module>jdbc4-testing</module> <module>tutorials</module> <!-- Need to scope bytecode providers first... @@ -43,6 +41,7 @@ </modules> <build> + <defaultGoal>install</defaultGoal> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -72,8 +71,21 @@ </pluginManagement> </build> - <profiles> + <profiles> <profile> + <id>jdk6-modules</id> + <activation> + <property> + <name>disableJDK6Modules</name> + <value>!true</value> + </property> + </activation> + <modules> + <module>cache-infinispan</module> + <module>jdbc4-testing</module> + </modules> + </profile> + <profile> <id>docs</id> <activation> <property> @@ -87,5 +99,4 @@ </modules> </profile> </profiles> - </project>

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits October 2009