diff --git a/documentation/src/main/docbook/devguide/en-US/Database_Access.xml b/documentation/src/main/docbook/devguide/en-US/Database_Access.xml index 6fe3e3837c..d7701d9c0a 100644 --- a/documentation/src/main/docbook/devguide/en-US/Database_Access.xml +++ b/documentation/src/main/docbook/devguide/en-US/Database_Access.xml @@ -71,7 +71,7 @@ Letting Hibernate find the mapping files for you - The addConfig() method directs Hibernate to search the CLASSPATH for the mapping + The addClass() method directs Hibernate to search the CLASSPATH for the mapping files, eliminating hard-coded file names. In the following example, it searches for org/hibernate/auction/Item.hbm.xml and org/hibernate/auction/Bid.hbm.xml. @@ -136,7 +136,7 @@ c3p0 connection pool C3P0 is an open source JDBC connection pool distributed along with Hibernate in the lib/ - directory. Hibernate uses its org.hibernate.connection.C3P0ConnectionProvider for + directory. Hibernate uses its org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider for connection pooling if you set the hibernate.c3p0.* properties. properties. @@ -153,7 +153,7 @@ Proxool is another open source JDBC connection pool distributed along with Hibernate in the lib/ directory. Hibernate uses its - org.hibernate.connection.ProxoolConnectionProvider for connection pooling if you set the + org.hibernate.service.jdbc.connections.internal.ProxoolConnectionProvider for connection pooling if you set the hibernate.proxool.* properties. Unlike c3p0, proxool requires some additional configuration parameters, as described by the Proxool documentation available at . @@ -223,7 +223,7 @@ You can define your own plugin strategy for obtaining JDBC connections by implementing the interface - org.hibernate.connection.ConnectionProvider and specifying your custom + org.hibernate.service.jdbc.connections.spi.ConnectionProvider and specifying your custom implementation with the hibernate.connection.provider_class property. @@ -294,8 +294,12 @@ org.hibernate.dialect.IngresDialect - Microsoft SQL Server - org.hibernate.dialect.SQLServerDialect + Microsoft SQL Server 2005 + org.hibernate.dialect.SQLServer2005Dialect + + + Microsoft SQL Server 2008 + org.hibernate.dialect.SQLServer2008Dialect Mckoi SQL @@ -307,7 +311,7 @@ MySQL with InnoDB - org.hibernate.dialect.MySQLInnoDBDialect + org.hibernate.dialect.MySQL5InnoDBDialect MySQL with MyISAM @@ -342,8 +346,12 @@ org.hibernate.dialect.SAPDBDialect - Sybase - org.hibernate.dialect.SybaseDialect + Sybase ASE 15.5 + org.hibernate.dialect.SybaseASE15Dialect + + + Sybase ASE 15.7 + org.hibernate.dialect.SybaseASE157Dialect Sybase Anywhere @@ -365,22 +373,22 @@
Dialect resolution - Assuming a org.hibernate.connection.ConnectionProvider has been + Assuming a org.hibernate.service.jdbc.connections.spi.ConnectionProvider has been set up, Hibernate will attempt to automatically determine the Dialect to use based on the java.sql.DatabaseMetaData reported by a java.sql.Connection obtained from that - org.hibernate.connection.ConnectionProvider. + org.hibernate.service.jdbc.connections.spi.ConnectionProvider. This functionality is provided by a series of - org.hibernate.dialect.resolver.DialectResolver instances registered + org.hibernate.service.jdbc.dialect.spi.DialectResolver instances registered with Hibernate internally. Hibernate comes with a standard set of recognitions. If your application requires extra Dialect resolution capabilities, it would simply register a custom implementation - of org.hibernate.dialect.resolver.DialectResolver as follows: + of org.hibernate.service.jdbc.dialect.spi.DialectResolver as follows: - Registered org.hibernate.dialect.resolver.DialectResolver are + Registered org.hibernate.service.jdbc.dialect.spi.DialectResolver are prepended to an internal list of resolvers, so they take precedence before any already registered resolvers including the standard one. diff --git a/documentation/src/main/docbook/devguide/en-US/Mapping_Entities.xml b/documentation/src/main/docbook/devguide/en-US/Mapping_Entities.xml index fbc38827f5..a4add1bb4c 100644 --- a/documentation/src/main/docbook/devguide/en-US/Mapping_Entities.xml +++ b/documentation/src/main/docbook/devguide/en-US/Mapping_Entities.xml @@ -1,10 +1,13 @@ -%BOOK_ENTITIES; -]> - - Mapping entities - -
- Hierarchies
+ + %BOOK_ENTITIES; + ]> + + Mapping entities + +
+ Hierarchies + +
+ diff --git a/documentation/src/main/docbook/devguide/en-US/Native_SQL.xml b/documentation/src/main/docbook/devguide/en-US/Native_SQL.xml index 63f6587241..5971586ed4 100644 --- a/documentation/src/main/docbook/devguide/en-US/Native_SQL.xml +++ b/documentation/src/main/docbook/devguide/en-US/Native_SQL.xml @@ -1,7 +1,9 @@ -%BOOK_ENTITIES; -]> + + %BOOK_ENTITIES; + ]> - Native-SQL + Native-SQL + + diff --git a/documentation/src/main/docbook/devguide/en-US/Persistence_Context.xml b/documentation/src/main/docbook/devguide/en-US/Persistence_Context.xml index 5cbd8185e2..a0eabe83a7 100644 --- a/documentation/src/main/docbook/devguide/en-US/Persistence_Context.xml +++ b/documentation/src/main/docbook/devguide/en-US/Persistence_Context.xml @@ -82,14 +82,12 @@ entityManager.persist(fritz);]]> - - - org.hibernate.Session also has a method named persist - which follows the exact semantic defined in the JPA specification for the persist - method. It is this method on org.hibernate.Session to which the - Hibernate javax.persistence.EntityManager implementation delegates. - - + + org.hibernate.Session also has a method named persist + which follows the exact semantic defined in the JPA specification for the persist + method. It is this method on org.hibernate.Session to which the + Hibernate javax.persistence.EntityManager implementation delegates. + If the DomesticCat entity type has a generated identifier, the value is associated diff --git a/documentation/src/main/docbook/devguide/en-US/Services.xml b/documentation/src/main/docbook/devguide/en-US/Services.xml index f489f93dfd..ba1b611acd 100644 --- a/documentation/src/main/docbook/devguide/en-US/Services.xml +++ b/documentation/src/main/docbook/devguide/en-US/Services.xml @@ -227,7 +227,7 @@ Contract for Hibernate to obtain org.hibernate.dialect.Dialect instance to use. This is either explicitly defined by the hibernate.dialect property or determined by the - service which is a delegate to this service. + service which is a delegate to this service. diff --git a/documentation/src/main/docbook/devguide/en-US/Transactions.xml b/documentation/src/main/docbook/devguide/en-US/Transactions.xml index 5fc0226fd5..c36ce9c742 100644 --- a/documentation/src/main/docbook/devguide/en-US/Transactions.xml +++ b/documentation/src/main/docbook/devguide/en-US/Transactions.xml @@ -390,7 +390,7 @@ For objects attached to a particular Session, the two notions are equivalent, and JVM identity for database identity is guaranteed by Hibernate. The application might concurrently access a business object with the same - identity in two different sessions, the two instances are actually actually different, in terms of JVM + identity in two different sessions, the two instances are actually different, in terms of JVM identity. Conflicts are resolved using an optimistic approach and automatic versioning at flush/commit time.