Hibernate SVN: r19239 - core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-14 22:01:34 -0400 (Wed, 14 Apr 2010)
New Revision: 19239
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
Log:
JBPAPP-4105 HHH-4442 Change StandardDialectResolver to use SybaseASE15Dialect over deprecated SybaseDialect
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java 2010-04-14 20:54:44 UTC (rev 19238)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java 2010-04-15 02:01:34 UTC (rev 19239)
@@ -40,6 +40,7 @@
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.dialect.IngresDialect;
import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.InformixDialect;
import org.hibernate.dialect.DB2Dialect;
@@ -113,8 +114,8 @@
testDetermination( "INGRES", IngresDialect.class );
testDetermination( "Microsoft SQL Server Database", SQLServerDialect.class );
testDetermination( "Microsoft SQL Server", SQLServerDialect.class );
- testDetermination( "Sybase SQL Server", SybaseDialect.class );
- testDetermination( "Adaptive Server Enterprise", SybaseDialect.class );
+ testDetermination( "Sybase SQL Server", SybaseASE15Dialect.class );
+ testDetermination( "Adaptive Server Enterprise", SybaseASE15Dialect.class );
testDetermination( "Informix Dynamic Server", InformixDialect.class );
testDetermination( "DB2/NT", DB2Dialect.class );
testDetermination( "DB2/LINUX", DB2Dialect.class );
14 years
- 1
- 0
Hibernate SVN: r19238 - in core/trunk: annotations and 31 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-04-14 16:54:44 -0400 (Wed, 14 Apr 2010)
New Revision: 19238
Modified:
core/trunk/annotations/pom.xml
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-infinispan/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/distribution/pom.xml
core/trunk/documentation/envers/pom.xml
core/trunk/documentation/jbosscache2/pom.xml
core/trunk/documentation/manual/old/es-ES/pom.xml
core/trunk/documentation/manual/old/fr-FR/pom.xml
core/trunk/documentation/manual/old/ja-JP/pom.xml
core/trunk/documentation/manual/old/ko-KR/pom.xml
core/trunk/documentation/manual/old/pt-BR/pom.xml
core/trunk/documentation/manual/old/zh-CN/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/envers/pom.xml
core/trunk/hibernate-maven-plugin/pom.xml
core/trunk/jdbc3-testing/pom.xml
core/trunk/jdbc4-testing/pom.xml
core/trunk/jmx/pom.xml
core/trunk/parent/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
core/trunk/tutorials/eg/pom.xml
core/trunk/tutorials/pom.xml
core/trunk/tutorials/web/pom.xml
Log:
Updating pom versions to 3.5.2-SNAPSHOT for release tagging
Modified: core/trunk/annotations/pom.xml
===================================================================
--- core/trunk/annotations/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/annotations/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/cache-ehcache/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/cache-infinispan/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/cache-jbosscache/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/cache-oscache/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/cache-swarmcache/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/connection-c3p0/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/connection-proxool/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/core/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/distribution/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/envers/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/jbosscache2/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/manual/old/es-ES/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/es-ES/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/manual/old/es-ES/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/fr-FR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/fr-FR/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/manual/old/fr-FR/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/ja-JP/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/ja-JP/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/manual/old/ja-JP/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/ko-KR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/ko-KR/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/manual/old/ko-KR/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/pt-BR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/pt-BR/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/manual/old/pt-BR/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/zh-CN/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/zh-CN/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/manual/old/zh-CN/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/manual/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/documentation/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/entitymanager/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/envers/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/hibernate-maven-plugin/pom.xml
===================================================================
--- core/trunk/hibernate-maven-plugin/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/hibernate-maven-plugin/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -27,7 +27,7 @@
<parent>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/jdbc3-testing/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/jdbc4-testing/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/jmx/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/parent/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/testing/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/testsuite/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/tutorials/eg/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/tutorials/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2010-04-14 20:54:25 UTC (rev 19237)
+++ core/trunk/tutorials/web/pom.xml 2010-04-14 20:54:44 UTC (rev 19238)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.1-Final</version>
+ <version>3.5.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years
- 1
- 0
Hibernate SVN: r19237 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-04-14 16:54:25 -0400 (Wed, 14 Apr 2010)
New Revision: 19237
Added:
core/tags/hibernate-3.5.1-Final/
Log:
Tagging 3.5.1-Final release
Copied: core/tags/hibernate-3.5.1-Final (from rev 19236, core/trunk)
14 years
- 1
- 0
Hibernate SVN: r19236 - in core/trunk: annotations and 31 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-04-14 16:54:13 -0400 (Wed, 14 Apr 2010)
New Revision: 19236
Modified:
core/trunk/annotations/pom.xml
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-infinispan/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/distribution/pom.xml
core/trunk/documentation/envers/pom.xml
core/trunk/documentation/jbosscache2/pom.xml
core/trunk/documentation/manual/old/es-ES/pom.xml
core/trunk/documentation/manual/old/fr-FR/pom.xml
core/trunk/documentation/manual/old/ja-JP/pom.xml
core/trunk/documentation/manual/old/ko-KR/pom.xml
core/trunk/documentation/manual/old/pt-BR/pom.xml
core/trunk/documentation/manual/old/zh-CN/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/envers/pom.xml
core/trunk/hibernate-maven-plugin/pom.xml
core/trunk/jdbc3-testing/pom.xml
core/trunk/jdbc4-testing/pom.xml
core/trunk/jmx/pom.xml
core/trunk/parent/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
core/trunk/tutorials/eg/pom.xml
core/trunk/tutorials/pom.xml
core/trunk/tutorials/web/pom.xml
Log:
Updating pom versions to 3.5.1-Final for release tagging
Modified: core/trunk/annotations/pom.xml
===================================================================
--- core/trunk/annotations/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/annotations/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/cache-ehcache/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/cache-infinispan/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/cache-jbosscache/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/cache-oscache/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/cache-swarmcache/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/connection-c3p0/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/connection-proxool/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/core/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/distribution/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/envers/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/jbosscache2/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/manual/old/es-ES/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/es-ES/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/manual/old/es-ES/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/fr-FR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/fr-FR/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/manual/old/fr-FR/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/ja-JP/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/ja-JP/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/manual/old/ja-JP/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/ko-KR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/ko-KR/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/manual/old/ko-KR/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/pt-BR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/pt-BR/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/manual/old/pt-BR/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/zh-CN/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/zh-CN/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/manual/old/zh-CN/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/manual/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/documentation/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/entitymanager/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/envers/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/hibernate-maven-plugin/pom.xml
===================================================================
--- core/trunk/hibernate-maven-plugin/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/hibernate-maven-plugin/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -27,7 +27,7 @@
<parent>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/jdbc3-testing/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/jdbc4-testing/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/jmx/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/parent/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/testing/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/testsuite/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/tutorials/eg/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/tutorials/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2010-04-14 20:50:42 UTC (rev 19235)
+++ core/trunk/tutorials/web/pom.xml 2010-04-14 20:54:13 UTC (rev 19236)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.1-Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years
- 1
- 0
Hibernate SVN: r19235 - core/trunk.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-04-14 16:50:42 -0400 (Wed, 14 Apr 2010)
New Revision: 19235
Modified:
core/trunk/changelog.txt
Log:
prepare 3.5.1 release
Modified: core/trunk/changelog.txt
===================================================================
--- core/trunk/changelog.txt 2010-04-14 20:47:48 UTC (rev 19234)
+++ core/trunk/changelog.txt 2010-04-14 20:50:42 UTC (rev 19235)
@@ -6,6 +6,47 @@
more about each case.
+Changes in version 3.5.1 (2010.04.14)
+-------------------------------------------
+http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversion/11021
+
+** Bug
+ * [HHH-2809] - dialect changes: limit string
+ * [HHH-3543] - method org.hibernate.transaction.JDBCTransaction.notifyLocalSynchsBeforeTransactionCompletion "swallows" all exceptions occured inside it
+ * [HHH-4077] - Misuse of NamingStrategy and logical column names in HbmBinder
+ * [HHH-4721] - Error in AuditSync.beforeCompletion() does not result in faillure of JDBCTransaction
+ * [HHH-4912] - testManyToManyWithFormula induces error with Ingres dialect
+ * [HHH-4938] - Multiple errors reported during legacy FooBarTest with Ingres
+ * [HHH-4961] - org.hibernate.test.hql.ASTParserLoadingTest error running testPaginationWithPolymorphicQuery with Ingres
+ * [HHH-4965] - Implicit parameters abusively use TypeFactory.heuristicType losing UserType and XToOneType info
+ * [HHH-4970] - org.hibernate.test.hql.ASTParserLoadingTest error running testComponentParameterBinding with Ingres
+ * [HHH-4973] - org.hibernate.test.hql.ASTParserLoadingTest error running testSelectClauseSubselect with Ingres
+ * [HHH-4976] - org.hibernate.test.hql.ASTParserLoadingTest error running testImplicitPolymorphism with Ingres
+ * [HHH-4977] - org.hibernate.test.hql.ASTParserLoadingTest error running testOneToManyFilter with Ingres
+ * [HHH-5045] - org.hibernate.test.hql.HQLTest failure running testConcatenation with Ingres
+ * [HHH-5059] - callouts and programlistings with highlighting
+ * [HHH-5082] - QueryException thrown when grouping by component
+ * [HHH-5096] - FetchingScrollableResultsImpl.last() does not move to the last result if cursor is after the last result
+ * [HHH-5102] - Instances of a subclass can't be loaded
+ * [HHH-5103] - Specifying the referencedColumnName in a @JoinColumn in backtics like `uid` fails
+ * [HHH-5104] - EntityType.isEqual() test x equals x but should test x equals y (Thierry-Dimitri Roy)
+ * [HHH-5106] - UnsupportedOperationException on SQL named native queries when using the type-safe API
+
+** Improvement
+ * [HHH-3962] - Ingres Hibernate dialect for EAP 4.3.0 GA CP04
+
+** Patch
+ * [HHH-2470] - Use of session.createSQLQuery causes memory leak (Harry Mark and Michael Stevens)
+ * [HHH-5003] - IngresDialect requires query substitutions for boolean values
+ * [HHH-5076] - Multiple failures reported during ReadOnlyProxyTest with Ingres
+
+** Task
+ * [HHH-3997] - Build aggregated javadocs
+ * [HHH-5083] - Align javadoc styles better with docbook / website
+ * [HHH-5084] - Improve overview for aggregated javadocs
+ * [HHH-5116] - Remove copyrighted fonts from annotations
+
+
Changes in version 3.5.0-Final (2010.03.31)
-------------------------------------------
http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversi...
14 years
- 1
- 0
Hibernate SVN: r19234 - core/trunk/distribution.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-04-14 16:47:48 -0400 (Wed, 14 Apr 2010)
New Revision: 19234
Modified:
core/trunk/distribution/pom.xml
Log:
correction to aggregated javadocs build
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2010-04-14 18:08:37 UTC (rev 19233)
+++ core/trunk/distribution/pom.xml 2010-04-14 20:47:48 UTC (rev 19234)
@@ -57,18 +57,19 @@
<source><![CDATA[
def sourcePathName = 'javadocSourcePath'
sourcePath = ant.path( id:sourcePathName ) {
- ant.pathElement( path: '../annotations/src/main/java' )
- ant.pathElement( path: '../cache-ehcache/src/main/java' )
- ant.pathElement( path: '../cache-infinispan/src/main/java' )
- ant.pathElement( path: '../cache-jbosscache/src/main/java' )
- ant.pathElement( path: '../cache-oscache/src/main/java' )
- ant.pathElement( path: '../cache-swarmcache/src/main/java' )
- ant.pathElement( path: '../connection-c3p0/src/main/java' )
- ant.pathElement( path: '../connection-proxool/src/main/java' )
- ant.pathElement( path: '../entitymanager/src/main/java' )
- ant.pathElement( path: '../envers/src/main/java' )
- ant.pathElement( path: '../testing/src/main/java' )
- ant.pathElement( path: '../core/src/main/java:core/target/generated-sources/antlr' )
+ ant.pathElement( path: "${pom.basedir}/../annotations/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../cache-ehcache/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../cache-infinispan/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../cache-jbosscache/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../cache-oscache/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../cache-swarmcache/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../connection-c3p0/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../connection-proxool/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../entitymanager/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../envers/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../testing/src/main/java" )
+ ant.pathElement( path: "${pom.basedir}/../core/src/main/java" )
+ ant.pathElement( path: "../core/target/generated-sources/antlr" )
}
def classPathName = 'javadocClassPath'
@@ -77,7 +78,7 @@
classPath.createPathElement().path = element
}
- targetDir = 'target/javadocs';
+ targetDir = "${pom.basedir}/target/javadocs";
ant.javadoc(
executable: '${jdk16_home}/bin/javadoc',
@@ -85,10 +86,10 @@
destdir: targetDir ,
sourcepathref: sourcePathName,
classpathref: classPathName,
- overview: 'src/javadoc/package.html',
- stylesheetfile: 'src/javadoc/stylesheet.css',
+ overview: '${pom.basedir}/src/javadoc/package.html',
+ stylesheetfile: '${pom.basedir}/src/javadoc/stylesheet.css',
windowtitle: 'Hibernate JavaDocs',
- doctitle: 'Hibernate JavaDoc (${project.version})',
+ doctitle: 'Hibernate JavaDoc (${pom.version})',
bottom: 'Copyright © 2001-2010 <a href="http://redhat.com">Red Hat, Inc.</a> All Rights Reserved.',
use: true
) {
@@ -141,7 +142,7 @@
imagesDir = targetDir + '/images'
ant.mkdir( dir: imagesDir )
ant.copy( toDir: imagesDir ) {
- fileset( dir: "src/javadoc/images" )
+ fileset( dir: "${pom.basedir}/src/javadoc/images" )
}
]]>
</source>
14 years
- 1
- 0
Hibernate SVN: r19233 - in core/trunk/entitymanager/src: main/java/org/hibernate/ejb/criteria and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-04-14 14:08:37 -0400 (Wed, 14 Apr 2010)
New Revision: 19233
Modified:
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java
Log:
HHH-4965 - Implicit parameters abusively use TypeFactory.heuristicType losing UserType and XToOneType info
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java 2010-04-14 16:27:11 UTC (rev 19232)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java 2010-04-14 18:08:37 UTC (rev 19233)
@@ -102,7 +102,7 @@
final NamedParameterDescriptor descriptor =
queryImpl.getParameterMetadata().getNamedParameterDescriptor( name );
Class javaType = namedParameterTypeRedefinition.get( name );
- if ( javaType != null ) {
+ if ( javaType != null && mightNeedRedefinition( javaType ) ) {
descriptor.resetExpectedType(
TypeFactory.heuristicType( javaType.getName() )
);
@@ -140,6 +140,11 @@
this.parameters = java.util.Collections.unmodifiableSet( parameters );
}
+ private boolean mightNeedRedefinition(Class javaType) {
+ // for now, only really no for dates/times/timestamps
+ return java.util.Date.class.isAssignableFrom( javaType );
+ }
+
private static class ParameterImpl implements Parameter {
private final String name;
private final Integer position;
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java 2010-04-14 16:27:11 UTC (rev 19232)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java 2010-04-14 18:08:37 UTC (rev 19233)
@@ -60,19 +60,74 @@
public class CriteriaQueryCompiler implements Serializable {
private static final Logger log = LoggerFactory.getLogger( CriteriaQueryCompiler.class );
+ /**
+ * Used to describe implicit (not defined in criteria query) parameters.
+ */
public static interface ImplicitParameterBinding {
+ /**
+ * Retrieve the generated name of the implicit parameter.
+ *
+ * @return The parameter name.
+ */
public String getParameterName();
+
+ /**
+ * Get the java type of the "thing" that led to the implicit parameter. Used from
+ * {@link org.hibernate.ejb.HibernateEntityManagerImplementor.Options#getNamedParameterExplicitTypes()}
+ * in determining "guessed type" overriding.
+ *
+ * @return The java type
+ */
public Class getJavaType();
+
+ /**
+ * Bind the implicit parameter's value to the JPA query.
+ *
+ * @param typedQuery The JPA query.
+ */
public void bind(TypedQuery typedQuery);
}
+ /**
+ * Used to provide a context and services to the rendering.
+ */
public static interface RenderingContext {
+ /**
+ * Generate a correlation name.
+ *
+ * @return The generated correlation name
+ */
public String generateAlias();
+
+ /**
+ * Generate a name for a parameter into the JPAQL query.
+ *
+ * @return The generated para name
+ */
public String generateParameterName();
+ /**
+ * Register parameters explicitly encountered in the criteria query.
+ *
+ * @param criteriaQueryParameter The parameter expression
+ * @param jpaqlParameterName The generated name for the parameter
+ */
public void registerExplicitParameter(ParameterExpression<?> criteriaQueryParameter, String jpaqlParameterName);
+
+ /**
+ * Register a parameter that was not part of the criteria query (at least not as a parameter).
+ *
+ * @param binding The parameter description.
+ */
public void registerImplicitParameterBinding(ImplicitParameterBinding binding);
+ /**
+ * Given a java type, determine the proper cast type name.
+ *
+ * @param javaType The java type.
+ *
+ * @return The cast type name.
+ */
public String getCastType(Class javaType);
}
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java 2010-04-14 16:27:11 UTC (rev 19232)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java 2010-04-14 18:08:37 UTC (rev 19233)
@@ -23,7 +23,9 @@
*/
package org.hibernate.ejb.criteria;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
@@ -112,6 +114,47 @@
em.close();
}
+ public void testEqualityComparisonEntityConversion() {
+ EntityManager em = getOrCreateEntityManager();
+ em.getTransaction().begin();
+ Address address = new Address( "Street Id", "Fake Street", "Fake City", "Fake State", "Fake Zip" );
+ Phone phone1 = new Phone( "1", "555", "0001", address );
+ Phone phone2 = new Phone( "2", "555", "0002", address );
+ Phone phone3 = new Phone( "3", "555", "0003", address );
+ Phone phone4 = new Phone( "4", "555", "0004" );
+
+ Collection<Phone> phones = new ArrayList<Phone>( 3 );
+ phones.add( phone1 );
+ phones.add( phone2 );
+ phones.add( phone3 );
+
+ address.setPhones( phones );
+ em.persist( address );
+ em.persist( phone4 );
+
+ em.getTransaction().commit();
+
+
+ em.getTransaction().begin();
+
+ CriteriaBuilderImpl cb = (CriteriaBuilderImpl) em.getCriteriaBuilder();
+ MetamodelImpl mm = (MetamodelImpl) em.getMetamodel();
+ EntityType<Phone> Phone_ = mm.entity( Phone.class );
+
+ CriteriaQuery<Phone> cquery = cb.createQuery( Phone.class );
+ Root<Phone> phone = cquery.from( Phone.class );
+ ComparisonPredicate predicate = (ComparisonPredicate) cb.equal(
+ phone.get( Phone_.getSingularAttribute( "address", Address.class ) ),
+ address
+ );
+ cquery.where( predicate );
+ List<Phone> results = em.createQuery( cquery ).getResultList();
+
+ assertEquals( 3, results.size() );
+ em.getTransaction().commit();
+ em.close();
+ }
+
public void testTypeConversion() {
EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
14 years
- 1
- 0
Hibernate SVN: r19232 - in core/trunk: documentation/manual/src/main/docbook/en-US/content and 6 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-04-14 12:27:11 -0400 (Wed, 14 Apr 2010)
New Revision: 19232
Modified:
core/trunk/annotations/src/main/docbook/en/modules/entity.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml
core/trunk/documentation/manual/src/main/docbook/es-ES/content/performance.po
core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po
core/trunk/documentation/manual/src/main/docbook/ja-JP/content/performance.po
core/trunk/documentation/manual/src/main/docbook/pt-BR/content/performance.po
core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po
core/trunk/entitymanager/src/main/docbook/en/modules/query_criteria.xml
Log:
HHH-5059 - callouts and programlistings with highlighting
Modified: core/trunk/annotations/src/main/docbook/en/modules/entity.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/modules/entity.xml 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/annotations/src/main/docbook/en/modules/entity.xml 2010-04-14 16:27:11 UTC (rev 19232)
@@ -448,7 +448,7 @@
<area coords="11" id="hm10" />
</areaspec>
- <programlisting language="JAVA" role="JAVA">@Column(
+ <programlisting>@Column(
name="columnName";
boolean unique() default false;
boolean nullable() default true;
@@ -2652,7 +2652,7 @@
<area coords="4" id="cache-hm3" />
</areaspec>
- <programlisting language="JAVA" role="JAVA">@Cache(
+ <programlisting>@Cache(
CacheConcurrencyStrategy usage();
String region() default "";
String include() default "all";
@@ -4353,4 +4353,4 @@
Hibernate Core documentation.</para>
</section>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2010-04-14 16:27:11 UTC (rev 19232)
@@ -205,7 +205,7 @@
<area id="hm6" coords="7"/>
<area id="hm7" coords="8"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<hibernate-mapping
+ <programlisting><![CDATA[<hibernate-mapping
schema="schemaName"
catalog="catalogName"
default-cascade="cascade_style"
@@ -310,7 +310,7 @@
<area id="class20" coords="21"/>
<area id="class21" coords="22"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<class
+ <programlisting><![CDATA[<class
name="ClassName"
table="tableName"
discriminator-value="discriminator_value"
@@ -614,7 +614,7 @@
<area id="id4" coords="5" />
<area id="id5" coords="6" />
</areaspec>
- <programlisting role="XML"><![CDATA[<id
+ <programlisting><![CDATA[<id
name="propertyName"
type="typename"
column="column_name"
@@ -1240,7 +1240,7 @@
<area id="discriminator4" coords="5" />
<area id="discriminator5" coords="6" />
</areaspec>
- <programlisting role="XML"><![CDATA[<discriminator
+ <programlisting><![CDATA[<discriminator
column="discriminator_column"
type="discriminator_type"
force="true|false"
@@ -1326,7 +1326,7 @@
<area id="version6" coords="7"/>
<area id="version7" coords="8"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<version
+ <programlisting><![CDATA[<version
column="version_column"
name="propertyName"
type="typename"
@@ -1421,7 +1421,7 @@
<area id="timestamp5" coords="6" />
<area id="timestamp6" coords="7" />
</areaspec>
- <programlisting role="XML"><![CDATA[<timestamp
+ <programlisting><![CDATA[<timestamp
column="timestamp_column"
name="propertyName"
access="field|property|ClassName"
@@ -1520,7 +1520,7 @@
<area id="property11" coords="12"/>
<area id="property12" coords="13"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<property
+ <programlisting><![CDATA[<property
name="propertyName"
column="column_name"
type="typename"
@@ -1721,7 +1721,7 @@
<area id="manytoone15" coords="16"/>
<area id="manytoone16" coords="17"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<many-to-one
+ <programlisting><![CDATA[<many-to-one
name="propertyName"
column="column_name"
class="ClassName"
@@ -1924,7 +1924,7 @@
<area id="onetoone9" coords="10"/>
<area id="onetoone10" coords="11"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<one-to-one
+ <programlisting><![CDATA[<one-to-one
name="propertyName"
class="ClassName"
cascade="cascade_style"
@@ -2138,7 +2138,7 @@
<area id="component7" coords="8"/>
<area id="component8" coords="9"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<component
+ <programlisting><![CDATA[<component
name="propertyName"
class="className"
insert="true|false"
@@ -2247,7 +2247,7 @@
<area id="properties4" coords="5"/>
<area id="properties5" coords="6"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<properties
+ <programlisting><![CDATA[<properties
name="logicalName"
insert="true|false"
update="true|false"
@@ -2347,7 +2347,7 @@
<area id="subclass3" coords="4"/>
<area id="subclass4" coords="5"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<subclass
+ <programlisting><![CDATA[<subclass
name="ClassName"
discriminator-value="discriminator_value"
proxy="ProxyInterface"
@@ -2418,7 +2418,7 @@
<area id="joinedsubclass3" coords="4"/>
<area id="joinedsubclass4" coords="5"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<joined-subclass
+ <programlisting><![CDATA[<joined-subclass
name="ClassName"
table="tablename"
proxy="ProxyInterface"
@@ -2530,7 +2530,7 @@
<area id="unionsubclass3" coords="4"/>
<area id="unionsubclass4" coords="5"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<union-subclass
+ <programlisting><![CDATA[<union-subclass
name="ClassName"
table="tablename"
proxy="ProxyInterface"
@@ -2602,7 +2602,7 @@
<area id="join5" coords="6"/>
<area id="join6" coords="7"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<join
+ <programlisting><![CDATA[<join
table="tablename"
schema="owner"
catalog="catalog"
@@ -2710,7 +2710,7 @@
<area id="key5" coords="6"/>
<area id="key6" coords="7"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<key
+ <programlisting><![CDATA[<key
column="columnname"
on-delete="noaction|cascade"
property-ref="propertyName"
@@ -2845,7 +2845,7 @@
<area id="import1" coords="2"/>
<area id="import2" coords="3"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<import
+ <programlisting><![CDATA[<import
class="ClassName"
rename="ShortName"
/>]]></programlisting>
@@ -2903,7 +2903,7 @@
<area id="any5" coords="6"/>
<area id="any6" coords="7"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<any
+ <programlisting><![CDATA[<any
name="propertyName"
id-type="idtypename"
meta-type="metatypename"
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2010-04-14 16:27:11 UTC (rev 19232)
@@ -155,7 +155,7 @@
<area id="mappingcollection13" coords="14"/>
<area id="mappingcollection14" coords="15"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<map
+ <programlisting><![CDATA[<map
name="propertyName"
table="table_name"
schema="schema_name"
@@ -351,7 +351,7 @@
<area id="index1" coords="2"/>
<area id="index2" coords="3"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<list-index
+ <programlisting><![CDATA[<list-index
column="column_name"
base="0|1|..."/>]]></programlisting>
<calloutlist>
@@ -376,7 +376,7 @@
<area id="mapkey2" coords="3"/>
<area id="mapkey3" coords="4"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<map-key
+ <programlisting><![CDATA[<map-key
column="column_name"
formula="any SQL expression"
type="type_name"
@@ -409,7 +409,7 @@
<area id="indexmanytomany2" coords="3"/>
<area id="indexmanytomany3" coords="3"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<map-key-many-to-many
+ <programlisting><![CDATA[<map-key-many-to-many
column="column_name"
formula="any SQL expression"
class="ClassName"
@@ -465,7 +465,7 @@
<area id="element2b" coords="3"/>
<area id="element3b" coords="4"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<element
+ <programlisting><![CDATA[<element
column="column_name"
formula="any SQL expression"
type="typename"
@@ -513,7 +513,7 @@
<area id="manytomany7" coords="8"/>
<area id="manytomany8" coords="9"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<many-to-many
+ <programlisting><![CDATA[<many-to-many
column="column_name"
formula="any SQL expression"
class="ClassName"
@@ -686,7 +686,7 @@
<area id="onetomany2" coords="3"/>
<area id="onetomany3" coords="4"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<one-to-many
+ <programlisting><![CDATA[<one-to-many
class="ClassName"
not-found="ignore|exception"
entity-name="EntityName"
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2010-04-14 16:27:11 UTC (rev 19232)
@@ -827,7 +827,7 @@
<area id="cache2" coords="3"/>
<area id="cache3" coords="4"/>
</areaspec>
- <programlisting role="XML"><![CDATA[<cache
+ <programlisting><![CDATA[<cache
usage="transactional|read-write|nonstrict-read-write|read-only"
region="RegionName"
include="all|non-lazy"
Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/performance.po 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/performance.po 2010-04-14 16:27:11 UTC (rev 19232)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: performance\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:47\n"
+"POT-Creation-Date: 2010-02-11T05:38:15\n"
"PO-Revision-Date: 2010-03-17 10:28+1000\n"
"Last-Translator: Angela Garcia <agarcia(a)redhat.com>\n"
"Language-Team: <en(a)li.org>\n"
@@ -335,7 +335,8 @@
#. Tag: para
#, no-c-format
msgid "HQL queries if <literal>subselect</literal> fetching is used"
-msgstr "las consultas HQL si se utiliza la recuperación <literal>subselect</literal>"
+msgstr ""
+"las consultas HQL si se utiliza la recuperación <literal>subselect</literal>"
#. Tag: para
#, no-c-format
@@ -557,7 +558,8 @@
#. Tag: para
#, no-c-format
-msgid "Certain operations do <emphasis>not</emphasis> require proxy initialization:"
+msgid ""
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
msgstr ""
"Ciertas operaciones <emphasis>no</emphasis> requieren inicialización de "
"proxies:"
@@ -826,8 +828,10 @@
#. Tag: para
#, no-c-format
-msgid "Hibernate will now execute only three queries: the pattern is 10, 10, 5."
-msgstr "Hibernate ahora ejecutará sólamente tres consultas: el patrón es 10, 10, 5."
+msgid ""
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
+msgstr ""
+"Hibernate ahora ejecutará sólamente tres consultas: el patrón es 10, 10, 5."
#. Tag: para
#, no-c-format
@@ -910,18 +914,23 @@
"<interfacename>org.hibernate.Session</interfacename> until it is explicitly "
"disabled."
msgstr ""
-"Otra manera de modificar la estrategia de recuperación para cargar objetos asociados es por medio de algo llamado un perfil de recuperación, el cual es una configuración nombrada asociada con la <interfacename>org.hibernate.SessionFactory</"
-"interfacename> pero habilitada por nombre en la <interfacename>org.hibernate."
-"Session</interfacename>. Una vez habilitada en una <interfacename>org.hibernate."
-"Session</interfacename>, el perfil de recuperación estará en efecto para esa "
-"<interfacename>org.hibernate.Session</interfacename> hasta que se deshabilite explícitamente."
+"Otra manera de modificar la estrategia de recuperación para cargar objetos "
+"asociados es por medio de algo llamado un perfil de recuperación, el cual es "
+"una configuración nombrada asociada con la <interfacename>org.hibernate."
+"SessionFactory</interfacename> pero habilitada por nombre en la "
+"<interfacename>org.hibernate.Session</interfacename>. Una vez habilitada en "
+"una <interfacename>org.hibernate.Session</interfacename>, el perfil de "
+"recuperación estará en efecto para esa <interfacename>org.hibernate.Session</"
+"interfacename> hasta que se deshabilite explícitamente."
#. Tag: para
#, no-c-format
msgid ""
"So what does that mean? Well lets explain that by way of an example. Say we "
"have the following mappings:"
-msgstr "¿Entonces qué significa? Vamos a explicarlo por medio de un ejemplo. Digamos que tenemos los siguientes mapeos:"
+msgstr ""
+"¿Entonces qué significa? Vamos a explicarlo por medio de un ejemplo. Digamos "
+"que tenemos los siguientes mapeos:"
#. Tag: para
#, no-c-format
@@ -935,8 +944,14 @@
"to use a fetch profile to achieve that. Just add the following to your "
"mapping:"
msgstr ""
-"Ahora normalmente cuando reciba una referencia a un cliente en particular, el grupo de pedidos será perezoso lo que significa que aún no habremos cargado esos pedidos de la base de datos. Usualmente esto está bien. Ahora digamos que tiene un ejemplo en donde es más eficiente el cargar el cliente y sus pedidos juntos. Una manera es utilizar las estrategias de \"recuperación dinámica\" por medio de peticiones de criterio o un HQL. Pero otra opción es "
-"utilizar un perfi de recuperación para lograr esto. Simplemente agregue lo siguiente a su mapeo:"
+"Ahora normalmente cuando reciba una referencia a un cliente en particular, "
+"el grupo de pedidos será perezoso lo que significa que aún no habremos "
+"cargado esos pedidos de la base de datos. Usualmente esto está bien. Ahora "
+"digamos que tiene un ejemplo en donde es más eficiente el cargar el cliente "
+"y sus pedidos juntos. Una manera es utilizar las estrategias de "
+"\"recuperación dinámica\" por medio de peticiones de criterio o un HQL. Pero "
+"otra opción es utilizar un perfi de recuperación para lograr esto. "
+"Simplemente agregue lo siguiente a su mapeo:"
#. Tag: para
#, no-c-format
@@ -948,7 +963,9 @@
msgid ""
"Now the following code will actually load both the customer <emphasis>and "
"their orders</emphasis>:"
-msgstr "Ahora el siguiente código de hecho cargará el cliente <emphasis>y sus órdenes</emphasis>:"
+msgstr ""
+"Ahora el siguiente código de hecho cargará el cliente <emphasis>y sus "
+"órdenes</emphasis>:"
#. Tag: para
#, no-c-format
@@ -957,8 +974,10 @@
"support additional styles. See <ulink url=\"http://opensource.atlassian.com/"
"projects/hibernate/browse/HHH-3414\">HHH-3414</ulink> for details."
msgstr ""
-"Actualmente solo se soportan los perfiles de recuperación de estilo unido pero se planear soportar estilos adicionales. Consulte <ulink url=\"http://opensource.atlassian.com/"
-"projects/hibernate/browse/HHH-3414\">HHH-3414</ulink> para obtener mayores detalles."
+"Actualmente solo se soportan los perfiles de recuperación de estilo unido "
+"pero se planear soportar estilos adicionales. Consulte <ulink url=\"http://"
+"opensource.atlassian.com/projects/hibernate/browse/HHH-3414\">HHH-3414</"
+"ulink> para obtener mayores detalles."
#. Tag: title
#, no-c-format
@@ -1009,7 +1028,8 @@
#. Tag: para
#, no-c-format
msgid "For bytecode instrumentation, use the following Ant task:"
-msgstr "Para la instrumentación del código byte, utilice la siguiente tarea Ant:"
+msgstr ""
+"Para la instrumentación del código byte, utilice la siguiente tarea Ant:"
#. Tag: para
#, no-c-format
@@ -1385,7 +1405,8 @@
#. Tag: para
#, no-c-format
-msgid "None of the cache providers support all of the cache concurrency strategies."
+msgid ""
+"None of the cache providers support all of the cache concurrency strategies."
msgstr ""
"Ninguno de los provedores de caché soporta todas las estrategias de "
"concurrencia al caché. "
@@ -1593,7 +1614,16 @@
"gain no benefit from caching query results, leads Hibernate to disable "
"caching of query results by default. To use query caching, you will first "
"need to enable the query cache:"
-msgstr "El poner en caché los resultados de una petición introduce algunos sobrecostos en términos del procesamiento transaccional normal de sus aplicaciones. Por ejemplo, si pone en caché los resultados de una petición frente a Person, Hibernate necesitará rastrear cuando se deben invalidar esos resultados debido a los cambios que se han guardado en Person. Eso más el hecho de que la mayoría de las aplicaciones simplemente no ganan beneficio de poner los resultados en caché, lleva a Hibernate a deshabilitar el caché de los resultados de una petición por defecto. Para utilizar el caché de peticiones primero necesita habilitar el caché de peticiones:"
+msgstr ""
+"El poner en caché los resultados de una petición introduce algunos "
+"sobrecostos en términos del procesamiento transaccional normal de sus "
+"aplicaciones. Por ejemplo, si pone en caché los resultados de una petición "
+"frente a Person, Hibernate necesitará rastrear cuando se deben invalidar "
+"esos resultados debido a los cambios que se han guardado en Person. Eso más "
+"el hecho de que la mayoría de las aplicaciones simplemente no ganan "
+"beneficio de poner los resultados en caché, lleva a Hibernate a deshabilitar "
+"el caché de los resultados de una petición por defecto. Para utilizar el "
+"caché de peticiones primero necesita habilitar el caché de peticiones:"
#. Tag: para
#, no-c-format
@@ -1605,7 +1635,9 @@
msgid ""
"<classname>org.hibernate.cache.StandardQueryCache</classname>, holding the "
"cached query results"
-msgstr "<classname>org.hibernate.cache.StandardQueryCache</classname>, mantiene los resultados de la petición en caché"
+msgstr ""
+"<classname>org.hibernate.cache.StandardQueryCache</classname>, mantiene los "
+"resultados de la petición en caché"
#. Tag: para
#, no-c-format
@@ -1613,18 +1645,29 @@
"<classname>org.hibernate.cache.UpdateTimestampsCache</classname>, holding "
"timestamps of the most recent updates to queryable tables. These are used to "
"validate the results as they are served from the query cache."
-msgstr "<classname>org.hibernate.cache.UpdateTimestampsCache</classname>, mantiene los sellos de fecha de las actualizaciones más recientes a las tablas de peticiones. Estas se utilizan para validar los resultados ya que se sirven desde el caché de peticiones."
+msgstr ""
+"<classname>org.hibernate.cache.UpdateTimestampsCache</classname>, mantiene "
+"los sellos de fecha de las actualizaciones más recientes a las tablas de "
+"peticiones. Estas se utilizan para validar los resultados ya que se sirven "
+"desde el caché de peticiones."
#. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"If you configure your underlying cache implementation to use expiry or "
-"timeouts is very important that the cache timeout of the underlying cache "
+"timeouts is is very important that the cache timeout of the underlying cache "
"region for the UpdateTimestampsCache be set to a higher value than the "
"timeouts of any of the query caches. In fact, we recommend that the the "
"UpdateTimestampsCache region not be configured for expiry at all. Note, in "
"particular, that an LRU cache expiry policy is never appropriate."
-msgstr "Si configura su implementación de caché subyacente para utilizar los tiempos de expiración es muy importante que el tiempo de expiración del caché de la región de cachésubyacente para el UpdateTimestampsCache se establezca con un valor mayor que los tiempos de expiración de cualquiera de los cachés de resultados. De hecho, recomendamos que la región UpdateTimestampsCache no se configure con ninguna expiración. Observe en particular que nunca es apropiado una política de expiración de caché LRU. "
+msgstr ""
+"Si configura su implementación de caché subyacente para utilizar los tiempos "
+"de expiración es muy importante que el tiempo de expiración del caché de la "
+"región de cachésubyacente para el UpdateTimestampsCache se establezca con un "
+"valor mayor que los tiempos de expiración de cualquiera de los cachés de "
+"resultados. De hecho, recomendamos que la región UpdateTimestampsCache no se "
+"configure con ninguna expiración. Observe en particular que nunca es "
+"apropiado una política de expiración de caché LRU. "
#. Tag: para
#, no-c-format
@@ -1636,11 +1679,13 @@
"allows the query to look for existing cache results or add its results to "
"the cache when it is executed."
msgstr ""
-"Como lo mencionamos anteriormente, la mayoría de las consultas no se benefician del caché o de sus resultados; de modo que por defecto "
-"las consultas individuales no se ponen en caché incluso después de habilitar el caché para peticiones. Para habilitar el caché de resultados para una petición en particular, llame a "
-"<literal>org.hibernate.Query.setCacheable(true)</literal>. Esta llamada permite que la "
-"consulta busque resultados existentes en caché o que agregue sus resultados "
-"al caché cuando se ejecuta."
+"Como lo mencionamos anteriormente, la mayoría de las consultas no se "
+"benefician del caché o de sus resultados; de modo que por defecto las "
+"consultas individuales no se ponen en caché incluso después de habilitar el "
+"caché para peticiones. Para habilitar el caché de resultados para una "
+"petición en particular, llame a <literal>org.hibernate.Query.setCacheable"
+"(true)</literal>. Esta llamada permite que la consulta busque resultados "
+"existentes en caché o que agregue sus resultados al caché cuando se ejecuta."
#. Tag: para
#, no-c-format
@@ -1650,7 +1695,13 @@
"reaso, the query cache should always be used in conjunction with the second-"
"level cache for those entities expected to be cached as part of a query "
"result cache (just as with collection caching)."
-msgstr "El caché de peticiones no pone en caché el estado real de las entidades en el caché; pone en caché solo los valores del identificador y los resultados de tipo valor. Por esta razón, el caché de peticiones siempre se debe utilizar en conjunto con el caché de segundo nivel para aquellas entidades que se esperan poner en caché como parte de un caché de resultados de una petición (así como con el caché de colección). "
+msgstr ""
+"El caché de peticiones no pone en caché el estado real de las entidades en "
+"el caché; pone en caché solo los valores del identificador y los resultados "
+"de tipo valor. Por esta razón, el caché de peticiones siempre se debe "
+"utilizar en conjunto con el caché de segundo nivel para aquellas entidades "
+"que se esperan poner en caché como parte de un caché de resultados de una "
+"petición (así como con el caché de colección). "
#. Tag: title
#, no-c-format
@@ -1682,11 +1733,16 @@
"alternative to bulk eviction of the region via <literal>org.hibernate."
"SessionFactory.evictQueries()</literal>."
msgstr ""
-"Si quiere forzar que el caché de peticiones actualice una de sus regiones (olvídese de cualquier resultado en caché que se encuentre allí) puede utilizar <literal>org."
-"hibernate.Query.setCacheMode(CacheMode.REFRESH)</literal>. Junto con la región que ha definido para la petición dada, Hibernate forzará selectivamente los resultados en caché en esa región en particular que se va a actualizar. Esto es particularmente útil en casos donde los datos subyacentes pueden "
-"haber sido actualizados por medio de un proceso separado y esta es una "
-"alternativa más eficiente que la expulsión en masa de una región por medio de <literal>org.hibernate."
-"SessionFactory.evictQueries()</literal>."
+"Si quiere forzar que el caché de peticiones actualice una de sus regiones "
+"(olvídese de cualquier resultado en caché que se encuentre allí) puede "
+"utilizar <literal>org.hibernate.Query.setCacheMode(CacheMode.REFRESH)</"
+"literal>. Junto con la región que ha definido para la petición dada, "
+"Hibernate forzará selectivamente los resultados en caché en esa región en "
+"particular que se va a actualizar. Esto es particularmente útil en casos "
+"donde los datos subyacentes pueden haber sido actualizados por medio de un "
+"proceso separado y esta es una alternativa más eficiente que la expulsión en "
+"masa de una región por medio de <literal>org.hibernate.SessionFactory."
+"evictQueries()</literal>."
#. Tag: title
#, no-c-format
@@ -1842,7 +1898,8 @@
#. Tag: title
#, no-c-format
-msgid "Lists, maps, idbags and sets are the most efficient collections to update"
+msgid ""
+"Lists, maps, idbags and sets are the most efficient collections to update"
msgstr ""
"Las listas, mapas, idbags y conjuntos son las colecciones más eficientes de "
"actualizar"
@@ -2211,4 +2268,3 @@
"<literal>getQueries()</literal>, <literal>getEntityNames()</literal>, "
"<literal>getCollectionRoleNames()</literal> y "
"<literal>getSecondLevelCacheRegionNames()</literal>."
-
Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po 2010-04-14 16:27:11 UTC (rev 19232)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: performance\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:47\n"
+"POT-Creation-Date: 2010-02-11T05:38:15\n"
"PO-Revision-Date: 2010-01-05 09:38+1000\n"
"Last-Translator: Corina Roe <croe(a)redhat.com>\n"
"Language-Team: French <i18(a)redhat.com>\n"
@@ -1635,7 +1635,7 @@
#, no-c-format
msgid ""
"If you configure your underlying cache implementation to use expiry or "
-"timeouts is very important that the cache timeout of the underlying cache "
+"timeouts is is very important that the cache timeout of the underlying cache "
"region for the UpdateTimestampsCache be set to a higher value than the "
"timeouts of any of the query caches. In fact, we recommend that the the "
"UpdateTimestampsCache region not be configured for expiry at all. Note, in "
Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/performance.po 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/performance.po 2010-04-14 16:27:11 UTC (rev 19232)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: Collection_Mapping\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:47\n"
+"POT-Creation-Date: 2010-02-11T05:38:15\n"
"PO-Revision-Date: 2010-01-20 14:25+1000\n"
"Last-Translator: Xi HUANG <xhuang(a)redhat.com>\n"
"Language-Team: <en(a)li.org>\n"
@@ -1562,7 +1562,7 @@
#, no-c-format
msgid ""
"If you configure your underlying cache implementation to use expiry or "
-"timeouts is very important that the cache timeout of the underlying cache "
+"timeouts is is very important that the cache timeout of the underlying cache "
"region for the UpdateTimestampsCache be set to a higher value than the "
"timeouts of any of the query caches. In fact, we recommend that the the "
"UpdateTimestampsCache region not be configured for expiry at all. Note, in "
Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/performance.po 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/performance.po 2010-04-14 16:27:11 UTC (rev 19232)
@@ -108,7 +108,7 @@
msgstr ""
"Project-Id-Version: performance\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:47\n"
+"POT-Creation-Date: 2010-02-11T05:38:15\n"
"PO-Revision-Date: 2010-03-18 14:45+1000\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
@@ -407,7 +407,8 @@
#. Tag: para
#, no-c-format
msgid "retrieval that happens implicitly when an association is navigated"
-msgstr "Recuperações que acontecem implicitamente quando navegamos por uma associação"
+msgstr ""
+"Recuperações que acontecem implicitamente quando navegamos por uma associação"
#. Tag: para
#, no-c-format
@@ -638,8 +639,10 @@
#. Tag: para
#, no-c-format
-msgid "Certain operations do <emphasis>not</emphasis> require proxy initialization:"
-msgstr "Algumas operações <emphasis>não</emphasis> requerem inicialização por proxy: "
+msgid ""
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
+msgstr ""
+"Algumas operações <emphasis>não</emphasis> requerem inicialização por proxy: "
#. Tag: para
#, no-c-format
@@ -840,7 +843,8 @@
msgid ""
"You can use a collection filter to get the size of a collection without "
"initializing it:"
-msgstr "Você pode usar um filtro de coleção para saber seu tamanho sem inicializá-la:"
+msgstr ""
+"Você pode usar um filtro de coleção para saber seu tamanho sem inicializá-la:"
#. Tag: para
#, no-c-format
@@ -900,8 +904,10 @@
#. Tag: para
#, no-c-format
-msgid "Hibernate will now execute only three queries: the pattern is 10, 10, 5."
-msgstr "O Hibernate irá executar agora apenas três consultas; o padrão é 10, 10, 5."
+msgid ""
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
+msgstr ""
+"O Hibernate irá executar agora apenas três consultas; o padrão é 10, 10, 5."
#. Tag: para
#, no-c-format
@@ -983,17 +989,23 @@
"<interfacename>org.hibernate.Session</interfacename> until it is explicitly "
"disabled."
msgstr ""
-"Outra forma de afetar a estratégia de busca para o carregamento de objetos associados é através do chamado perfil de busca, que é uma associação de configuração de nomeada com o <interfacename>org.hibernate.SessionFactory</"
+"Outra forma de afetar a estratégia de busca para o carregamento de objetos "
+"associados é através do chamado perfil de busca, que é uma associação de "
+"configuração de nomeada com o <interfacename>org.hibernate.SessionFactory</"
"interfacename>, porém ativado pelo nome no <interfacename>org.hibernate."
"Session</interfacename>. Uma vez ativado no <interfacename>org.hibernate."
-"Session</interfacename>, o perfil de busca será afetado pelo <interfacename>org.hibernate.Session</interfacename> até que o mesmo seja completamente desativado."
+"Session</interfacename>, o perfil de busca será afetado pelo "
+"<interfacename>org.hibernate.Session</interfacename> até que o mesmo seja "
+"completamente desativado."
#. Tag: para
#, no-c-format
msgid ""
"So what does that mean? Well lets explain that by way of an example. Say we "
"have the following mappings:"
-msgstr "O que isto significa? A explicação será através de um exemplo. Vamos dizer que nós temos os seguintes mapeamentos:"
+msgstr ""
+"O que isto significa? A explicação será através de um exemplo. Vamos dizer "
+"que nós temos os seguintes mapeamentos:"
#. Tag: para
#, no-c-format
@@ -1006,7 +1018,16 @@
"fetching\" strategies via an HQL or criteria queries. But another option is "
"to use a fetch profile to achieve that. Just add the following to your "
"mapping:"
-msgstr "Normalmente, quando você recebe uma referência para um cliente em particular, o conjunto do cliente de pedidos será lento, significando que nós ainda não baixamos estes pedidos a partir do banco de dados. Na maioria das vezes isto é bom. Agora vamos imaginar que você possui um determinado caso de uso, onde é mais eficiente carregar o cliente e outros pedidos juntos. Uma maneira correta é utilizar as estratégias de \"busca dinâmica\" através de um HQL ou consultas de critério. Entretanto, outra opção é usar um perfil de busca para atingir o mesmo objeto. Apenas adicione o seguinte a seu mapeamento:"
+msgstr ""
+"Normalmente, quando você recebe uma referência para um cliente em "
+"particular, o conjunto do cliente de pedidos será lento, significando que "
+"nós ainda não baixamos estes pedidos a partir do banco de dados. Na maioria "
+"das vezes isto é bom. Agora vamos imaginar que você possui um determinado "
+"caso de uso, onde é mais eficiente carregar o cliente e outros pedidos "
+"juntos. Uma maneira correta é utilizar as estratégias de \"busca dinâmica\" "
+"através de um HQL ou consultas de critério. Entretanto, outra opção é usar "
+"um perfil de busca para atingir o mesmo objeto. Apenas adicione o seguinte a "
+"seu mapeamento:"
#. Tag: para
#, no-c-format
@@ -1018,7 +1039,9 @@
msgid ""
"Now the following code will actually load both the customer <emphasis>and "
"their orders</emphasis>:"
-msgstr "Agora que o código seguinte irá carregar ambos cliente <emphasis>e outros pedidos</emphasis>:"
+msgstr ""
+"Agora que o código seguinte irá carregar ambos cliente <emphasis>e outros "
+"pedidos</emphasis>:"
#. Tag: para
#, no-c-format
@@ -1027,7 +1050,8 @@
"support additional styles. See <ulink url=\"http://opensource.atlassian.com/"
"projects/hibernate/browse/HHH-3414\">HHH-3414</ulink> for details."
msgstr ""
-"Apenas os perfis de busca em estilo são suportados, mas planeja-se o suporte de estilos adicionais. Consulte <ulink url=\"http://opensource.atlassian.com/"
+"Apenas os perfis de busca em estilo são suportados, mas planeja-se o suporte "
+"de estilos adicionais. Consulte <ulink url=\"http://opensource.atlassian.com/"
"projects/hibernate/browse/HHH-3414\">HHH-3414</ulink> para maiores detalhes."
#. Tag: title
@@ -1451,7 +1475,8 @@
#. Tag: para
#, no-c-format
-msgid "None of the cache providers support all of the cache concurrency strategies."
+msgid ""
+"None of the cache providers support all of the cache concurrency strategies."
msgstr ""
"Nenhum provedor de cache suporta todas as estratégias de concorrência de "
"cache. "
@@ -1656,7 +1681,16 @@
"gain no benefit from caching query results, leads Hibernate to disable "
"caching of query results by default. To use query caching, you will first "
"need to enable the query cache:"
-msgstr "A aplicação do cache nos resultados de consulta introduz alguns resultados referentes o seu processamento transacional normal de aplicações. Por exemplo, se você realizar o cache nos resultados de uma consulta do Person Hibernate, você precisará acompanhar quando estes resultados deverão ser inválidos devido alterações salvas no Person. Tudo isto, acompanhado com o fato de que a maioria dos aplicativos não recebem benefício algum ao realizar o cache nos resultados da consulta, levando o Hibernate a desativar o cache de resultados de consulta por padrão. Para uso do cache de consulta, você primeiro precisa ativar o cache de consulta:"
+msgstr ""
+"A aplicação do cache nos resultados de consulta introduz alguns resultados "
+"referentes o seu processamento transacional normal de aplicações. Por "
+"exemplo, se você realizar o cache nos resultados de uma consulta do Person "
+"Hibernate, você precisará acompanhar quando estes resultados deverão ser "
+"inválidos devido alterações salvas no Person. Tudo isto, acompanhado com o "
+"fato de que a maioria dos aplicativos não recebem benefício algum ao "
+"realizar o cache nos resultados da consulta, levando o Hibernate a desativar "
+"o cache de resultados de consulta por padrão. Para uso do cache de consulta, "
+"você primeiro precisa ativar o cache de consulta:"
#. Tag: para
#, no-c-format
@@ -1668,7 +1702,9 @@
msgid ""
"<classname>org.hibernate.cache.StandardQueryCache</classname>, holding the "
"cached query results"
-msgstr "<classname>org.hibernate.cache.StandardQueryCache</classname>, mantendo os resultados da consulta com cache."
+msgstr ""
+"<classname>org.hibernate.cache.StandardQueryCache</classname>, mantendo os "
+"resultados da consulta com cache."
#. Tag: para
#, no-c-format
@@ -1676,18 +1712,28 @@
"<classname>org.hibernate.cache.UpdateTimestampsCache</classname>, holding "
"timestamps of the most recent updates to queryable tables. These are used to "
"validate the results as they are served from the query cache."
-msgstr "<classname>org.hibernate.cache.UpdateTimestampsCache</classname>, mantém os timestamps das atualizações mais recentes para tabelas consultáveis. Elas são usadas para validar os resultados uma vez que elas são servidas a partir do cache de consulta."
+msgstr ""
+"<classname>org.hibernate.cache.UpdateTimestampsCache</classname>, mantém os "
+"timestamps das atualizações mais recentes para tabelas consultáveis. Elas "
+"são usadas para validar os resultados uma vez que elas são servidas a partir "
+"do cache de consulta."
#. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"If you configure your underlying cache implementation to use expiry or "
-"timeouts is very important that the cache timeout of the underlying cache "
+"timeouts is is very important that the cache timeout of the underlying cache "
"region for the UpdateTimestampsCache be set to a higher value than the "
"timeouts of any of the query caches. In fact, we recommend that the the "
"UpdateTimestampsCache region not be configured for expiry at all. Note, in "
"particular, that an LRU cache expiry policy is never appropriate."
-msgstr "Se você configurar sua implementação de cache adjacente para usar expirar ou intervalo, é bastante importante que o intervalo do cache da região de cache adjacente para o UpdateTimestampsCache seja coonfigurado num valor mais alto que os intervalos de qualquer um dos caches de consulta. Na realidade, nós recomendamos que a região UpdateTimestampsCache não seja configurada para expirar. Perceba que uma política expirar do cache LRU nunca será apropriada."
+msgstr ""
+"Se você configurar sua implementação de cache adjacente para usar expirar ou "
+"intervalo, é bastante importante que o intervalo do cache da região de cache "
+"adjacente para o UpdateTimestampsCache seja coonfigurado num valor mais alto "
+"que os intervalos de qualquer um dos caches de consulta. Na realidade, nós "
+"recomendamos que a região UpdateTimestampsCache não seja configurada para "
+"expirar. Perceba que uma política expirar do cache LRU nunca será apropriada."
#. Tag: para
#, no-c-format
@@ -1699,8 +1745,11 @@
"allows the query to look for existing cache results or add its results to "
"the cache when it is executed."
msgstr ""
-"Conforme mencionado acima, a maioria das consultas não se beneficiam do cache ou de seus resultados. Portanto por padrão, "
-"as consultas individuais não estão em cache mesmo depois de ativar o cache de consulta. Para habilitar o caching de resultados, chame <literal>org.hibernate.Query.setCacheable(true)</literal>. Esta chamada permite que a consulta procure "
+"Conforme mencionado acima, a maioria das consultas não se beneficiam do "
+"cache ou de seus resultados. Portanto por padrão, as consultas individuais "
+"não estão em cache mesmo depois de ativar o cache de consulta. Para "
+"habilitar o caching de resultados, chame <literal>org.hibernate.Query."
+"setCacheable(true)</literal>. Esta chamada permite que a consulta procure "
"por resultados de caches existentes ou adicione seus resultados ao cache "
"quando for executado. "
@@ -1712,7 +1761,13 @@
"reaso, the query cache should always be used in conjunction with the second-"
"level cache for those entities expected to be cached as part of a query "
"result cache (just as with collection caching)."
-msgstr "O cache de consulta não realiza o cache ao estado de entidades atuais no cache, ele apenas realiza o cache nos valores identificadores e resultados do tipo de valor. Por esta razão, o cache de consulta deve sempre ser usado em conjunção com o cache de segundo nível para as entidades esperadas a sofrerem o cache como parte de um cache de resultado de consulta (apenas com o cache de coleção)."
+msgstr ""
+"O cache de consulta não realiza o cache ao estado de entidades atuais no "
+"cache, ele apenas realiza o cache nos valores identificadores e resultados "
+"do tipo de valor. Por esta razão, o cache de consulta deve sempre ser usado "
+"em conjunção com o cache de segundo nível para as entidades esperadas a "
+"sofrerem o cache como parte de um cache de resultado de consulta (apenas com "
+"o cache de coleção)."
#. Tag: title
#, no-c-format
@@ -1744,12 +1799,16 @@
"alternative to bulk eviction of the region via <literal>org.hibernate."
"SessionFactory.evictQueries()</literal>."
msgstr ""
-"Se você quiser forçar um cache de consulta para uma atualização de sua região (independente de quaisquer resultados com cache encontrados nesta região), "
-"você poderá usar <literal>org."
-"hibernate.Query.setCacheMode(CacheMode.REFRESH)</literal>. Juntamente com a região que você definiu para o cache gerado, o Hibernate seletivamente forçará os resultados com cache, naquela região particular a ser atualizada. Isto é particularmente útil em casos onde dados adjacentes podem ter sido "
-"atualizados através de um processo em separado , além de ser uma alternativa mais "
-"eficiente se aplicada ao despejo de uma região de cache através "
-"de <literal>SessionFactory.evictQueries()</literal>."
+"Se você quiser forçar um cache de consulta para uma atualização de sua "
+"região (independente de quaisquer resultados com cache encontrados nesta "
+"região), você poderá usar <literal>org.hibernate.Query.setCacheMode"
+"(CacheMode.REFRESH)</literal>. Juntamente com a região que você definiu para "
+"o cache gerado, o Hibernate seletivamente forçará os resultados com cache, "
+"naquela região particular a ser atualizada. Isto é particularmente útil em "
+"casos onde dados adjacentes podem ter sido atualizados através de um "
+"processo em separado , além de ser uma alternativa mais eficiente se "
+"aplicada ao despejo de uma região de cache através de "
+"<literal>SessionFactory.evictQueries()</literal>."
#. Tag: title
#, no-c-format
@@ -1905,7 +1964,8 @@
#. Tag: title
#, no-c-format
-msgid "Lists, maps, idbags and sets are the most efficient collections to update"
+msgid ""
+"Lists, maps, idbags and sets are the most efficient collections to update"
msgstr ""
"Listas, mapas, bags de id e conjuntos são coleções mais eficientes para "
"atualizar"
@@ -2270,4 +2330,3 @@
"</literal>, <literal>getEntityNames()</literal>, "
"<literal>getCollectionRoleNames()</literal>, e "
"<literal>getSecondLevelCacheRegionNames()</literal>. "
-
Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po 2010-04-14 16:27:11 UTC (rev 19232)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: performance\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:47\n"
+"POT-Creation-Date: 2010-02-11T05:38:15\n"
"PO-Revision-Date: 2010-03-15 15:27+1000\n"
"Last-Translator: Xi HUANG <xhuang(a)redhat.com>\n"
"Language-Team: <en(a)li.org>\n"
@@ -27,8 +27,16 @@
#. Tag: para
#, no-c-format
-msgid "Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve associated objects if the application needs to navigate the association. Fetch strategies can be declared in the O/R mapping metadata, or over-ridden by a particular HQL or <literal>Criteria</literal> query."
-msgstr "当应用程序需要在（Hibernate实体对象图的）关联关系间进行导航的时候，Hibernate 使用 <emphasis>抓取策略（fetching strategy）</emphasis> 获取关联对象。抓取策略可以在 O/R 映射的元数据中声明，也可以在特定的 HQL 或<literal>条件查询（Criteria Query）</literal>中重载声明。"
+msgid ""
+"Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve "
+"associated objects if the application needs to navigate the association. "
+"Fetch strategies can be declared in the O/R mapping metadata, or over-ridden "
+"by a particular HQL or <literal>Criteria</literal> query."
+msgstr ""
+"当应用程序需要在（Hibernate实体对象图的）关联关系间进行导航的时候，Hibernate "
+"使用 <emphasis>抓取策略（fetching strategy）</emphasis> 获取关联对象。抓取策"
+"略可以在 O/R 映射的元数据中声明，也可以在特定的 HQL 或<literal>条件查询"
+"（Criteria Query）</literal>中重载声明。"
#. Tag: para
#, no-c-format
@@ -37,23 +45,54 @@
#. Tag: para
#, no-c-format
-msgid "<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated instance or collection in the same <literal>SELECT</literal>, using an <literal>OUTER JOIN</literal>."
-msgstr "<emphasis>连接抓取（Join fetching）</emphasis>：Hibernate 通过在 <literal>SELECT</literal> 语句使用 <literal>OUTER JOIN</literal>（外连接）来获得对象的关联实例或者关联集合。 "
+msgid ""
+"<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated "
+"instance or collection in the same <literal>SELECT</literal>, using an "
+"<literal>OUTER JOIN</literal>."
+msgstr ""
+"<emphasis>连接抓取（Join fetching）</emphasis>：Hibernate 通过在 "
+"<literal>SELECT</literal> 语句使用 <literal>OUTER JOIN</literal>（外连接）来"
+"获得对象的关联实例或者关联集合。 "
#. Tag: para
#, no-c-format
-msgid "<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is used to retrieve the associated entity or collection. Unless you explicitly disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this second select will only be executed when you access the association."
-msgstr "<emphasis>查询抓取（Select fetching）</emphasis>：另外发送一条 <literal>SELECT</literal> 语句抓取当前对象的关联实体或集合。除非你显式的指定 <literal>lazy=\"false\"</literal> 禁止 延迟抓取（lazy fetching），否则只有当你真正访问关联关系的时候，才会执行第二条 select 语句。"
+msgid ""
+"<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is "
+"used to retrieve the associated entity or collection. Unless you explicitly "
+"disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this "
+"second select will only be executed when you access the association."
+msgstr ""
+"<emphasis>查询抓取（Select fetching）</emphasis>：另外发送一条 "
+"<literal>SELECT</literal> 语句抓取当前对象的关联实体或集合。除非你显式的指定 "
+"<literal>lazy=\"false\"</literal> 禁止 延迟抓取（lazy fetching），否则只有当"
+"你真正访问关联关系的时候，才会执行第二条 select 语句。"
#. Tag: para
#, no-c-format
-msgid "<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> is used to retrieve the associated collections for all entities retrieved in a previous query or fetch. Unless you explicitly disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this second select will only be executed when you access the association."
-msgstr "<emphasis>子查询抓取（Subselect fetching）</emphasis>：另外发送一条 <literal>SELECT</literal> 语句抓取在前面查询到（或者抓取到）的所有实体对象的关联集合。除非你显式的指定 <literal>lazy=\"false\"</literal> 禁止延迟抓取（lazy fetching），否则只有当你真正访问关联关系的时候，才会执行第二条 select 语句。"
+msgid ""
+"<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> "
+"is used to retrieve the associated collections for all entities retrieved in "
+"a previous query or fetch. Unless you explicitly disable lazy fetching by "
+"specifying <literal>lazy=\"false\"</literal>, this second select will only "
+"be executed when you access the association."
+msgstr ""
+"<emphasis>子查询抓取（Subselect fetching）</emphasis>：另外发送一条 "
+"<literal>SELECT</literal> 语句抓取在前面查询到（或者抓取到）的所有实体对象的"
+"关联集合。除非你显式的指定 <literal>lazy=\"false\"</literal> 禁止延迟抓取"
+"（lazy fetching），否则只有当你真正访问关联关系的时候，才会执行第二条 select "
+"语句。"
#. Tag: para
#, no-c-format
-msgid "<emphasis>Batch fetching</emphasis>: an optimization strategy for select fetching. Hibernate retrieves a batch of entity instances or collections in a single <literal>SELECT</literal> by specifying a list of primary or foreign keys."
-msgstr "<emphasis>批量抓取（Batch fetching）</emphasis>：对查询抓取的优化方案，通过指定一个主键或外键列表，Hibernate 使用单条 <literal>SELECT</literal> 语句获取一批对象实例或集合。"
+msgid ""
+"<emphasis>Batch fetching</emphasis>: an optimization strategy for select "
+"fetching. Hibernate retrieves a batch of entity instances or collections in "
+"a single <literal>SELECT</literal> by specifying a list of primary or "
+"foreign keys."
+msgstr ""
+"<emphasis>批量抓取（Batch fetching）</emphasis>：对查询抓取的优化方案，通过指"
+"定一个主键或外键列表，Hibernate 使用单条 <literal>SELECT</literal> 语句获取一"
+"批对象实例或集合。"
#. Tag: para
#, no-c-format
@@ -62,38 +101,86 @@
#. Tag: para
#, no-c-format
-msgid "<emphasis>Immediate fetching</emphasis>: an association, collection or attribute is fetched immediately when the owner is loaded."
-msgstr "<emphasis>Immediate fetching，立即抓取</emphasis>：当宿主被加载时，关联、集合或属性被立即抓取。"
+msgid ""
+"<emphasis>Immediate fetching</emphasis>: an association, collection or "
+"attribute is fetched immediately when the owner is loaded."
+msgstr ""
+"<emphasis>Immediate fetching，立即抓取</emphasis>：当宿主被加载时，关联、集合"
+"或属性被立即抓取。"
#. Tag: para
#, no-c-format
-msgid "<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when the application invokes an operation upon that collection. This is the default for collections."
-msgstr "<emphasis>Lazy collection fetching，延迟集合抓取</emphasis>：直到应用程序对集合进行了一次操作时，集合才被抓取（对集合而言这是默认行为）。"
+msgid ""
+"<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when "
+"the application invokes an operation upon that collection. This is the "
+"default for collections."
+msgstr ""
+"<emphasis>Lazy collection fetching，延迟集合抓取</emphasis>：直到应用程序对集"
+"合进行了一次操作时，集合才被抓取（对集合而言这是默认行为）。"
#. Tag: para
#, no-c-format
-msgid "<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements of the collection are accessed from the database as needed. Hibernate tries not to fetch the whole collection into memory unless absolutely needed. It is suitable for large collections."
-msgstr "<emphasis>\"Extra-lazy\" collection fetching,\"Extra-lazy\" 集合抓取</emphasis>：对集合类中的每个元素而言，都是直到需要时才去访问数据库。除非绝对必要，Hibernate 不会试图去把整个集合都抓取到内存里来（适用于非常大的集合）。"
+msgid ""
+"<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements "
+"of the collection are accessed from the database as needed. Hibernate tries "
+"not to fetch the whole collection into memory unless absolutely needed. It "
+"is suitable for large collections."
+msgstr ""
+"<emphasis>\"Extra-lazy\" collection fetching,\"Extra-lazy\" 集合抓取</"
+"emphasis>：对集合类中的每个元素而言，都是直到需要时才去访问数据库。除非绝对必"
+"要，Hibernate 不会试图去把整个集合都抓取到内存里来（适用于非常大的集合）。"
#. Tag: para
#, no-c-format
-msgid "<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched when a method other than the identifier getter is invoked upon the associated object."
-msgstr "<emphasis>Proxy fetching，代理抓取</emphasis>：对返回单值的关联而言，当其某个方法被调用，而非对其关键字进行 get 操作时才抓取。"
+msgid ""
+"<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched "
+"when a method other than the identifier getter is invoked upon the "
+"associated object."
+msgstr ""
+"<emphasis>Proxy fetching，代理抓取</emphasis>：对返回单值的关联而言，当其某个"
+"方法被调用，而非对其关键字进行 get 操作时才抓取。"
#. Tag: para
#, no-c-format
-msgid "<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is fetched when the instance variable is accessed. Compared to proxy fetching, this approach is less lazy; the association is fetched even when only the identifier is accessed. It is also more transparent, since no proxy is visible to the application. This approach requires buildtime bytecode instrumentation and is rarely necessary."
-msgstr "<emphasis>\"No-proxy\" fetching，非代理抓取</emphasis>：对返回单值的关联而言，当实例变量被访问的时候进行抓取。与上面的代理抓取相比，这种方法没有那么“延迟”得厉害（就算只访问标识符，也会导致关联抓取）但是更加透明，因为对应用程序来说，不再看到 proxy。这种方法需要在编译期间进行字节码增强操作，因此很少需要用到。"
+msgid ""
+"<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is "
+"fetched when the instance variable is accessed. Compared to proxy fetching, "
+"this approach is less lazy; the association is fetched even when only the "
+"identifier is accessed. It is also more transparent, since no proxy is "
+"visible to the application. This approach requires buildtime bytecode "
+"instrumentation and is rarely necessary."
+msgstr ""
+"<emphasis>\"No-proxy\" fetching，非代理抓取</emphasis>：对返回单值的关联而"
+"言，当实例变量被访问的时候进行抓取。与上面的代理抓取相比，这种方法没有那么“延"
+"迟”得厉害（就算只访问标识符，也会导致关联抓取）但是更加透明，因为对应用程序来"
+"说，不再看到 proxy。这种方法需要在编译期间进行字节码增强操作，因此很少需要用"
+"到。"
#. Tag: para
#, no-c-format
-msgid "<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued association is fetched when the instance variable is accessed. This approach requires buildtime bytecode instrumentation and is rarely necessary."
-msgstr "<emphasis>Lazy attribute fetching，属性延迟加载</emphasis>：对属性或返回单值的关联而言，当其实例变量被访问的时候进行抓取。需要编译期字节码强化，因此这一方法很少是必要的。"
+msgid ""
+"<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued "
+"association is fetched when the instance variable is accessed. This approach "
+"requires buildtime bytecode instrumentation and is rarely necessary."
+msgstr ""
+"<emphasis>Lazy attribute fetching，属性延迟加载</emphasis>：对属性或返回单值"
+"的关联而言，当其实例变量被访问的时候进行抓取。需要编译期字节码强化，因此这一"
+"方法很少是必要的。"
#. Tag: para
#, no-c-format
-msgid "We have two orthogonal notions here: <emphasis>when</emphasis> is the association fetched and <emphasis>how</emphasis> is it fetched. It is important that you do not confuse them. We use <literal>fetch</literal> to tune performance. We can use <literal>lazy</literal> to define a contract for what data is always available in any detached instance of a particular class."
-msgstr "这里有两个正交的概念：关联<emphasis>何时</emphasis>被抓取，以及被<emphasis>如何</emphasis>抓取（会采用什么样的 SQL 语句）。注意不要混淆它们。我们使用<literal>抓取</literal>来改善性能。我们使用<literal>延迟</literal>来定义一些契约，对某特定类的某个脱管的实例，知道有哪些数据是可以使用的。"
+msgid ""
+"We have two orthogonal notions here: <emphasis>when</emphasis> is the "
+"association fetched and <emphasis>how</emphasis> is it fetched. It is "
+"important that you do not confuse them. We use <literal>fetch</literal> to "
+"tune performance. We can use <literal>lazy</literal> to define a contract "
+"for what data is always available in any detached instance of a particular "
+"class."
+msgstr ""
+"这里有两个正交的概念：关联<emphasis>何时</emphasis>被抓取，以及被<emphasis>如"
+"何</emphasis>抓取（会采用什么样的 SQL 语句）。注意不要混淆它们。我们使用"
+"<literal>抓取</literal>来改善性能。我们使用<literal>延迟</literal>来定义一些"
+"契约，对某特定类的某个脱管的实例，知道有哪些数据是可以使用的。"
#. Tag: title
#, no-c-format
@@ -102,33 +189,75 @@
#. Tag: para
#, no-c-format
-msgid "By default, Hibernate3 uses lazy select fetching for collections and lazy proxy fetching for single-valued associations. These defaults make sense for most associations in the majority of applications."
-msgstr "默认情况下，Hibernate 3 对集合使用延迟 select 抓取，对返回单值的关联使用延迟代理抓取。对几乎是所有的应用而言，其绝大多数的关联，这种策略都是有效的。"
+msgid ""
+"By default, Hibernate3 uses lazy select fetching for collections and lazy "
+"proxy fetching for single-valued associations. These defaults make sense for "
+"most associations in the majority of applications."
+msgstr ""
+"默认情况下，Hibernate 3 对集合使用延迟 select 抓取，对返回单值的关联使用延迟"
+"代理抓取。对几乎是所有的应用而言，其绝大多数的关联，这种策略都是有效的。"
#. Tag: para
#, no-c-format
-msgid "If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate will use the batch fetch optimization for lazy fetching. This optimization can also be enabled at a more granular level."
-msgstr "假若你设置了 <literal>hibernate.default_batch_fetch_size</literal>，Hibernate 会对延迟加载采取批量抓取优化措施（这种优化也可能会在更细化的级别打开）。"
+msgid ""
+"If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate "
+"will use the batch fetch optimization for lazy fetching. This optimization "
+"can also be enabled at a more granular level."
+msgstr ""
+"假若你设置了 <literal>hibernate.default_batch_fetch_size</literal>，"
+"Hibernate 会对延迟加载采取批量抓取优化措施（这种优化也可能会在更细化的级别打"
+"开）。"
#. Tag: para
#, no-c-format
-msgid "Please be aware that access to a lazy association outside of the context of an open Hibernate session will result in an exception. For example:"
-msgstr "然而，你必须了解延迟抓取带来的一个问题。在一个打开的 Hibernate session 上下文之外调用延迟集合会导致一次意外。比如： "
+msgid ""
+"Please be aware that access to a lazy association outside of the context of "
+"an open Hibernate session will result in an exception. For example:"
+msgstr ""
+"然而，你必须了解延迟抓取带来的一个问题。在一个打开的 Hibernate session 上下文"
+"之外调用延迟集合会导致一次意外。比如： "
#. Tag: para
#, no-c-format
-msgid "Since the permissions collection was not initialized when the <literal>Session</literal> was closed, the collection will not be able to load its state. <emphasis>Hibernate does not support lazy initialization for detached objects</emphasis>. This can be fixed by moving the code that reads from the collection to just before the transaction is committed."
-msgstr "在 <literal>Session</literal> 关闭后，permessions 集合将是未实例化的、不再可用，因此无法正常载入其状态。 <emphasis>Hibernate 对脱管对象不支持延迟实例化</emphasis>。这里的修改方法是将 permissions 读取数据的代码移到事务提交之前。"
+msgid ""
+"Since the permissions collection was not initialized when the "
+"<literal>Session</literal> was closed, the collection will not be able to "
+"load its state. <emphasis>Hibernate does not support lazy initialization for "
+"detached objects</emphasis>. This can be fixed by moving the code that reads "
+"from the collection to just before the transaction is committed."
+msgstr ""
+"在 <literal>Session</literal> 关闭后，permessions 集合将是未实例化的、不再可"
+"用，因此无法正常载入其状态。 <emphasis>Hibernate 对脱管对象不支持延迟实例化</"
+"emphasis>。这里的修改方法是将 permissions 读取数据的代码移到事务提交之前。"
#. Tag: para
#, no-c-format
-msgid "Alternatively, you can use a non-lazy collection or association, by specifying <literal>lazy=\"false\"</literal> for the association mapping. However, it is intended that lazy initialization be used for almost all collections and associations. If you define too many non-lazy associations in your object model, Hibernate will fetch the entire database into memory in every transaction."
-msgstr "除此之外，通过对关联映射指定 <literal>lazy=\"false\"</literal>，我们也可以使用非延迟的集合或关联。但是，对绝大部分集合来说，更推荐使用延迟方式抓取数据。如果在你的对象模型中定义了太多的非延迟关联，Hibernate 最终几乎需要在每个事务中载入整个数据库到内存中。"
+msgid ""
+"Alternatively, you can use a non-lazy collection or association, by "
+"specifying <literal>lazy=\"false\"</literal> for the association mapping. "
+"However, it is intended that lazy initialization be used for almost all "
+"collections and associations. If you define too many non-lazy associations "
+"in your object model, Hibernate will fetch the entire database into memory "
+"in every transaction."
+msgstr ""
+"除此之外，通过对关联映射指定 <literal>lazy=\"false\"</literal>，我们也可以使"
+"用非延迟的集合或关联。但是，对绝大部分集合来说，更推荐使用延迟方式抓取数据。"
+"如果在你的对象模型中定义了太多的非延迟关联，Hibernate 最终几乎需要在每个事务"
+"中载入整个数据库到内存中。"
#. Tag: para
#, no-c-format
-msgid "On the other hand, you can use join fetching, which is non-lazy by nature, instead of select fetching in a particular transaction. We will now explain how to customize the fetching strategy. In Hibernate3, the mechanisms for choosing a fetch strategy are identical for single-valued associations and collections."
-msgstr "但是，另一方面，在一些特殊的事务中，我们也经常需要使用到连接抓取（它本身上就是非延迟的），以代替查询抓取。 下面我们将会很快明白如何具体的定制 Hibernate 中的抓取策略。在 Hibernate3 中，具体选择哪种抓取策略的机制是和选择 单值关联或集合关联相一致的。 "
+msgid ""
+"On the other hand, you can use join fetching, which is non-lazy by nature, "
+"instead of select fetching in a particular transaction. We will now explain "
+"how to customize the fetching strategy. In Hibernate3, the mechanisms for "
+"choosing a fetch strategy are identical for single-valued associations and "
+"collections."
+msgstr ""
+"但是，另一方面，在一些特殊的事务中，我们也经常需要使用到连接抓取（它本身上就"
+"是非延迟的），以代替查询抓取。 下面我们将会很快明白如何具体的定制 Hibernate "
+"中的抓取策略。在 Hibernate3 中，具体选择哪种抓取策略的机制是和选择 单值关联或"
+"集合关联相一致的。 "
#. Tag: title
#, no-c-format
@@ -137,18 +266,26 @@
#. Tag: para
#, no-c-format
-msgid "Select fetching (the default) is extremely vulnerable to N+1 selects problems, so we might want to enable join fetching in the mapping document:"
-msgstr "查询抓取（默认的）在 N+1 查询的情况下是极其脆弱的，因此我们可能会要求在映射文档中定义使用连接抓取："
+msgid ""
+"Select fetching (the default) is extremely vulnerable to N+1 selects "
+"problems, so we might want to enable join fetching in the mapping document:"
+msgstr ""
+"查询抓取（默认的）在 N+1 查询的情况下是极其脆弱的，因此我们可能会要求在映射文"
+"档中定义使用连接抓取："
#. Tag: para
#, no-c-format
-msgid "The <literal>fetch</literal> strategy defined in the mapping document affects:"
-msgstr "在映射文档中定义的<literal>抓取</literal>策略将会对以下列表条目产生影响："
+msgid ""
+"The <literal>fetch</literal> strategy defined in the mapping document "
+"affects:"
+msgstr ""
+"在映射文档中定义的<literal>抓取</literal>策略将会对以下列表条目产生影响："
#. Tag: para
#, no-c-format
msgid "retrieval via <literal>get()</literal> or <literal>load()</literal>"
-msgstr "通过 <literal>get()</literal> 或 <literal>load()</literal> 方法取得数据。"
+msgstr ""
+"通过 <literal>get()</literal> 或 <literal>load()</literal> 方法取得数据。"
#. Tag: para
#, no-c-format
@@ -167,27 +304,53 @@
#. Tag: para
#, no-c-format
-msgid "Irrespective of the fetching strategy you use, the defined non-lazy graph is guaranteed to be loaded into memory. This might, however, result in several immediate selects being used to execute a particular HQL query."
-msgstr "不管你使用哪种抓取策略，定义为非延迟的类图会被保证一定装载入内存。注意这可能意味着在一条 HQL 查询后紧跟着一系列的查询。 "
+msgid ""
+"Irrespective of the fetching strategy you use, the defined non-lazy graph is "
+"guaranteed to be loaded into memory. This might, however, result in several "
+"immediate selects being used to execute a particular HQL query."
+msgstr ""
+"不管你使用哪种抓取策略，定义为非延迟的类图会被保证一定装载入内存。注意这可能"
+"意味着在一条 HQL 查询后紧跟着一系列的查询。 "
#. Tag: para
#, no-c-format
-msgid "Usually, the mapping document is not used to customize fetching. Instead, we keep the default behavior, and override it for a particular transaction, using <literal>left join fetch</literal> in HQL. This tells Hibernate to fetch the association eagerly in the first select, using an outer join. In the <literal>Criteria</literal> query API, you would use <literal>setFetchMode(FetchMode.JOIN)</literal>."
-msgstr "通常情况下，我们并不使用映射文档进行抓取策略的定制。更多的是，保持其默认值，然后在特定的事务中， 使用 HQL 的<literal>左连接抓取（left join fetch）</literal> 对其进行重载。这将通知 Hibernate在第一次查询中使用外部关联（outer join），直接得到其关联数据。在<literal>条件查询</literal> API 中，应该调用 <literal>setFetchMode（FetchMode.JOIN）</literal>语句。 "
+msgid ""
+"Usually, the mapping document is not used to customize fetching. Instead, we "
+"keep the default behavior, and override it for a particular transaction, "
+"using <literal>left join fetch</literal> in HQL. This tells Hibernate to "
+"fetch the association eagerly in the first select, using an outer join. In "
+"the <literal>Criteria</literal> query API, you would use "
+"<literal>setFetchMode(FetchMode.JOIN)</literal>."
+msgstr ""
+"通常情况下，我们并不使用映射文档进行抓取策略的定制。更多的是，保持其默认值，"
+"然后在特定的事务中， 使用 HQL 的<literal>左连接抓取（left join fetch）</"
+"literal> 对其进行重载。这将通知 Hibernate在第一次查询中使用外部关联（outer "
+"join），直接得到其关联数据。在<literal>条件查询</literal> API 中，应该调用 "
+"<literal>setFetchMode（FetchMode.JOIN）</literal>语句。 "
#. Tag: para
#, no-c-format
-msgid "If you want to change the fetching strategy used by <literal>get()</literal> or <literal>load()</literal>, you can use a <literal>Criteria</literal> query. For example:"
-msgstr "也许你喜欢仅仅通过条件查询，就可以改变 <literal>get()</literal> 或 <literal>load()</literal> 语句中的数据抓取策略。例如： "
+msgid ""
+"If you want to change the fetching strategy used by <literal>get()</literal> "
+"or <literal>load()</literal>, you can use a <literal>Criteria</literal> "
+"query. For example:"
+msgstr ""
+"也许你喜欢仅仅通过条件查询，就可以改变 <literal>get()</literal> 或 "
+"<literal>load()</literal> 语句中的数据抓取策略。例如： "
#. Tag: para
#, no-c-format
-msgid "This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan\"."
-msgstr "这就是其他 ORM 解决方案的“抓取计划（fetch plan）”在 Hibernate 中的等价物。"
+msgid ""
+"This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan"
+"\"."
+msgstr ""
+"这就是其他 ORM 解决方案的“抓取计划（fetch plan）”在 Hibernate 中的等价物。"
#. Tag: para
#, no-c-format
-msgid "A completely different approach to problems with N+1 selects is to use the second-level cache."
+msgid ""
+"A completely different approach to problems with N+1 selects is to use the "
+"second-level cache."
msgstr "截然不同的一种避免 N+1 次查询的方法是，使用二级缓存。 "
#. Tag: title
@@ -197,28 +360,61 @@
#. Tag: para
#, no-c-format
-msgid "Lazy fetching for collections is implemented using Hibernate's own implementation of persistent collections. However, a different mechanism is needed for lazy behavior in single-ended associations. The target entity of the association must be proxied. Hibernate implements lazy initializing proxies for persistent objects using runtime bytecode enhancement which is accessed via the CGLIB library."
-msgstr "在 Hinerbate 中，对集合的延迟抓取的采用了自己的实现方法。但是，对于单端关联的延迟抓取，则需要采用 其他不同的机制。单端关联的目标实体必须使用代理，Hihernate 在运行期二进制级（通过优异的 CGLIB 库）， 为持久对象实现了延迟载入代理。 "
+msgid ""
+"Lazy fetching for collections is implemented using Hibernate's own "
+"implementation of persistent collections. However, a different mechanism is "
+"needed for lazy behavior in single-ended associations. The target entity of "
+"the association must be proxied. Hibernate implements lazy initializing "
+"proxies for persistent objects using runtime bytecode enhancement which is "
+"accessed via the CGLIB library."
+msgstr ""
+"在 Hinerbate 中，对集合的延迟抓取的采用了自己的实现方法。但是，对于单端关联的"
+"延迟抓取，则需要采用 其他不同的机制。单端关联的目标实体必须使用代理，"
+"Hihernate 在运行期二进制级（通过优异的 CGLIB 库）， 为持久对象实现了延迟载入"
+"代理。 "
#. Tag: para
#, no-c-format
-msgid "At startup, Hibernate3 generates proxies by default for all persistent classes and uses them to enable lazy fetching of <literal>many-to-one</literal> and <literal>one-to-one</literal> associations."
-msgstr "默认的，Hibernate3 将会为所有的持久对象产生代理（在启动阶段），然后使用他们实现 <literal>多对一（many-to-one）</literal>关联和<literal>一对一（one-to-one）</literal> 关联的延迟抓取。 "
+msgid ""
+"At startup, Hibernate3 generates proxies by default for all persistent "
+"classes and uses them to enable lazy fetching of <literal>many-to-one</"
+"literal> and <literal>one-to-one</literal> associations."
+msgstr ""
+"默认的，Hibernate3 将会为所有的持久对象产生代理（在启动阶段），然后使用他们实"
+"现 <literal>多对一（many-to-one）</literal>关联和<literal>一对一（one-to-"
+"one）</literal> 关联的延迟抓取。 "
#. Tag: para
#, no-c-format
-msgid "The mapping file may declare an interface to use as the proxy interface for that class, with the <literal>proxy</literal> attribute. By default, Hibernate uses a subclass of the class. <emphasis>The proxied class must implement a default constructor with at least package visibility. This constructor is recommended for all persistent classes</emphasis>."
-msgstr "在映射文件中，可以通过设置 <literal>proxy</literal> 属性为目标 class 声明一个接口供代理接口使用。 默认的，Hibernate 将会使用该类的一个子类。<emphasis>注意：被代理的类必须实现一个至少包可见的默认构造函数，我们建议所有的持久类都应拥有这样的构造函数。</emphasis>"
+msgid ""
+"The mapping file may declare an interface to use as the proxy interface for "
+"that class, with the <literal>proxy</literal> attribute. By default, "
+"Hibernate uses a subclass of the class. <emphasis>The proxied class must "
+"implement a default constructor with at least package visibility. This "
+"constructor is recommended for all persistent classes</emphasis>."
+msgstr ""
+"在映射文件中，可以通过设置 <literal>proxy</literal> 属性为目标 class 声明一个"
+"接口供代理接口使用。 默认的，Hibernate 将会使用该类的一个子类。<emphasis>注"
+"意：被代理的类必须实现一个至少包可见的默认构造函数，我们建议所有的持久类都应"
+"拥有这样的构造函数。</emphasis>"
#. Tag: para
#, no-c-format
-msgid "There are potential problems to note when extending this approach to polymorphic classes.For example:"
+msgid ""
+"There are potential problems to note when extending this approach to "
+"polymorphic classes.For example:"
msgstr "在如此方式定义一个多态类的时候，有许多值得注意的常见性的问题，例如： "
#. Tag: para
#, no-c-format
-msgid "Firstly, instances of <literal>Cat</literal> will never be castable to <literal>DomesticCat</literal>, even if the underlying instance is an instance of <literal>DomesticCat</literal>:"
-msgstr "首先，<literal>Cat</literal> 实例永远不可以被强制转换为 <literal>DomesticCat</literal>，即使它本身就是 <literal>DomesticCat</literal> 实例。"
+msgid ""
+"Firstly, instances of <literal>Cat</literal> will never be castable to "
+"<literal>DomesticCat</literal>, even if the underlying instance is an "
+"instance of <literal>DomesticCat</literal>:"
+msgstr ""
+"首先，<literal>Cat</literal> 实例永远不可以被强制转换为 "
+"<literal>DomesticCat</literal>，即使它本身就是 <literal>DomesticCat</"
+"literal> 实例。"
#. Tag: para
#, no-c-format
@@ -227,28 +423,61 @@
#. Tag: para
#, no-c-format
-msgid "However, the situation is not quite as bad as it looks. Even though we now have two references to different proxy objects, the underlying instance will still be the same object:"
-msgstr "虽然如此，但实际情况并没有看上去那么糟糕。虽然我们现在有两个不同的引用，分别指向这两个不同的代理对象，但实际上，其底层应该是同一个实例对象："
+msgid ""
+"However, the situation is not quite as bad as it looks. Even though we now "
+"have two references to different proxy objects, the underlying instance will "
+"still be the same object:"
+msgstr ""
+"虽然如此，但实际情况并没有看上去那么糟糕。虽然我们现在有两个不同的引用，分别"
+"指向这两个不同的代理对象，但实际上，其底层应该是同一个实例对象："
#. Tag: para
#, no-c-format
-msgid "Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or a class with any <literal>final</literal> methods."
-msgstr "第三，你不能对 <literal>final</literal> 类或具有 <literal>final</literal> 方法的类使用 CGLIB 代理。"
+msgid ""
+"Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or "
+"a class with any <literal>final</literal> methods."
+msgstr ""
+"第三，你不能对 <literal>final</literal> 类或具有 <literal>final</literal> 方"
+"法的类使用 CGLIB 代理。"
#. Tag: para
#, no-c-format
-msgid "Finally, if your persistent object acquires any resources upon instantiation (e.g. in initializers or default constructor), then those resources will also be acquired by the proxy. The proxy class is an actual subclass of the persistent class."
-msgstr "最后，如果你的持久化对象在实例化时需要某些资源（例如，在实例化方法、默认构造方法中），那么代理对象也同样需要使用这些资源。实际上，代理类是持久化类的子类。"
+msgid ""
+"Finally, if your persistent object acquires any resources upon instantiation "
+"(e.g. in initializers or default constructor), then those resources will "
+"also be acquired by the proxy. The proxy class is an actual subclass of the "
+"persistent class."
+msgstr ""
+"最后，如果你的持久化对象在实例化时需要某些资源（例如，在实例化方法、默认构造"
+"方法中），那么代理对象也同样需要使用这些资源。实际上，代理类是持久化类的子"
+"类。"
#. Tag: para
#, no-c-format
-msgid "These problems are all due to fundamental limitations in Java's single inheritance model. To avoid these problems your persistent classes must each implement an interface that declares its business methods. You should specify these interfaces in the mapping file where <literal>CatImpl</literal> implements the interface <literal>Cat</literal> and <literal>DomesticCatImpl</literal> implements the interface <literal>DomesticCat</literal>. For example:"
-msgstr "这些问题都源于 Java 的单根继承模型的天生限制。如果你希望避免这些问题，那么你的每个持久化类必须实现一个接口， 在此接口中已经声明了其业务方法。然后，你需要在映射文档中再指定这些接口，如 <literal>CatImpl</literal> 实现 <literal>Cat</literal> 而 <literal>DomesticCatImpl</literal> 实现 <literal>DomesticCat</literal> 接口。例如："
+msgid ""
+"These problems are all due to fundamental limitations in Java's single "
+"inheritance model. To avoid these problems your persistent classes must each "
+"implement an interface that declares its business methods. You should "
+"specify these interfaces in the mapping file where <literal>CatImpl</"
+"literal> implements the interface <literal>Cat</literal> and "
+"<literal>DomesticCatImpl</literal> implements the interface "
+"<literal>DomesticCat</literal>. For example:"
+msgstr ""
+"这些问题都源于 Java 的单根继承模型的天生限制。如果你希望避免这些问题，那么你"
+"的每个持久化类必须实现一个接口， 在此接口中已经声明了其业务方法。然后，你需要"
+"在映射文档中再指定这些接口，如 <literal>CatImpl</literal> 实现 <literal>Cat</"
+"literal> 而 <literal>DomesticCatImpl</literal> 实现 <literal>DomesticCat</"
+"literal> 接口。例如："
#. Tag: para
#, no-c-format
-msgid "Then proxies for instances of <literal>Cat</literal> and <literal>DomesticCat</literal> can be returned by <literal>load()</literal> or <literal>iterate()</literal>."
-msgstr "然后，<literal>load()</literal> 和 <literal>iterate()</literal> 永远也不会返回 <literal>Cat</literal> 和 <literal>DomesticCat</literal> 实例的代理。"
+msgid ""
+"Then proxies for instances of <literal>Cat</literal> and "
+"<literal>DomesticCat</literal> can be returned by <literal>load()</literal> "
+"or <literal>iterate()</literal>."
+msgstr ""
+"然后，<literal>load()</literal> 和 <literal>iterate()</literal> 永远也不会返"
+"回 <literal>Cat</literal> 和 <literal>DomesticCat</literal> 实例的代理。"
#. Tag: title
#, no-c-format
@@ -262,23 +491,37 @@
#. Tag: para
#, no-c-format
-msgid "Relationships are also lazily initialized. This means you must declare any properties to be of type <literal>Cat</literal>, not <literal>CatImpl</literal>."
-msgstr "这里，对象之间的关系也将被延迟载入。这就意味着，你应该将属性声明为 <literal>Cat</literal>，而不是 <literal>CatImpl</literal>。"
+msgid ""
+"Relationships are also lazily initialized. This means you must declare any "
+"properties to be of type <literal>Cat</literal>, not <literal>CatImpl</"
+"literal>."
+msgstr ""
+"这里，对象之间的关系也将被延迟载入。这就意味着，你应该将属性声明为 "
+"<literal>Cat</literal>，而不是 <literal>CatImpl</literal>。"
#. Tag: para
#, no-c-format
-msgid "Certain operations do <emphasis>not</emphasis> require proxy initialization:"
+msgid ""
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
msgstr "有些方法中是<emphasis>不</emphasis>需要代理初始化的："
#. Tag: para
#, no-c-format
-msgid "<literal>equals()</literal>: if the persistent class does not override <literal>equals()</literal>"
-msgstr "<literal>equals()</literal> 方法，如果持久类没有重载 <literal>equals()</literal> 方法。"
+msgid ""
+"<literal>equals()</literal>: if the persistent class does not override "
+"<literal>equals()</literal>"
+msgstr ""
+"<literal>equals()</literal> 方法，如果持久类没有重载 <literal>equals()</"
+"literal> 方法。"
#. Tag: para
#, no-c-format
-msgid "<literal>hashCode()</literal>: if the persistent class does not override <literal>hashCode()</literal>"
-msgstr "<literal>hashCode()</literal>：如果持久类没有重载 <literal>hashCode()</literal> 方法。"
+msgid ""
+"<literal>hashCode()</literal>: if the persistent class does not override "
+"<literal>hashCode()</literal>"
+msgstr ""
+"<literal>hashCode()</literal>：如果持久类没有重载 <literal>hashCode()</"
+"literal> 方法。"
#. Tag: para
#, no-c-format
@@ -287,13 +530,24 @@
#. Tag: para
#, no-c-format
-msgid "Hibernate will detect persistent classes that override <literal>equals()</literal> or <literal>hashCode()</literal>."
-msgstr "Hibernate 将会识别出那些重载了 <literal>equals()</literal>、或 <literal>hashCode()</literal> 方法的持久化类。"
+msgid ""
+"Hibernate will detect persistent classes that override <literal>equals()</"
+"literal> or <literal>hashCode()</literal>."
+msgstr ""
+"Hibernate 将会识别出那些重载了 <literal>equals()</literal>、或 "
+"<literal>hashCode()</literal> 方法的持久化类。"
#. Tag: para
#, no-c-format
-msgid "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default <literal>lazy=\"proxy\"</literal>, you can avoid problems associated with typecasting. However, buildtime bytecode instrumentation is required, and all operations will result in immediate proxy initialization."
-msgstr "若选择 <literal>lazy=\"no-proxy\"</literal> 而非默认的 <literal>lazy=\"proxy\"</literal>，我们可以避免类型转换带来的问题。然而，这样我们就需要编译期字节码增强，并且所有的操作都会导致立刻进行代理初始化。 "
+msgid ""
+"By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
+"<literal>lazy=\"proxy\"</literal>, you can avoid problems associated with "
+"typecasting. However, buildtime bytecode instrumentation is required, and "
+"all operations will result in immediate proxy initialization."
+msgstr ""
+"若选择 <literal>lazy=\"no-proxy\"</literal> 而非默认的 <literal>lazy=\"proxy"
+"\"</literal>，我们可以避免类型转换带来的问题。然而，这样我们就需要编译期字节"
+"码增强，并且所有的操作都会导致立刻进行代理初始化。 "
#. Tag: title
#, no-c-format
@@ -302,53 +556,149 @@
#. Tag: para
#, no-c-format
-msgid "A <literal>LazyInitializationException</literal> will be thrown by Hibernate if an uninitialized collection or proxy is accessed outside of the scope of the <literal>Session</literal>, i.e., when the entity owning the collection or having the reference to the proxy is in the detached state."
-msgstr "在 <literal>Session</literal> 范围之外访问未初始化的集合或代理，Hibernate 将会抛出 <literal>LazyInitializationException</literal> 异常。也就是说，在分离状态下，访问一个实体所拥有的集合，或者访问其指向代理的属性时，会引发此异常。 "
+msgid ""
+"A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
+"if an uninitialized collection or proxy is accessed outside of the scope of "
+"the <literal>Session</literal>, i.e., when the entity owning the collection "
+"or having the reference to the proxy is in the detached state."
+msgstr ""
+"在 <literal>Session</literal> 范围之外访问未初始化的集合或代理，Hibernate 将"
+"会抛出 <literal>LazyInitializationException</literal> 异常。也就是说，在分离"
+"状态下，访问一个实体所拥有的集合，或者访问其指向代理的属性时，会引发此异常。 "
#. Tag: para
#, no-c-format
-msgid "Sometimes a proxy or collection needs to be initialized before closing the <literal>Session</literal>. You can force initialization by calling <literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</literal>, for example. However, this can be confusing to readers of the code and it is not convenient for generic code."
-msgstr "有时候我们需要保证某个代理或者集合在 Session 关闭前就已经被初始化了。当然，我们可以通过强行调用 <literal>cat.getSex()</literal> 或者 <literal>cat.getKittens().size()</literal> 之类的方法来确保这一点。 但是这样的程序会造成读者的疑惑，也不符合通常的代码规范。 "
+msgid ""
+"Sometimes a proxy or collection needs to be initialized before closing the "
+"<literal>Session</literal>. You can force initialization by calling "
+"<literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</"
+"literal>, for example. However, this can be confusing to readers of the code "
+"and it is not convenient for generic code."
+msgstr ""
+"有时候我们需要保证某个代理或者集合在 Session 关闭前就已经被初始化了。当然，我"
+"们可以通过强行调用 <literal>cat.getSex()</literal> 或者 <literal>cat."
+"getKittens().size()</literal> 之类的方法来确保这一点。 但是这样的程序会造成读"
+"者的疑惑，也不符合通常的代码规范。 "
#. Tag: para
#, no-c-format
-msgid "The static methods <literal>Hibernate.initialize()</literal> and <literal>Hibernate.isInitialized()</literal>, provide the application with a convenient way of working with lazily initialized collections or proxies. <literal>Hibernate.initialize(cat)</literal> will force the initialization of a proxy, <literal>cat</literal>, as long as its <literal>Session</literal> is still open. <literal>Hibernate.initialize( cat.getKittens() )</literal> has a similar effect for the collection of kittens."
-msgstr "静态方法 <literal>Hibernate.initialized()</literal> 为你的应用程序提供了一个便捷的途径来延迟加载集合或代理。 只要它的 Session 处于 open 状态，<literal>Hibernate.initialize(cat)</literal> 将会为 cat 强制对代理实例化。同样，<literal>Hibernate.initialize(cat.getKittens())</literal> 对 kittens 的集合具有同样的功能。 "
+msgid ""
+"The static methods <literal>Hibernate.initialize()</literal> and "
+"<literal>Hibernate.isInitialized()</literal>, provide the application with a "
+"convenient way of working with lazily initialized collections or proxies. "
+"<literal>Hibernate.initialize(cat)</literal> will force the initialization "
+"of a proxy, <literal>cat</literal>, as long as its <literal>Session</"
+"literal> is still open. <literal>Hibernate.initialize( cat.getKittens() )</"
+"literal> has a similar effect for the collection of kittens."
+msgstr ""
+"静态方法 <literal>Hibernate.initialized()</literal> 为你的应用程序提供了一个"
+"便捷的途径来延迟加载集合或代理。 只要它的 Session 处于 open 状态，"
+"<literal>Hibernate.initialize(cat)</literal> 将会为 cat 强制对代理实例化。同"
+"样，<literal>Hibernate.initialize(cat.getKittens())</literal> 对 kittens 的集"
+"合具有同样的功能。 "
#. Tag: para
#, no-c-format
-msgid "Another option is to keep the <literal>Session</literal> open until all required collections and proxies have been loaded. In some application architectures, particularly where the code that accesses data using Hibernate, and the code that uses it are in different application layers or different physical processes, it can be a problem to ensure that the <literal>Session</literal> is open when a collection is initialized. There are two basic ways to deal with this issue:"
-msgstr "还有另外一种选择，就是保持 <literal>Session</literal> 一直处于 open 状态，直到所有需要的集合或代理都被载入。 在某些应用架构中，特别是对于那些使用 Hibernate 进行数据访问的代码，以及那些在不同应用层和不同物理进程中使用 Hibernate 的代码。 在集合实例化时，如何保证 <literal>Session</literal> 处于 open 状态经常会是一个问题。有两种方法可以解决此问题： "
+msgid ""
+"Another option is to keep the <literal>Session</literal> open until all "
+"required collections and proxies have been loaded. In some application "
+"architectures, particularly where the code that accesses data using "
+"Hibernate, and the code that uses it are in different application layers or "
+"different physical processes, it can be a problem to ensure that the "
+"<literal>Session</literal> is open when a collection is initialized. There "
+"are two basic ways to deal with this issue:"
+msgstr ""
+"还有另外一种选择，就是保持 <literal>Session</literal> 一直处于 open 状态，直"
+"到所有需要的集合或代理都被载入。 在某些应用架构中，特别是对于那些使用 "
+"Hibernate 进行数据访问的代码，以及那些在不同应用层和不同物理进程中使用 "
+"Hibernate 的代码。 在集合实例化时，如何保证 <literal>Session</literal> 处于 "
+"open 状态经常会是一个问题。有两种方法可以解决此问题： "
#. Tag: para
#, no-c-format
-msgid "In a web-based application, a servlet filter can be used to close the <literal>Session</literal> only at the end of a user request, once the rendering of the view is complete (the <emphasis>Open Session in View</emphasis> pattern). Of course, this places heavy demands on the correctness of the exception handling of your application infrastructure. It is vitally important that the <literal>Session</literal> is closed and the transaction ended before returning to the user, even when an exception occurs during rendering of the view. See the Hibernate Wiki for examples of this \"Open Session in View\" pattern."
-msgstr "在一个基于 Web 的应用中，可以利用 servlet 过滤器（filter），在用户请求（request）结束、页面生成 结束时关闭 <literal>Session</literal>（这里使用了<emphasis>在展示层保持打开 Session 模式（Open Session in View）</emphasis>），当然，这将依赖于应用框架中异常需要被正确的处理。在返回界面给用户之前，乃至在生成界面过程中发生异常的情况下，正确关闭 <literal>Session</literal> 和结束事务将是非常重要的， 请参见 Hibernate wiki 上的 \"Open Session in View\" 模式，你可以找到示例。 "
+msgid ""
+"In a web-based application, a servlet filter can be used to close the "
+"<literal>Session</literal> only at the end of a user request, once the "
+"rendering of the view is complete (the <emphasis>Open Session in View</"
+"emphasis> pattern). Of course, this places heavy demands on the correctness "
+"of the exception handling of your application infrastructure. It is vitally "
+"important that the <literal>Session</literal> is closed and the transaction "
+"ended before returning to the user, even when an exception occurs during "
+"rendering of the view. See the Hibernate Wiki for examples of this \"Open "
+"Session in View\" pattern."
+msgstr ""
+"在一个基于 Web 的应用中，可以利用 servlet 过滤器（filter），在用户请求"
+"（request）结束、页面生成 结束时关闭 <literal>Session</literal>（这里使用了"
+"<emphasis>在展示层保持打开 Session 模式（Open Session in View）</"
+"emphasis>），当然，这将依赖于应用框架中异常需要被正确的处理。在返回界面给用户"
+"之前，乃至在生成界面过程中发生异常的情况下，正确关闭 <literal>Session</"
+"literal> 和结束事务将是非常重要的， 请参见 Hibernate wiki 上的 \"Open "
+"Session in View\" 模式，你可以找到示例。 "
#. Tag: para
#, no-c-format
-msgid "In an application with a separate business tier, the business logic must \"prepare\" all collections that the web tier needs before returning. This means that the business tier should load all the data and return all the data already initialized to the presentation/web tier that is required for a particular use case. Usually, the application calls <literal>Hibernate.initialize()</literal> for each collection that will be needed in the web tier (this call must occur before the session is closed) or retrieves the collection eagerly using a Hibernate query with a <literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</literal>. This is usually easier if you adopt the <emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
-msgstr "在一个拥有单独业务层的应用中，业务层必须在返回之前，为 web 层“准备”好其所需的数据集合。这就意味着 业务层应该载入所有表现层/web 层所需的数据，并将这些已实例化完毕的数据返回。通常，应用程序应该为 web 层所需的每个集合调用 <literal>Hibernate.initialize()</literal>（这个调用必须发生咱 session 关闭之前）；或者使用带有 <literal>FETCH</literal> 从句，或 <literal>FetchMode.JOIN</literal> 的 Hibernate 查询，事先取得所有的数据集合。如果你在应用中使用了 <emphasis>Command</emphasis> 模式，代替 <emphasis>Session Facade</emphasis>，那么这项任务将会变得简单的多。 "
+msgid ""
+"In an application with a separate business tier, the business logic must "
+"\"prepare\" all collections that the web tier needs before returning. This "
+"means that the business tier should load all the data and return all the "
+"data already initialized to the presentation/web tier that is required for a "
+"particular use case. Usually, the application calls <literal>Hibernate."
+"initialize()</literal> for each collection that will be needed in the web "
+"tier (this call must occur before the session is closed) or retrieves the "
+"collection eagerly using a Hibernate query with a <literal>FETCH</literal> "
+"clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</"
+"literal>. This is usually easier if you adopt the <emphasis>Command</"
+"emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
+msgstr ""
+"在一个拥有单独业务层的应用中，业务层必须在返回之前，为 web 层“准备”好其所需的"
+"数据集合。这就意味着 业务层应该载入所有表现层/web 层所需的数据，并将这些已实"
+"例化完毕的数据返回。通常，应用程序应该为 web 层所需的每个集合调用 "
+"<literal>Hibernate.initialize()</literal>（这个调用必须发生咱 session 关闭之"
+"前）；或者使用带有 <literal>FETCH</literal> 从句，或 <literal>FetchMode."
+"JOIN</literal> 的 Hibernate 查询，事先取得所有的数据集合。如果你在应用中使用"
+"了 <emphasis>Command</emphasis> 模式，代替 <emphasis>Session Facade</"
+"emphasis>，那么这项任务将会变得简单的多。 "
#. Tag: para
#, no-c-format
-msgid "You can also attach a previously loaded object to a new <literal>Session</literal> with <literal>merge()</literal> or <literal>lock()</literal> before accessing uninitialized collections or other proxies. Hibernate does not, and certainly <emphasis>should</emphasis> not, do this automatically since it would introduce impromptu transaction semantics."
-msgstr "你也可以通过 <literal>merge()</literal> 或 <literal>lock()</literal> 方法，在访问未实例化的集合（或代理）之前，为先前载入的对象绑定一个新的 <literal>Session</literal>。显然，Hibernate 将不会，也不<emphasis>应该</emphasis>自动完成这些任务，因为这将引入一个特殊的事务语义。 "
+msgid ""
+"You can also attach a previously loaded object to a new <literal>Session</"
+"literal> with <literal>merge()</literal> or <literal>lock()</literal> before "
+"accessing uninitialized collections or other proxies. Hibernate does not, "
+"and certainly <emphasis>should</emphasis> not, do this automatically since "
+"it would introduce impromptu transaction semantics."
+msgstr ""
+"你也可以通过 <literal>merge()</literal> 或 <literal>lock()</literal> 方法，在"
+"访问未实例化的集合（或代理）之前，为先前载入的对象绑定一个新的 "
+"<literal>Session</literal>。显然，Hibernate 将不会，也不<emphasis>应该</"
+"emphasis>自动完成这些任务，因为这将引入一个特殊的事务语义。 "
#. Tag: para
#, no-c-format
-msgid "Sometimes you do not want to initialize a large collection, but still need some information about it, like its size, for example, or a subset of the data."
-msgstr "有时候，你并不需要完全实例化整个大的集合，仅需要了解它的部分信息（例如其大小）、或者集合的部分内容。 "
+msgid ""
+"Sometimes you do not want to initialize a large collection, but still need "
+"some information about it, like its size, for example, or a subset of the "
+"data."
+msgstr ""
+"有时候，你并不需要完全实例化整个大的集合，仅需要了解它的部分信息（例如其大"
+"小）、或者集合的部分内容。 "
#. Tag: para
#, no-c-format
-msgid "You can use a collection filter to get the size of a collection without initializing it:"
+msgid ""
+"You can use a collection filter to get the size of a collection without "
+"initializing it:"
msgstr "你可以使用集合过滤器得到其集合的大小，而不必实例化整个集合："
#. Tag: para
#, no-c-format
-msgid "The <literal>createFilter()</literal> method is also used to efficiently retrieve subsets of a collection without needing to initialize the whole collection:"
-msgstr "这里的 <literal>createFilter()</literal> 方法也可以被用来有效的抓取集合的部分内容，而无需实例化整个集合："
+msgid ""
+"The <literal>createFilter()</literal> method is also used to efficiently "
+"retrieve subsets of a collection without needing to initialize the whole "
+"collection:"
+msgstr ""
+"这里的 <literal>createFilter()</literal> 方法也可以被用来有效的抓取集合的部分"
+"内容，而无需实例化整个集合："
#. Tag: title
#, no-c-format
@@ -357,33 +707,90 @@
#. Tag: para
#, no-c-format
-msgid "Using batch fetching, Hibernate can load several uninitialized proxies if one proxy is accessed. Batch fetching is an optimization of the lazy select fetching strategy. There are two ways you can configure batch fetching: on the class level and the collection level."
-msgstr "Hibernate 可以充分有效的使用批量抓取，也就是说，如果仅一个访问代理（或集合），那么 Hibernate 将不载入其他未实例化的代理。批量抓取是延迟查询抓取的优化方案，你可以在两种批量抓取方案之间进行选择：在类级别和集合级别。 "
+msgid ""
+"Using batch fetching, Hibernate can load several uninitialized proxies if "
+"one proxy is accessed. Batch fetching is an optimization of the lazy select "
+"fetching strategy. There are two ways you can configure batch fetching: on "
+"the class level and the collection level."
+msgstr ""
+"Hibernate 可以充分有效的使用批量抓取，也就是说，如果仅一个访问代理（或集"
+"合），那么 Hibernate 将不载入其他未实例化的代理。批量抓取是延迟查询抓取的优化"
+"方案，你可以在两种批量抓取方案之间进行选择：在类级别和集合级别。 "
#. Tag: para
#, no-c-format
-msgid "Batch fetching for classes/entities is easier to understand. Consider the following example: at runtime you have 25 <literal>Cat</literal> instances loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has a reference to its <literal>owner</literal>, a <literal>Person</literal>. The <literal>Person</literal> class is mapped with a proxy, <literal>lazy=\"true\"</literal>. If you now iterate through all cats and call <literal>getOwner()</literal> on each, Hibernate will, by default, execute 25 <literal>SELECT</literal> statements to retrieve the proxied owners. You can tune this behavior by specifying a <literal>batch-size</literal> in the mapping of <literal>Person</literal>:"
-msgstr "类/实体级别的批量抓取很容易理解。假设你在运行时将需要面对下面的问题：你在一个 <literal>Session</literal> 中载入了 25 个 <literal>Cat</literal> 实例，每个 <literal>Cat</literal> 实例都拥有一个引用成员 <literal>owner</literal>，其指向 <literal>Person</literal>，而 <literal>Person</literal> 类是代理，同时 <literal>lazy=\"true\"</literal>。如果你必须遍历整个 cats 集合，对每个元素调用 <literal>getOwner()</literal> 方法，Hibernate 将会默认的执行 25 次 <literal>SELECT</literal> 查询， 得到其 owner 的代理对象。这时，你可以通过在映射文件的 <literal>Person</literal> 属性，显式声明 <literal>batch-size</literal>，改变其行为： "
+msgid ""
+"Batch fetching for classes/entities is easier to understand. Consider the "
+"following example: at runtime you have 25 <literal>Cat</literal> instances "
+"loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has "
+"a reference to its <literal>owner</literal>, a <literal>Person</literal>. "
+"The <literal>Person</literal> class is mapped with a proxy, <literal>lazy="
+"\"true\"</literal>. If you now iterate through all cats and call "
+"<literal>getOwner()</literal> on each, Hibernate will, by default, execute "
+"25 <literal>SELECT</literal> statements to retrieve the proxied owners. You "
+"can tune this behavior by specifying a <literal>batch-size</literal> in the "
+"mapping of <literal>Person</literal>:"
+msgstr ""
+"类/实体级别的批量抓取很容易理解。假设你在运行时将需要面对下面的问题：你在一"
+"个 <literal>Session</literal> 中载入了 25 个 <literal>Cat</literal> 实例，每"
+"个 <literal>Cat</literal> 实例都拥有一个引用成员 <literal>owner</literal>，其"
+"指向 <literal>Person</literal>，而 <literal>Person</literal> 类是代理，同时 "
+"<literal>lazy=\"true\"</literal>。如果你必须遍历整个 cats 集合，对每个元素调"
+"用 <literal>getOwner()</literal> 方法，Hibernate 将会默认的执行 25 次 "
+"<literal>SELECT</literal> 查询， 得到其 owner 的代理对象。这时，你可以通过在"
+"映射文件的 <literal>Person</literal> 属性，显式声明 <literal>batch-size</"
+"literal>，改变其行为： "
#. Tag: para
#, no-c-format
-msgid "Hibernate will now execute only three queries: the pattern is 10, 10, 5."
+msgid ""
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
msgstr "随之，Hibernate 将只需要执行三次查询，分别为 10、10、 5。 "
#. Tag: para
#, no-c-format
-msgid "You can also enable batch fetching of collections. For example, if each <literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, and 10 persons are currently loaded in the <literal>Session</literal>, iterating through all persons will generate 10 <literal>SELECT</literal>s, one for every call to <literal>getCats()</literal>. If you enable batch fetching for the <literal>cats</literal> collection in the mapping of <literal>Person</literal>, Hibernate can pre-fetch collections:"
-msgstr "你也可以在集合级别定义批量抓取。例如，如果每个 <literal>Person</literal> 都拥有一个延迟载入的 <literal>Cats</literal> 集合， 现在，<literal>Sesssion</literal> 中载入了 10 个 person 对象，遍历 person 集合将会引起 10 次 <literal>SELECT</literal> 查询，每次查询都会调用 <literal>getCats()</literal> 方法。如果你在 <literal>Person</literal> 的映射定义部分，允许对 <literal>cats</literal> 批量抓取，那么，Hibernate 将可以预先抓取整个集合。请看例子： "
+msgid ""
+"You can also enable batch fetching of collections. For example, if each "
+"<literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, "
+"and 10 persons are currently loaded in the <literal>Session</literal>, "
+"iterating through all persons will generate 10 <literal>SELECT</literal>s, "
+"one for every call to <literal>getCats()</literal>. If you enable batch "
+"fetching for the <literal>cats</literal> collection in the mapping of "
+"<literal>Person</literal>, Hibernate can pre-fetch collections:"
+msgstr ""
+"你也可以在集合级别定义批量抓取。例如，如果每个 <literal>Person</literal> 都拥"
+"有一个延迟载入的 <literal>Cats</literal> 集合， 现在，<literal>Sesssion</"
+"literal> 中载入了 10 个 person 对象，遍历 person 集合将会引起 10 次 "
+"<literal>SELECT</literal> 查询，每次查询都会调用 <literal>getCats()</"
+"literal> 方法。如果你在 <literal>Person</literal> 的映射定义部分，允许对 "
+"<literal>cats</literal> 批量抓取，那么，Hibernate 将可以预先抓取整个集合。请"
+"看例子： "
#. Tag: para
#, no-c-format
-msgid "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 collections in four <literal>SELECT</literal>s. Again, the value of the attribute depends on the expected number of uninitialized collections in a particular <literal>Session</literal>."
-msgstr "如果整个的 <literal>batch-size</literal> 是 3，那么 Hibernate 将会分四次执行 <literal>SELECT</literal> 查询， 按照 3、3、3、1 的大小分别载入数据。这里的每次载入的数据量还具体依赖于当前 <literal>Session</literal> 中未实例化集合的个数。 "
+msgid ""
+"With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
+"collections in four <literal>SELECT</literal>s. Again, the value of the "
+"attribute depends on the expected number of uninitialized collections in a "
+"particular <literal>Session</literal>."
+msgstr ""
+"如果整个的 <literal>batch-size</literal> 是 3，那么 Hibernate 将会分四次执行 "
+"<literal>SELECT</literal> 查询， 按照 3、3、3、1 的大小分别载入数据。这里的每"
+"次载入的数据量还具体依赖于当前 <literal>Session</literal> 中未实例化集合的个"
+"数。 "
#. Tag: para
#, no-c-format
-msgid "Batch fetching of collections is particularly useful if you have a nested tree of items, i.e. the typical bill-of-materials pattern. However, a <emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> might be a better option for read-mostly trees."
-msgstr "如果你的模型中有嵌套的树状结构，例如典型的帐单－原料结构（bill-of-materials pattern），集合的批量抓取是非常有用的。（尽管在更多情况下对树进行读取时，<emphasis>嵌套集合（nested set）</emphasis>或<emphasis>原料路径（materialized path）</emphasis>可能是更好的解决方法。）"
+msgid ""
+"Batch fetching of collections is particularly useful if you have a nested "
+"tree of items, i.e. the typical bill-of-materials pattern. However, a "
+"<emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> "
+"might be a better option for read-mostly trees."
+msgstr ""
+"如果你的模型中有嵌套的树状结构，例如典型的帐单－原料结构（bill-of-materials "
+"pattern），集合的批量抓取是非常有用的。（尽管在更多情况下对树进行读取时，"
+"<emphasis>嵌套集合（nested set）</emphasis>或<emphasis>原料路径"
+"（materialized path）</emphasis>可能是更好的解决方法。）"
#. Tag: title
#, no-c-format
@@ -392,8 +799,14 @@
#. Tag: para
#, no-c-format
-msgid "If one lazy collection or single-valued proxy has to be fetched, Hibernate will load all of them, re-running the original query in a subselect. This works in the same way as batch-fetching but without the piecemeal loading."
-msgstr "假若一个延迟集合或单值代理需要抓取，Hibernate 会使用一个 subselect 重新运行原来的查询，一次性读入所有的实例。这和批量抓取的实现方法是一样的，不会有破碎的加载。 "
+msgid ""
+"If one lazy collection or single-valued proxy has to be fetched, Hibernate "
+"will load all of them, re-running the original query in a subselect. This "
+"works in the same way as batch-fetching but without the piecemeal loading."
+msgstr ""
+"假若一个延迟集合或单值代理需要抓取，Hibernate 会使用一个 subselect 重新运行原"
+"来的查询，一次性读入所有的实例。这和批量抓取的实现方法是一样的，不会有破碎的"
+"加载。 "
#. Tag: title
#, no-c-format
@@ -402,18 +815,47 @@
#. Tag: para
#, no-c-format
-msgid "Another way to affect the fetching strategy for loading associated objects is through something called a fetch profile, which is a named configuration associated with the <interfacename>org.hibernate.SessionFactory</interfacename> but enabled, by name, on the <interfacename>org.hibernate.Session</interfacename>. Once enabled on a <interfacename>org.hibernate.Session</interfacename>, the fetch profile wull be in affect for that <interfacename>org.hibernate.Session</interfacename> until it is explicitly disabled."
-msgstr "影响抓取加载相关对象的策略的另外一个方法是通过抓取配置（fetch profile），它是和 <interfacename>org.hibernate.SessionFactory</interfacename> 相关的配置但对 <interfacename>org.hibernate.Session</interfacename> 启用。一旦在 <interfacename>org.hibernate.Session</interfacename> 上启用，抓取配置将对这个 <interfacename>org.hibernate.Session</interfacename> 生效直至它被显性地禁用。"
+msgid ""
+"Another way to affect the fetching strategy for loading associated objects "
+"is through something called a fetch profile, which is a named configuration "
+"associated with the <interfacename>org.hibernate.SessionFactory</"
+"interfacename> but enabled, by name, on the <interfacename>org.hibernate."
+"Session</interfacename>. Once enabled on a <interfacename>org.hibernate."
+"Session</interfacename>, the fetch profile wull be in affect for that "
+"<interfacename>org.hibernate.Session</interfacename> until it is explicitly "
+"disabled."
+msgstr ""
+"影响抓取加载相关对象的策略的另外一个方法是通过抓取配置（fetch profile），它是"
+"和 <interfacename>org.hibernate.SessionFactory</interfacename> 相关的配置但"
+"对 <interfacename>org.hibernate.Session</interfacename> 启用。一旦在 "
+"<interfacename>org.hibernate.Session</interfacename> 上启用，抓取配置将对这"
+"个 <interfacename>org.hibernate.Session</interfacename> 生效直至它被显性地禁"
+"用。"
#. Tag: para
#, no-c-format
-msgid "So what does that mean? Well lets explain that by way of an example. Say we have the following mappings:"
+msgid ""
+"So what does that mean? Well lets explain that by way of an example. Say we "
+"have the following mappings:"
msgstr "这是什么意思呢？让我们通过一个例子进行解释。假设我们有下列映射："
#. Tag: para
#, no-c-format
-msgid "Now normally when you get a reference to a particular customer, that customer's set of orders will be lazy meaning we will not yet have loaded those orders from the database. Normally this is a good thing. Now lets say that you have a certain use case where it is more efficient to load the customer and their orders together. One way certainly is to use \"dynamic fetching\" strategies via an HQL or criteria queries. But another option is to use a fetch profile to achieve that. Just add the following to your mapping:"
-msgstr "现在，当你获得某个特定客户的引用时，这个客户的订单将处于 lazy 状态，表示我们暂不会从数据库里加载这些订单。这样通常没有问题。假设在某种情况下，加载客户及其订单会更高效。其中一个办法当然是使用通过 HQL 或 Criteria 查询“动态抓取”的策略。另外一个方法就是使用抓取配置（Fetch Profile）。你可以在映射里加入下面的内容："
+msgid ""
+"Now normally when you get a reference to a particular customer, that "
+"customer's set of orders will be lazy meaning we will not yet have loaded "
+"those orders from the database. Normally this is a good thing. Now lets say "
+"that you have a certain use case where it is more efficient to load the "
+"customer and their orders together. One way certainly is to use \"dynamic "
+"fetching\" strategies via an HQL or criteria queries. But another option is "
+"to use a fetch profile to achieve that. Just add the following to your "
+"mapping:"
+msgstr ""
+"现在，当你获得某个特定客户的引用时，这个客户的订单将处于 lazy 状态，表示我们"
+"暂不会从数据库里加载这些订单。这样通常没有问题。假设在某种情况下，加载客户及"
+"其订单会更高效。其中一个办法当然是使用通过 HQL 或 Criteria 查询“动态抓取”的策"
+"略。另外一个方法就是使用抓取配置（Fetch Profile）。你可以在映射里加入下面的内"
+"容："
#. Tag: para
#, no-c-format
@@ -422,13 +864,21 @@
#. Tag: para
#, no-c-format
-msgid "Now the following code will actually load both the customer <emphasis>and their orders</emphasis>:"
+msgid ""
+"Now the following code will actually load both the customer <emphasis>and "
+"their orders</emphasis>:"
msgstr "下面的代码将实际上加载客户<emphasis>以及</emphasis>订单："
#. Tag: para
#, no-c-format
-msgid "Currently only join style fetch profiles are supported, but they plan is to support additional styles. See <ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/HHH-3414\">HHH-3414</ulink> for details."
-msgstr "目前只有 join 风格的抓取策略被支持，但其他风格也将被支持。更多细节请参考 <ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/HHH-3414\">HHH-3414</ulink>。"
+msgid ""
+"Currently only join style fetch profiles are supported, but they plan is to "
+"support additional styles. See <ulink url=\"http://opensource.atlassian.com/"
+"projects/hibernate/browse/HHH-3414\">HHH-3414</ulink> for details."
+msgstr ""
+"目前只有 join 风格的抓取策略被支持，但其他风格也将被支持。更多细节请参考 "
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/HHH-"
+"3414\">HHH-3414</ulink>。"
#. Tag: title
#, no-c-format
@@ -437,18 +887,39 @@
#. Tag: para
#, no-c-format
-msgid "Hibernate3 supports the lazy fetching of individual properties. This optimization technique is also known as <emphasis>fetch groups</emphasis>. Please note that this is mostly a marketing feature; optimizing row reads is much more important than optimization of column reads. However, only loading some properties of a class could be useful in extreme cases. For example, when legacy tables have hundreds of columns and the data model cannot be improved."
-msgstr "Hibernate3 对单独的属性支持延迟抓取，这项优化技术也被称为<emphasis>组抓取（fetch groups）</emphasis>。 请注意，该技术更多的属于市场特性。在实际应用中，优化行读取比优化列读取更重要。但是，仅载入类的部分属性在某些特定情况下会有用，例如在原有表中拥有几百列数据、数据模型无法改动的情况下。 "
+msgid ""
+"Hibernate3 supports the lazy fetching of individual properties. This "
+"optimization technique is also known as <emphasis>fetch groups</emphasis>. "
+"Please note that this is mostly a marketing feature; optimizing row reads is "
+"much more important than optimization of column reads. However, only loading "
+"some properties of a class could be useful in extreme cases. For example, "
+"when legacy tables have hundreds of columns and the data model cannot be "
+"improved."
+msgstr ""
+"Hibernate3 对单独的属性支持延迟抓取，这项优化技术也被称为<emphasis>组抓取"
+"（fetch groups）</emphasis>。 请注意，该技术更多的属于市场特性。在实际应用"
+"中，优化行读取比优化列读取更重要。但是，仅载入类的部分属性在某些特定情况下会"
+"有用，例如在原有表中拥有几百列数据、数据模型无法改动的情况下。 "
#. Tag: para
#, no-c-format
-msgid "To enable lazy property loading, set the <literal>lazy</literal> attribute on your particular property mappings:"
-msgstr "可以在映射文件中对特定的属性设置 <literal>lazy</literal>，定义该属性为延迟载入。"
+msgid ""
+"To enable lazy property loading, set the <literal>lazy</literal> attribute "
+"on your particular property mappings:"
+msgstr ""
+"可以在映射文件中对特定的属性设置 <literal>lazy</literal>，定义该属性为延迟载"
+"入。"
#. Tag: para
#, no-c-format
-msgid "Lazy property loading requires buildtime bytecode instrumentation. If your persistent classes are not enhanced, Hibernate will ignore lazy property settings and return to immediate fetching."
-msgstr "属性的延迟载入要求在其代码构建时加入二进制指示指令（bytecode instrumentation），如果你的持久类代码中未含有这些指令， Hibernate 将会忽略这些属性的延迟设置，仍然将其直接载入。 "
+msgid ""
+"Lazy property loading requires buildtime bytecode instrumentation. If your "
+"persistent classes are not enhanced, Hibernate will ignore lazy property "
+"settings and return to immediate fetching."
+msgstr ""
+"属性的延迟载入要求在其代码构建时加入二进制指示指令（bytecode "
+"instrumentation），如果你的持久类代码中未含有这些指令， Hibernate 将会忽略这"
+"些属性的延迟设置，仍然将其直接载入。 "
#. Tag: para
#, no-c-format
@@ -457,13 +928,23 @@
#. Tag: para
#, no-c-format
-msgid "A different way of avoiding unnecessary column reads, at least for read-only transactions, is to use the projection features of HQL or Criteria queries. This avoids the need for buildtime bytecode processing and is certainly a preferred solution."
-msgstr "还有一种可以优化的方法，它使用 HQL 或条件查询的投影（projection）特性，可以避免读取非必要的列， 这一点至少对只读事务是非常有用的。它无需在代码构建时“二进制指令”处理，因此是一个更加值得选择的解决方法。 "
+msgid ""
+"A different way of avoiding unnecessary column reads, at least for read-only "
+"transactions, is to use the projection features of HQL or Criteria queries. "
+"This avoids the need for buildtime bytecode processing and is certainly a "
+"preferred solution."
+msgstr ""
+"还有一种可以优化的方法，它使用 HQL 或条件查询的投影（projection）特性，可以避"
+"免读取非必要的列， 这一点至少对只读事务是非常有用的。它无需在代码构建时“二进"
+"制指令”处理，因此是一个更加值得选择的解决方法。 "
#. Tag: para
#, no-c-format
-msgid "You can force the usual eager fetching of properties using <literal>fetch all properties</literal> in HQL."
-msgstr "有时你需要在 HQL 中通过<literal>抓取所有属性</literal>，强行抓取所有内容。 "
+msgid ""
+"You can force the usual eager fetching of properties using <literal>fetch "
+"all properties</literal> in HQL."
+msgstr ""
+"有时你需要在 HQL 中通过<literal>抓取所有属性</literal>，强行抓取所有内容。 "
#. Tag: title
#, no-c-format
@@ -472,13 +953,38 @@
#. Tag: para
#, no-c-format
-msgid "A Hibernate <literal>Session</literal> is a transaction-level cache of persistent data. It is possible to configure a cluster or JVM-level (<literal>SessionFactory</literal>-level) cache on a class-by-class and collection-by-collection basis. You can even plug in a clustered cache. Be aware that caches are not aware of changes made to the persistent store by another application. They can, however, be configured to regularly expire cached data."
-msgstr "Hibernate 的 <literal>Session</literal> 在事务级别进行持久化数据的缓存操作。 当然，也有可能分别为每个类（或集合），配置集群、或 JVM 级别（<literal>SessionFactory 级别</literal>）的缓存。你甚至可以为之插入一个集群的缓存。注意，缓存永远不知道其他应用程序对持久化仓库（数据库）可能进行的修改 （即使可以将缓存数据设定为定期失效）。 "
+msgid ""
+"A Hibernate <literal>Session</literal> is a transaction-level cache of "
+"persistent data. It is possible to configure a cluster or JVM-level "
+"(<literal>SessionFactory</literal>-level) cache on a class-by-class and "
+"collection-by-collection basis. You can even plug in a clustered cache. Be "
+"aware that caches are not aware of changes made to the persistent store by "
+"another application. They can, however, be configured to regularly expire "
+"cached data."
+msgstr ""
+"Hibernate 的 <literal>Session</literal> 在事务级别进行持久化数据的缓存操作。 "
+"当然，也有可能分别为每个类（或集合），配置集群、或 JVM 级别"
+"（<literal>SessionFactory 级别</literal>）的缓存。你甚至可以为之插入一个集群"
+"的缓存。注意，缓存永远不知道其他应用程序对持久化仓库（数据库）可能进行的修改 "
+"（即使可以将缓存数据设定为定期失效）。 "
#. Tag: para
#, no-c-format
-msgid "You have the option to tell Hibernate which caching implementation to use by specifying the name of a class that implements <literal>org.hibernate.cache.CacheProvider</literal> using the property <literal>hibernate.cache.provider_class</literal>. Hibernate is bundled with a number of built-in integrations with the open-source cache providers that are listed below. You can also implement your own and plug it in as outlined above. Note that versions prior to 3.2 use EhCache as the default cache provider."
-msgstr "通过在 <literal>hibernate.cache.provider_class</literal> 属性中指定 <literal>org.hibernate.cache.CacheProvider</literal> 的某个实现的类名,你可以选择让 Hibernate 使用哪个缓存实现。Hibernate 打包一些开源缓存实现，提供对它们的内置支持（见下表）。除此之外，你也可以实现你自己的实现，将它们插入到系统中。注意，在 3.2 版本之前，默认使用 EhCache 作为缓存实现，但从 3.2 起就不再这样了。 "
+msgid ""
+"You have the option to tell Hibernate which caching implementation to use by "
+"specifying the name of a class that implements <literal>org.hibernate.cache."
+"CacheProvider</literal> using the property <literal>hibernate.cache."
+"provider_class</literal>. Hibernate is bundled with a number of built-in "
+"integrations with the open-source cache providers that are listed below. You "
+"can also implement your own and plug it in as outlined above. Note that "
+"versions prior to 3.2 use EhCache as the default cache provider."
+msgstr ""
+"通过在 <literal>hibernate.cache.provider_class</literal> 属性中指定 "
+"<literal>org.hibernate.cache.CacheProvider</literal> 的某个实现的类名,你可以"
+"选择让 Hibernate 使用哪个缓存实现。Hibernate 打包一些开源缓存实现，提供对它们"
+"的内置支持（见下表）。除此之外，你也可以实现你自己的实现，将它们插入到系统"
+"中。注意，在 3.2 版本之前，默认使用 EhCache 作为缓存实现，但从 3.2 起就不再这"
+"样了。 "
#. Tag: title
#, no-c-format
@@ -622,33 +1128,64 @@
#. Tag: para
#, no-c-format
-msgid "The <literal><cache></literal> element of a class or collection mapping has the following form:"
-msgstr "类或者集合映射的“<literal><cache></literal> 元素”可以有下列形式："
+msgid ""
+"The <literal><cache></literal> element of a class or collection "
+"mapping has the following form:"
+msgstr ""
+"类或者集合映射的“<literal><cache></literal> 元素”可以有下列形式："
#. Tag: para
#, no-c-format
-msgid "<literal>usage</literal> (required) specifies the caching strategy: <literal>transactional</literal>, <literal>read-write</literal>, <literal>nonstrict-read-write</literal> or <literal>read-only</literal>"
-msgstr "<literal>usage</literal>（必须）说明了缓存的策略：<literal>transactional</literal>、 <literal>read-write</literal>、<literal>nonstrict-read-write</literal> 或 <literal>read-only</literal>。"
+msgid ""
+"<literal>usage</literal> (required) specifies the caching strategy: "
+"<literal>transactional</literal>, <literal>read-write</literal>, "
+"<literal>nonstrict-read-write</literal> or <literal>read-only</literal>"
+msgstr ""
+"<literal>usage</literal>（必须）说明了缓存的策略：<literal>transactional</"
+"literal>、 <literal>read-write</literal>、<literal>nonstrict-read-write</"
+"literal> 或 <literal>read-only</literal>。"
#. Tag: para
#, no-c-format
-msgid "<literal>region</literal> (optional: defaults to the class or collection role name): specifies the name of the second level cache region"
-msgstr "<literal>region</literal> （可选，默认为类或者集合的名字（class or collection role name）） 指定第二级缓存的区域名（name of the second level cache region） "
+msgid ""
+"<literal>region</literal> (optional: defaults to the class or collection "
+"role name): specifies the name of the second level cache region"
+msgstr ""
+"<literal>region</literal> （可选，默认为类或者集合的名字（class or "
+"collection role name）） 指定第二级缓存的区域名（name of the second level "
+"cache region） "
#. Tag: para
#, no-c-format
-msgid "<literal>include</literal> (optional: defaults to <literal>all</literal>) <literal>non-lazy</literal>: specifies that properties of the entity mapped with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level lazy fetching is enabled"
-msgstr "<literal>include</literal>（可选,默认为 <literal>all</literal>） <literal>non-lazy</literal> 当属性级延迟抓取打开时，标记为 <literal>lazy=\"true\"</literal> 的实体的属性可能无法被缓存 "
+msgid ""
+"<literal>include</literal> (optional: defaults to <literal>all</literal>) "
+"<literal>non-lazy</literal>: specifies that properties of the entity mapped "
+"with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level "
+"lazy fetching is enabled"
+msgstr ""
+"<literal>include</literal>（可选,默认为 <literal>all</literal>） "
+"<literal>non-lazy</literal> 当属性级延迟抓取打开时，标记为 <literal>lazy="
+"\"true\"</literal> 的实体的属性可能无法被缓存 "
#. Tag: para
#, no-c-format
-msgid "Alternatively, you can specify <literal><class-cache></literal> and <literal><collection-cache></literal> elements in <literal>hibernate.cfg.xml</literal>."
-msgstr "另外（首选?），你可以在<literal>hibernate.cfg.xml</literal> 中指定 <literal><class-cache></literal> 和 <literal><collection-cache></literal> 元素。"
+msgid ""
+"Alternatively, you can specify <literal><class-cache></literal> and "
+"<literal><collection-cache></literal> elements in <literal>hibernate."
+"cfg.xml</literal>."
+msgstr ""
+"另外（首选?），你可以在<literal>hibernate.cfg.xml</literal> 中指定 "
+"<literal><class-cache></literal> 和 <literal><collection-cache></"
+"literal> 元素。"
#. Tag: para
#, no-c-format
-msgid "The <literal>usage</literal> attribute specifies a <emphasis>cache concurrency strategy</emphasis>."
-msgstr "这里的 <literal>usage</literal> 属性指明了<emphasis>缓存并发策略（cache concurrency strategy）</emphasis>。"
+msgid ""
+"The <literal>usage</literal> attribute specifies a <emphasis>cache "
+"concurrency strategy</emphasis>."
+msgstr ""
+"这里的 <literal>usage</literal> 属性指明了<emphasis>缓存并发策略（cache "
+"concurrency strategy）</emphasis>。"
#. Tag: title
#, no-c-format
@@ -657,8 +1194,15 @@
#. Tag: para
#, no-c-format
-msgid "If your application needs to read, but not modify, instances of a persistent class, a <literal>read-only</literal> cache can be used. This is the simplest and optimal performing strategy. It is even safe for use in a cluster."
-msgstr "如果你的应用程序只需读取一个持久化类的实例，而无需对其修改， 那么就可以对其进行<literal>只读</literal> 缓存。这是最简单，也是实用性最好的方法。甚至在集群中，它也能完美地运作。 "
+msgid ""
+"If your application needs to read, but not modify, instances of a persistent "
+"class, a <literal>read-only</literal> cache can be used. This is the "
+"simplest and optimal performing strategy. It is even safe for use in a "
+"cluster."
+msgstr ""
+"如果你的应用程序只需读取一个持久化类的实例，而无需对其修改， 那么就可以对其进"
+"行<literal>只读</literal> 缓存。这是最简单，也是实用性最好的方法。甚至在集群"
+"中，它也能完美地运作。 "
#. Tag: title
#, no-c-format
@@ -667,8 +1211,28 @@
#. Tag: para
#, no-c-format
-msgid "If the application needs to update data, a <literal>read-write</literal> cache might be appropriate. This cache strategy should never be used if serializable transaction isolation level is required. If the cache is used in a JTA environment, you must specify the property <literal>hibernate.transaction.manager_lookup_class</literal> and naming a strategy for obtaining the JTA <literal>TransactionManager</literal>. In other environments, you should ensure that the transaction is completed when <literal>Session.close()</literal> or <literal>Session.disconnect()</literal> is called. If you want to use this strategy in a cluster, you should ensure that the underlying cache implementation supports locking. The built-in cache providers <emphasis>do not</emphasis> support locking."
-msgstr "如果应用程序需要更新数据，那么使用<literal>读/写缓存</literal> 比较合适。 如果应用程序要求“序列化事务”的隔离级别（serializable transaction isolation level），那么就决不能使用这种缓存策略。 如果在 JTA 环境中使用缓存，你必须指定 <literal>hibernate.transaction.manager_lookup_class</literal> 属性的值， 通过它，Hibernate 才能知道该应用程序中 JTA 的<literal>TransactionManager</literal>的具体策略。 在其它环境中，你必须保证在 <literal>Session.close()</literal>、或 <literal>Session.disconnect()</literal> 调用前， 整个事务已经结束。 如果你想在集群环境中使用此策略，你必须保证底层的缓存实现支持锁定（locking）。Hibernate 内置的缓存策略并不支持锁定功能。 "
+msgid ""
+"If the application needs to update data, a <literal>read-write</literal> "
+"cache might be appropriate. This cache strategy should never be used if "
+"serializable transaction isolation level is required. If the cache is used "
+"in a JTA environment, you must specify the property <literal>hibernate."
+"transaction.manager_lookup_class</literal> and naming a strategy for "
+"obtaining the JTA <literal>TransactionManager</literal>. In other "
+"environments, you should ensure that the transaction is completed when "
+"<literal>Session.close()</literal> or <literal>Session.disconnect()</"
+"literal> is called. If you want to use this strategy in a cluster, you "
+"should ensure that the underlying cache implementation supports locking. The "
+"built-in cache providers <emphasis>do not</emphasis> support locking."
+msgstr ""
+"如果应用程序需要更新数据，那么使用<literal>读/写缓存</literal> 比较合适。 如"
+"果应用程序要求“序列化事务”的隔离级别（serializable transaction isolation "
+"level），那么就决不能使用这种缓存策略。 如果在 JTA 环境中使用缓存，你必须指"
+"定 <literal>hibernate.transaction.manager_lookup_class</literal> 属性的值， "
+"通过它，Hibernate 才能知道该应用程序中 JTA 的<literal>TransactionManager</"
+"literal>的具体策略。 在其它环境中，你必须保证在 <literal>Session.close()</"
+"literal>、或 <literal>Session.disconnect()</literal> 调用前， 整个事务已经结"
+"束。 如果你想在集群环境中使用此策略，你必须保证底层的缓存实现支持锁定"
+"（locking）。Hibernate 内置的缓存策略并不支持锁定功能。 "
#. Tag: title
#, no-c-format
@@ -677,8 +1241,22 @@
#. Tag: para
#, no-c-format
-msgid "If the application only occasionally needs to update data (i.e. if it is extremely unlikely that two transactions would try to update the same item simultaneously), and strict transaction isolation is not required, a <literal>nonstrict-read-write</literal> cache might be appropriate. If the cache is used in a JTA environment, you must specify <literal>hibernate.transaction.manager_lookup_class</literal>. In other environments, you should ensure that the transaction is completed when <literal>Session.close()</literal> or <literal>Session.disconnect()</literal> is called."
-msgstr "如果应用程序只偶尔需要更新数据（也就是说，两个事务同时更新同一记录的情况很不常见），也不需要十分严格的事务隔离，那么比较适合使用<literal>非严格读/写缓存</literal>策略。如果在 JTA 环境中使用该策略，你必须为其指定 <literal>hibernate.transaction.manager_lookup_class</literal> 属性的值，在其它环境中，你必须保证在<literal>Session.close()</literal>、或 <literal>Session.disconnect()</literal> 调用前，整个事务已经结束。 "
+msgid ""
+"If the application only occasionally needs to update data (i.e. if it is "
+"extremely unlikely that two transactions would try to update the same item "
+"simultaneously), and strict transaction isolation is not required, a "
+"<literal>nonstrict-read-write</literal> cache might be appropriate. If the "
+"cache is used in a JTA environment, you must specify <literal>hibernate."
+"transaction.manager_lookup_class</literal>. In other environments, you "
+"should ensure that the transaction is completed when <literal>Session.close()"
+"</literal> or <literal>Session.disconnect()</literal> is called."
+msgstr ""
+"如果应用程序只偶尔需要更新数据（也就是说，两个事务同时更新同一记录的情况很不"
+"常见），也不需要十分严格的事务隔离，那么比较适合使用<literal>非严格读/写缓存"
+"</literal>策略。如果在 JTA 环境中使用该策略，你必须为其指定 "
+"<literal>hibernate.transaction.manager_lookup_class</literal> 属性的值，在其"
+"它环境中，你必须保证在<literal>Session.close()</literal>、或 "
+"<literal>Session.disconnect()</literal> 调用前，整个事务已经结束。 "
#. Tag: title
#, no-c-format
@@ -687,8 +1265,15 @@
#. Tag: para
#, no-c-format
-msgid "The <literal>transactional</literal> cache strategy provides support for fully transactional cache providers such as JBoss TreeCache. Such a cache can only be used in a JTA environment and you must specify <literal>hibernate.transaction.manager_lookup_class</literal>."
-msgstr "Hibernate 的<literal>事务缓存</literal>策略提供了全事务的缓存支持，例如对 JBoss TreeCache 的支持。这样的缓存只能用于 JTA 环境中，你必须指定为其 <literal>hibernate.transaction.manager_lookup_class</literal> 属性。 "
+msgid ""
+"The <literal>transactional</literal> cache strategy provides support for "
+"fully transactional cache providers such as JBoss TreeCache. Such a cache "
+"can only be used in a JTA environment and you must specify "
+"<literal>hibernate.transaction.manager_lookup_class</literal>."
+msgstr ""
+"Hibernate 的<literal>事务缓存</literal>策略提供了全事务的缓存支持，例如对 "
+"JBoss TreeCache 的支持。这样的缓存只能用于 JTA 环境中，你必须指定为其 "
+"<literal>hibernate.transaction.manager_lookup_class</literal> 属性。 "
#. Tag: title
#, no-c-format
@@ -697,18 +1282,26 @@
#. Tag: para
#, no-c-format
-msgid "None of the cache providers support all of the cache concurrency strategies."
-msgstr "没有一种缓存提供商能够支持上列的所有缓存并发策略。下表中列出了各种提供器、及其各自适用的并发策略。 "
+msgid ""
+"None of the cache providers support all of the cache concurrency strategies."
+msgstr ""
+"没有一种缓存提供商能够支持上列的所有缓存并发策略。下表中列出了各种提供器、及"
+"其各自适用的并发策略。 "
#. Tag: para
#, no-c-format
-msgid "The following table shows which providers are compatible with which concurrency strategies."
-msgstr "没有一种缓存提供商能够支持上列的所有缓存并发策略。下表中列出了各种提供器、及其各自适用的并发策略。 "
+msgid ""
+"The following table shows which providers are compatible with which "
+"concurrency strategies."
+msgstr ""
+"没有一种缓存提供商能够支持上列的所有缓存并发策略。下表中列出了各种提供器、及"
+"其各自适用的并发策略。 "
#. Tag: title
#, no-c-format
msgid "Cache Concurrency Strategy Support"
-msgstr "各种缓存提供商对缓存并发策略的支持情况（Cache Concurrency Strategy Support）"
+msgstr ""
+"各种缓存提供商对缓存并发策略的支持情况（Cache Concurrency Strategy Support）"
#. Tag: entry
#, no-c-format
@@ -737,63 +1330,125 @@
#. Tag: para
#, no-c-format
-msgid "Whenever you pass an object to <literal>save()</literal>, <literal>update()</literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an object using <literal>load()</literal>, <literal>get()</literal>, <literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()</literal>, that object is added to the internal cache of the <literal>Session</literal>."
-msgstr "无论何时，当你给 <literal>save()</literal>、<literal>update()</literal> 或 <literal>saveOrUpdate()</literal> 方法传递一个对象时，或使用 <literal>load()</literal>、<literal>get()</literal>、<literal>list()</literal>、<literal>iterate()</literal> 或 <literal>scroll()</literal> 方法获得一个对象时，该对象都将被加入到 <literal>Session</literal> 的内部缓存中。 "
+msgid ""
+"Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
+"literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an "
+"object using <literal>load()</literal>, <literal>get()</literal>, "
+"<literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()"
+"</literal>, that object is added to the internal cache of the "
+"<literal>Session</literal>."
+msgstr ""
+"无论何时，当你给 <literal>save()</literal>、<literal>update()</literal> 或 "
+"<literal>saveOrUpdate()</literal> 方法传递一个对象时，或使用 <literal>load()"
+"</literal>、<literal>get()</literal>、<literal>list()</literal>、"
+"<literal>iterate()</literal> 或 <literal>scroll()</literal> 方法获得一个对象"
+"时，该对象都将被加入到 <literal>Session</literal> 的内部缓存中。 "
#. Tag: para
#, no-c-format
-msgid "When <literal>flush()</literal> is subsequently called, the state of that object will be synchronized with the database. If you do not want this synchronization to occur, or if you are processing a huge number of objects and need to manage memory efficiently, the <literal>evict()</literal> method can be used to remove the object and its collections from the first-level cache."
-msgstr "当随后 flush() 方法被调用时，对象的状态会和数据库取得同步。如果你不希望此同步操作发生，或者你正处理大量对象、需要对有效管理内存时，你可以调用 <literal>evict()</literal> 方法，从一级缓存中去掉这些对象及其集合。 "
+msgid ""
+"When <literal>flush()</literal> is subsequently called, the state of that "
+"object will be synchronized with the database. If you do not want this "
+"synchronization to occur, or if you are processing a huge number of objects "
+"and need to manage memory efficiently, the <literal>evict()</literal> method "
+"can be used to remove the object and its collections from the first-level "
+"cache."
+msgstr ""
+"当随后 flush() 方法被调用时，对象的状态会和数据库取得同步。如果你不希望此同步"
+"操作发生，或者你正处理大量对象、需要对有效管理内存时，你可以调用 "
+"<literal>evict()</literal> 方法，从一级缓存中去掉这些对象及其集合。 "
#. Tag: para
#, no-c-format
-msgid "The <literal>Session</literal> also provides a <literal>contains()</literal> method to determine if an instance belongs to the session cache."
-msgstr "Session 还提供了一个 <literal>contains()</literal> 方法，用来判断某个实例是否处于当前 session 的缓存中。"
+msgid ""
+"The <literal>Session</literal> also provides a <literal>contains()</literal> "
+"method to determine if an instance belongs to the session cache."
+msgstr ""
+"Session 还提供了一个 <literal>contains()</literal> 方法，用来判断某个实例是否"
+"处于当前 session 的缓存中。"
#. Tag: para
#, no-c-format
-msgid "To evict all objects from the session cache, call <literal>Session.clear()</literal>"
-msgstr "如若要把所有的对象从 session 缓存中彻底清除，则需要调用 <literal>Session.clear()</literal>。 "
+msgid ""
+"To evict all objects from the session cache, call <literal>Session.clear()</"
+"literal>"
+msgstr ""
+"如若要把所有的对象从 session 缓存中彻底清除，则需要调用 <literal>Session."
+"clear()</literal>。 "
#. Tag: para
#, no-c-format
-msgid "For the second-level cache, there are methods defined on <literal>SessionFactory</literal> for evicting the cached state of an instance, entire class, collection instance or entire collection role."
-msgstr "对于二级缓存来说，在 <literal>SessionFactory</literal> 中定义了许多方法，清除缓存中实例、整个类、集合实例或者整个集合。"
+msgid ""
+"For the second-level cache, there are methods defined on "
+"<literal>SessionFactory</literal> for evicting the cached state of an "
+"instance, entire class, collection instance or entire collection role."
+msgstr ""
+"对于二级缓存来说，在 <literal>SessionFactory</literal> 中定义了许多方法，清除"
+"缓存中实例、整个类、集合实例或者整个集合。"
#. Tag: para
#, no-c-format
-msgid "The <literal>CacheMode</literal> controls how a particular session interacts with the second-level cache:"
-msgstr "<literal>CacheMode</literal> 参数用于控制具体的 Session 如何与二级缓存进行交互。 "
+msgid ""
+"The <literal>CacheMode</literal> controls how a particular session interacts "
+"with the second-level cache:"
+msgstr ""
+"<literal>CacheMode</literal> 参数用于控制具体的 Session 如何与二级缓存进行交"
+"互。 "
#. Tag: para
#, no-c-format
-msgid "<literal>CacheMode.NORMAL</literal>: will read items from and write items to the second-level cache"
+msgid ""
+"<literal>CacheMode.NORMAL</literal>: will read items from and write items to "
+"the second-level cache"
msgstr "<literal>CacheMode.NORMAL</literal>：从二级缓存中读、写数据。"
#. Tag: para
#, no-c-format
-msgid "<literal>CacheMode.GET</literal>: will read items from the second-level cache. Do not write to the second-level cache except when updating data"
-msgstr "<literal>CacheMode.GET</literal>：从二级缓存中读取数据，仅在数据更新时对二级缓存写数据。"
+msgid ""
+"<literal>CacheMode.GET</literal>: will read items from the second-level "
+"cache. Do not write to the second-level cache except when updating data"
+msgstr ""
+"<literal>CacheMode.GET</literal>：从二级缓存中读取数据，仅在数据更新时对二级"
+"缓存写数据。"
#. Tag: para
#, no-c-format
-msgid "<literal>CacheMode.PUT</literal>: will write items to the second-level cache. Do not read from the second-level cache"
-msgstr "<literal>CacheMode.PUT</literal>：仅向二级缓存写数据，但不从二级缓存中读数据。"
+msgid ""
+"<literal>CacheMode.PUT</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache"
+msgstr ""
+"<literal>CacheMode.PUT</literal>：仅向二级缓存写数据，但不从二级缓存中读数"
+"据。"
#. Tag: para
#, no-c-format
-msgid "<literal>CacheMode.REFRESH</literal>: will write items to the second-level cache. Do not read from the second-level cache. Bypass the effect of <literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the second-level cache for all items read from the database"
-msgstr "<literal>CacheMode.REFRESH</literal>：仅向二级缓存写数据，但不从二级缓存中读数据。通过 <literal>hibernate.cache.use_minimal_puts</literal> 的设置，强制二级缓存从数据库中读取数据，刷新缓存内容。"
+msgid ""
+"<literal>CacheMode.REFRESH</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache. Bypass the effect of "
+"<literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the "
+"second-level cache for all items read from the database"
+msgstr ""
+"<literal>CacheMode.REFRESH</literal>：仅向二级缓存写数据，但不从二级缓存中读"
+"数据。通过 <literal>hibernate.cache.use_minimal_puts</literal> 的设置，强制二"
+"级缓存从数据库中读取数据，刷新缓存内容。"
#. Tag: para
#, no-c-format
-msgid "To browse the contents of a second-level or query cache region, use the <literal>Statistics</literal> API:"
-msgstr "如若需要查看二级缓存或查询缓存区域的内容，你可以使用<literal>统计（Statistics）</literal> API。"
+msgid ""
+"To browse the contents of a second-level or query cache region, use the "
+"<literal>Statistics</literal> API:"
+msgstr ""
+"如若需要查看二级缓存或查询缓存区域的内容，你可以使用<literal>统计"
+"（Statistics）</literal> API。"
#. Tag: para
#, no-c-format
-msgid "You will need to enable statistics and, optionally, force Hibernate to keep the cache entries in a more readable format:"
-msgstr "此时，你必须手工打开统计选项。可选的，你可以让 Hibernate 更人工可读的方式维护缓存内容。 "
+msgid ""
+"You will need to enable statistics and, optionally, force Hibernate to keep "
+"the cache entries in a more readable format:"
+msgstr ""
+"此时，你必须手工打开统计选项。可选的，你可以让 Hibernate 更人工可读的方式维护"
+"缓存内容。 "
#. Tag: title
#, no-c-format
@@ -802,8 +1457,12 @@
#. Tag: para
#, no-c-format
-msgid "Query result sets can also be cached. This is only useful for queries that are run frequently with the same parameters."
-msgstr "查询的结果集也可以被缓存。只有当经常使用同样的参数进行查询时，这才会有些用处。"
+msgid ""
+"Query result sets can also be cached. This is only useful for queries that "
+"are run frequently with the same parameters."
+msgstr ""
+"查询的结果集也可以被缓存。只有当经常使用同样的参数进行查询时，这才会有些用"
+"处。"
#. Tag: title
#, no-c-format
@@ -812,8 +1471,20 @@
#. Tag: para
#, no-c-format
-msgid "Caching of query results introduces some overhead in terms of your applications normal transactional processing. For example, if you cache results of a query against Person Hibernate will need to keep track of when those results should be invalidated because changes have been committed against Person. That, coupled with the fact that most applications simply gain no benefit from caching query results, leads Hibernate to disable caching of query results by default. To use query caching, you will first need to enable the query cache:"
-msgstr "按照应用程序的事务性处理过程，查询结果的缓存将产生一些负荷。例如，如果缓存针对 Person 的查询结果，在 Person 发生了修改时，Hibernate 将需要跟踪这些结果什么时候失效。因为大多数应用程序不会从缓存查询结果中受益，所以 Hibernate 在缺省情况下将禁用缓存。要使用查询缓存，你首先需要启用查询缓存："
+msgid ""
+"Caching of query results introduces some overhead in terms of your "
+"applications normal transactional processing. For example, if you cache "
+"results of a query against Person Hibernate will need to keep track of when "
+"those results should be invalidated because changes have been committed "
+"against Person. That, coupled with the fact that most applications simply "
+"gain no benefit from caching query results, leads Hibernate to disable "
+"caching of query results by default. To use query caching, you will first "
+"need to enable the query cache:"
+msgstr ""
+"按照应用程序的事务性处理过程，查询结果的缓存将产生一些负荷。例如，如果缓存针"
+"对 Person 的查询结果，在 Person 发生了修改时，Hibernate 将需要跟踪这些结果什"
+"么时候失效。因为大多数应用程序不会从缓存查询结果中受益，所以 Hibernate 在缺省"
+"情况下将禁用缓存。要使用查询缓存，你首先需要启用查询缓存："
#. Tag: para
#, no-c-format
@@ -822,28 +1493,65 @@
#. Tag: para
#, no-c-format
-msgid "<classname>org.hibernate.cache.StandardQueryCache</classname>, holding the cached query results"
-msgstr "<classname>org.hibernate.cache.StandardQueryCache</classname>，保存缓存的查询结果"
+msgid ""
+"<classname>org.hibernate.cache.StandardQueryCache</classname>, holding the "
+"cached query results"
+msgstr ""
+"<classname>org.hibernate.cache.StandardQueryCache</classname>，保存缓存的查询"
+"结果"
#. Tag: para
#, no-c-format
-msgid "<classname>org.hibernate.cache.UpdateTimestampsCache</classname>, holding timestamps of the most recent updates to queryable tables. These are used to validate the results as they are served from the query cache."
-msgstr "<classname>org.hibernate.cache.UpdateTimestampsCache</classname>，保存对可查询表的最近更新的时间戳。它们用于检验查询结果。"
+msgid ""
+"<classname>org.hibernate.cache.UpdateTimestampsCache</classname>, holding "
+"timestamps of the most recent updates to queryable tables. These are used to "
+"validate the results as they are served from the query cache."
+msgstr ""
+"<classname>org.hibernate.cache.UpdateTimestampsCache</classname>，保存对可查"
+"询表的最近更新的时间戳。它们用于检验查询结果。"
#. Tag: para
-#, no-c-format
-msgid "If you configure your underlying cache implementation to use expiry or timeouts is very important that the cache timeout of the underlying cache region for the UpdateTimestampsCache be set to a higher value than the timeouts of any of the query caches. In fact, we recommend that the the UpdateTimestampsCache region not be configured for expiry at all. Note, in particular, that an LRU cache expiry policy is never appropriate."
-msgstr "如果你配置底层缓存实现来使用过期（expiry）或超时（timeout），把用于 UpdateTimestampsCache 的底层缓存 region 的缓存超时时间设置为比任何查询缓存的超时时间更长的值是非常重要的。事实上，我们推荐根本不把 UpdateTimestampsCache region 用于 expiry。请注意，特别是 LRU 缓存 expiry 策略总是不合适的。"
+#, fuzzy, no-c-format
+msgid ""
+"If you configure your underlying cache implementation to use expiry or "
+"timeouts is is very important that the cache timeout of the underlying cache "
+"region for the UpdateTimestampsCache be set to a higher value than the "
+"timeouts of any of the query caches. In fact, we recommend that the the "
+"UpdateTimestampsCache region not be configured for expiry at all. Note, in "
+"particular, that an LRU cache expiry policy is never appropriate."
+msgstr ""
+"如果你配置底层缓存实现来使用过期（expiry）或超时（timeout），把用于 "
+"UpdateTimestampsCache 的底层缓存 region 的缓存超时时间设置为比任何查询缓存的"
+"超时时间更长的值是非常重要的。事实上，我们推荐根本不把 UpdateTimestampsCache "
+"region 用于 expiry。请注意，特别是 LRU 缓存 expiry 策略总是不合适的。"
#. Tag: para
#, no-c-format
-msgid "As mentioned above, most queries do not benefit from caching or their results. So by default, individual queries are not cached even after enabling query caching. To enable results caching for a particular query, call <literal>org.hibernate.Query.setCacheable(true)</literal>. This call allows the query to look for existing cache results or add its results to the cache when it is executed."
-msgstr "如上面所提及的，绝大多数的查询并不能从查询缓存中受益，所以 Hibernate 默认是不进行查询缓存的。如若需要进行缓存，请调用 <literal>org.hibernate.Query.setCacheable（true）</literal>方法。这个调用会让查询在执行过程中时先从缓存中查找结果，并将自己的结果集放到缓存中去。 "
+msgid ""
+"As mentioned above, most queries do not benefit from caching or their "
+"results. So by default, individual queries are not cached even after "
+"enabling query caching. To enable results caching for a particular query, "
+"call <literal>org.hibernate.Query.setCacheable(true)</literal>. This call "
+"allows the query to look for existing cache results or add its results to "
+"the cache when it is executed."
+msgstr ""
+"如上面所提及的，绝大多数的查询并不能从查询缓存中受益，所以 Hibernate 默认是不"
+"进行查询缓存的。如若需要进行缓存，请调用 <literal>org.hibernate.Query."
+"setCacheable（true）</literal>方法。这个调用会让查询在执行过程中时先从缓存中"
+"查找结果，并将自己的结果集放到缓存中去。 "
#. Tag: para
#, no-c-format
-msgid "The query cache does not cache the state of the actual entities in the cache; it caches only identifier values and results of value type. For this reaso, the query cache should always be used in conjunction with the second-level cache for those entities expected to be cached as part of a query result cache (just as with collection caching)."
-msgstr "查询缓存不会缓存缓存中实际实体的状态；它只缓存标识符值和值类型的结果。出于这个原因，对于那些作为查询结果缓存的一部分（和集合缓存一样）进行缓存的实体，查询缓存应该和二级缓存一起使用。"
+msgid ""
+"The query cache does not cache the state of the actual entities in the "
+"cache; it caches only identifier values and results of value type. For this "
+"reaso, the query cache should always be used in conjunction with the second-"
+"level cache for those entities expected to be cached as part of a query "
+"result cache (just as with collection caching)."
+msgstr ""
+"查询缓存不会缓存缓存中实际实体的状态；它只缓存标识符值和值类型的结果。出于这"
+"个原因，对于那些作为查询结果缓存的一部分（和集合缓存一样）进行缓存的实体，查"
+"询缓存应该和二级缓存一起使用。"
#. Tag: title
#, no-c-format
@@ -852,13 +1560,32 @@
#. Tag: para
#, no-c-format
-msgid "If you require fine-grained control over query cache expiration policies, you can specify a named cache region for a particular query by calling <literal>Query.setCacheRegion()</literal>."
-msgstr "如果你要对查询缓存的失效政策进行精确的控制，你必须调用 <literal>Query.setCacheRegion()</literal> 方法，为每个查询指定其命名的缓存区域。 "
+msgid ""
+"If you require fine-grained control over query cache expiration policies, "
+"you can specify a named cache region for a particular query by calling "
+"<literal>Query.setCacheRegion()</literal>."
+msgstr ""
+"如果你要对查询缓存的失效政策进行精确的控制，你必须调用 <literal>Query."
+"setCacheRegion()</literal> 方法，为每个查询指定其命名的缓存区域。 "
#. Tag: para
#, no-c-format
-msgid "If you want to force the query cache to refresh one of its regions (disregard any cached results it finds there) you can use <literal>org.hibernate.Query.setCacheMode(CacheMode.REFRESH)</literal>. In conjunction with the region you have defined for the given query, Hibernate will selectively force the results cached in that particular region to be refreshed. This is particularly useful in cases where underlying data may have been updated via a separate process and is a far more efficient alternative to bulk eviction of the region via <literal>org.hibernate.SessionFactory.evictQueries()</literal>."
-msgstr "如果查询需要强行刷新其查询缓存区域，那么你应该调用 <literal>org.hibernate.Query.setCacheMode（CacheMode.REFRESH）</literal>方法。 这对在其他进程中修改底层数据（例如，不通过Hibernate修改数据），或对那些需要选择性更新特定查询结果集的情况特别有用。这是对 <literal>org.hibernate.SessionFactory.evictQueries()</literal> 的更为有效的替代方案，同样可以清除查询缓存区域。"
+msgid ""
+"If you want to force the query cache to refresh one of its regions "
+"(disregard any cached results it finds there) you can use <literal>org."
+"hibernate.Query.setCacheMode(CacheMode.REFRESH)</literal>. In conjunction "
+"with the region you have defined for the given query, Hibernate will "
+"selectively force the results cached in that particular region to be "
+"refreshed. This is particularly useful in cases where underlying data may "
+"have been updated via a separate process and is a far more efficient "
+"alternative to bulk eviction of the region via <literal>org.hibernate."
+"SessionFactory.evictQueries()</literal>."
+msgstr ""
+"如果查询需要强行刷新其查询缓存区域，那么你应该调用 <literal>org.hibernate."
+"Query.setCacheMode（CacheMode.REFRESH）</literal>方法。 这对在其他进程中修改"
+"底层数据（例如，不通过Hibernate修改数据），或对那些需要选择性更新特定查询结果"
+"集的情况特别有用。这是对 <literal>org.hibernate.SessionFactory.evictQueries()"
+"</literal> 的更为有效的替代方案，同样可以清除查询缓存区域。"
#. Tag: title
#, no-c-format
@@ -867,8 +1594,13 @@
#. Tag: para
#, no-c-format
-msgid "In the previous sections we have covered collections and their applications. In this section we explore some more issues in relation to collections at runtime."
-msgstr "在前面的章节里我们已经讨论了集合和相关应用程序。在本节我么将探索运行时集合的更多问题。"
+msgid ""
+"In the previous sections we have covered collections and their applications. "
+"In this section we explore some more issues in relation to collections at "
+"runtime."
+msgstr ""
+"在前面的章节里我们已经讨论了集合和相关应用程序。在本节我么将探索运行时集合的"
+"更多问题。"
#. Tag: title
#, no-c-format
@@ -897,8 +1629,17 @@
#. Tag: para
#, no-c-format
-msgid "This classification distinguishes the various table and foreign key relationships but does not tell us quite everything we need to know about the relational model. To fully understand the relational structure and performance characteristics, we must also consider the structure of the primary key that is used by Hibernate to update or delete collection rows. This suggests the following classification:"
-msgstr "这个分类是区分了不同的表和外键关系类型，但是它没有告诉我们关系模型的所有内容。 要完全理解他们的关系结构和性能特点，我们必须同时考虑“用于 Hibernate 更新或删除集合行数据的主键的结构”。因此得到了如下的分类："
+msgid ""
+"This classification distinguishes the various table and foreign key "
+"relationships but does not tell us quite everything we need to know about "
+"the relational model. To fully understand the relational structure and "
+"performance characteristics, we must also consider the structure of the "
+"primary key that is used by Hibernate to update or delete collection rows. "
+"This suggests the following classification:"
+msgstr ""
+"这个分类是区分了不同的表和外键关系类型，但是它没有告诉我们关系模型的所有内"
+"容。 要完全理解他们的关系结构和性能特点，我们必须同时考虑“用于 Hibernate 更新"
+"或删除集合行数据的主键的结构”。因此得到了如下的分类："
#. Tag: para
#, no-c-format
@@ -917,53 +1658,131 @@
#. Tag: para
#, no-c-format
-msgid "All indexed collections (maps, lists, and arrays) have a primary key consisting of the <literal><key></literal> and <literal><index></literal> columns. In this case, collection updates are extremely efficient. The primary key can be efficiently indexed and a particular row can be efficiently located when Hibernate tries to update or delete it."
-msgstr "所有的有序集合类（maps，lists，arrays）都拥有一个由 <literal><key></literal> 和 <literal><index></literal> 组成的主键。这种情况下集合类的更新是非常高效的 — 主键已经被有效的索引，因此当 Hibernate 试图更新或删除一行时，可以迅速找到该行数据。 "
+msgid ""
+"All indexed collections (maps, lists, and arrays) have a primary key "
+"consisting of the <literal><key></literal> and <literal><index></"
+"literal> columns. In this case, collection updates are extremely efficient. "
+"The primary key can be efficiently indexed and a particular row can be "
+"efficiently located when Hibernate tries to update or delete it."
+msgstr ""
+"所有的有序集合类（maps，lists，arrays）都拥有一个由 <literal><key></"
+"literal> 和 <literal><index></literal> 组成的主键。这种情况下集合类的更"
+"新是非常高效的 — 主键已经被有效的索引，因此当 Hibernate 试图更新或删除一行"
+"时，可以迅速找到该行数据。 "
#. Tag: para
#, no-c-format
-msgid "Sets have a primary key consisting of <literal><key></literal> and element columns. This can be less efficient for some types of collection element, particularly composite elements or large text or binary fields, as the database may not be able to index a complex primary key as efficiently. However, for one-to-many or many-to-many associations, particularly in the case of synthetic identifiers, it is likely to be just as efficient. If you want <literal>SchemaExport</literal> to actually create the primary key of a <literal><set></literal>, you must declare all columns as <literal>not-null=\"true\"</literal>."
-msgstr "集合（sets）的主键由 <literal><key></literal> 和其他元素字段构成。对于有些元素类型来说，这很低效，特别是组合元素或者大文本、大二进制字段；数据库可能无法有效的对复杂的主键进行索引。另一方面，对于一对多、多对多关联，特别是合成的标识符来说，集合也可以达到同样的高效性能。（ 附注：如果你希望 <literal>SchemaExport</literal> 为你的 <literal><set></literal> 创建主键，你必须把所有的字段都声明为 <literal>not-null=\"true\"</literal>。） "
+msgid ""
+"Sets have a primary key consisting of <literal><key></literal> and "
+"element columns. This can be less efficient for some types of collection "
+"element, particularly composite elements or large text or binary fields, as "
+"the database may not be able to index a complex primary key as efficiently. "
+"However, for one-to-many or many-to-many associations, particularly in the "
+"case of synthetic identifiers, it is likely to be just as efficient. If you "
+"want <literal>SchemaExport</literal> to actually create the primary key of a "
+"<literal><set></literal>, you must declare all columns as <literal>not-"
+"null=\"true\"</literal>."
+msgstr ""
+"集合（sets）的主键由 <literal><key></literal> 和其他元素字段构成。对于"
+"有些元素类型来说，这很低效，特别是组合元素或者大文本、大二进制字段；数据库可"
+"能无法有效的对复杂的主键进行索引。另一方面，对于一对多、多对多关联，特别是合"
+"成的标识符来说，集合也可以达到同样的高效性能。（ 附注：如果你希望 "
+"<literal>SchemaExport</literal> 为你的 <literal><set></literal> 创建主"
+"键，你必须把所有的字段都声明为 <literal>not-null=\"true\"</literal>。） "
#. Tag: para
#, no-c-format
-msgid "<literal><idbag></literal> mappings define a surrogate key, so they are efficient to update. In fact, they are the best case."
-msgstr "<literal><idbag></literal> 映射定义了代理键，因此它总是可以很高效的被更新。事实上，<literal><idbag></literal> 拥有着最好的性能表现。 "
+msgid ""
+"<literal><idbag></literal> mappings define a surrogate key, so they "
+"are efficient to update. In fact, they are the best case."
+msgstr ""
+"<literal><idbag></literal> 映射定义了代理键，因此它总是可以很高效的被更"
+"新。事实上，<literal><idbag></literal> 拥有着最好的性能表现。 "
#. Tag: para
#, no-c-format
-msgid "Bags are the worst case since they permit duplicate element values and, as they have no index column, no primary key can be defined. Hibernate has no way of distinguishing between duplicate rows. Hibernate resolves this problem by completely removing in a single <literal>DELETE</literal> and recreating the collection whenever it changes. This can be inefficient."
-msgstr "Bag 是最差的。因为 bag 允许重复的元素值，也没有索引字段，因此不可能定义主键。 Hibernate 无法判断出重复的行。当这种集合被更改时，Hibernate 将会先完整地移除 （通过一个（in a single <literal>DELETE</literal>））整个集合，然后再重新创建整个集合。因此 Bag 是非常低效的。 "
+msgid ""
+"Bags are the worst case since they permit duplicate element values and, as "
+"they have no index column, no primary key can be defined. Hibernate has no "
+"way of distinguishing between duplicate rows. Hibernate resolves this "
+"problem by completely removing in a single <literal>DELETE</literal> and "
+"recreating the collection whenever it changes. This can be inefficient."
+msgstr ""
+"Bag 是最差的。因为 bag 允许重复的元素值，也没有索引字段，因此不可能定义主"
+"键。 Hibernate 无法判断出重复的行。当这种集合被更改时，Hibernate 将会先完整地"
+"移除 （通过一个（in a single <literal>DELETE</literal>））整个集合，然后再重"
+"新创建整个集合。因此 Bag 是非常低效的。 "
#. Tag: para
#, no-c-format
-msgid "For a one-to-many association, the \"primary key\" may not be the physical primary key of the database table. Even in this case, the above classification is still useful. It reflects how Hibernate \"locates\" individual rows of the collection."
-msgstr "请注意：对于一对多关联来说，“主键”很可能并不是数据库表的物理主键。但就算在此情况下，上面的分类仍然是有用的。（它仍然反映了 Hibernate 在集合的各数据行中是如何进行“定位”的。） "
+msgid ""
+"For a one-to-many association, the \"primary key\" may not be the physical "
+"primary key of the database table. Even in this case, the above "
+"classification is still useful. It reflects how Hibernate \"locates\" "
+"individual rows of the collection."
+msgstr ""
+"请注意：对于一对多关联来说，“主键”很可能并不是数据库表的物理主键。但就算在此"
+"情况下，上面的分类仍然是有用的。（它仍然反映了 Hibernate 在集合的各数据行中是"
+"如何进行“定位”的。） "
#. Tag: title
#, no-c-format
-msgid "Lists, maps, idbags and sets are the most efficient collections to update"
+msgid ""
+"Lists, maps, idbags and sets are the most efficient collections to update"
msgstr "Lists，maps 和 sets 用于更新效率最高"
#. Tag: para
#, no-c-format
-msgid "From the discussion above, it should be clear that indexed collections and sets allow the most efficient operation in terms of adding, removing and updating elements."
-msgstr "根据我们上面的讨论，显然有序集合类型和大多数 set 都可以在增加、删除、修改元素中拥有最好的性能。 "
+msgid ""
+"From the discussion above, it should be clear that indexed collections and "
+"sets allow the most efficient operation in terms of adding, removing and "
+"updating elements."
+msgstr ""
+"根据我们上面的讨论，显然有序集合类型和大多数 set 都可以在增加、删除、修改元素"
+"中拥有最好的性能。 "
#. Tag: para
#, no-c-format
-msgid "There is, arguably, one more advantage that indexed collections have over sets for many-to-many associations or collections of values. Because of the structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</literal> a row when an element is \"changed\". Changes to a <literal>Set</literal> always work via <literal>INSERT</literal> and <literal>DELETE</literal> of individual rows. Once again, this consideration does not apply to one-to-many associations."
-msgstr "可论证的是对于多对多关联、值数据集合而言，有序集合类比集合（set）有一个好处。因为 <literal>Set</literal> 的内在结构， 如果“改变”了一个元素，Hibernate 并不会<literal>更新（UPDATE）</literal>这一行。对于 <literal>Set</literal> 来说，只有在<literal>插入（INSERT）</literal>和<literal>删除（DELETE）</literal> 操作时“改变”才有效。再次强调：这段讨论对“一对多关联”并不适用。 "
+msgid ""
+"There is, arguably, one more advantage that indexed collections have over "
+"sets for many-to-many associations or collections of values. Because of the "
+"structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</"
+"literal> a row when an element is \"changed\". Changes to a <literal>Set</"
+"literal> always work via <literal>INSERT</literal> and <literal>DELETE</"
+"literal> of individual rows. Once again, this consideration does not apply "
+"to one-to-many associations."
+msgstr ""
+"可论证的是对于多对多关联、值数据集合而言，有序集合类比集合（set）有一个好处。"
+"因为 <literal>Set</literal> 的内在结构， 如果“改变”了一个元素，Hibernate 并不"
+"会<literal>更新（UPDATE）</literal>这一行。对于 <literal>Set</literal> 来说，"
+"只有在<literal>插入（INSERT）</literal>和<literal>删除（DELETE）</literal> 操"
+"作时“改变”才有效。再次强调：这段讨论对“一对多关联”并不适用。 "
#. Tag: para
#, no-c-format
-msgid "After observing that arrays cannot be lazy, you can conclude that lists, maps and idbags are the most performant (non-inverse) collection types, with sets not far behind. You can expect sets to be the most common kind of collection in Hibernate applications. This is because the \"set\" semantics are most natural in the relational model."
-msgstr "注意到数组无法延迟载入，我们可以得出结论，list，map 和 idbags 是最高效的（非反向）集合类型，set 则紧随其后。 在 Hibernate 中，set 应该时最通用的集合类型，这时因为“set”的语义在关系模型中是最自然的。 "
+msgid ""
+"After observing that arrays cannot be lazy, you can conclude that lists, "
+"maps and idbags are the most performant (non-inverse) collection types, with "
+"sets not far behind. You can expect sets to be the most common kind of "
+"collection in Hibernate applications. This is because the \"set\" semantics "
+"are most natural in the relational model."
+msgstr ""
+"注意到数组无法延迟载入，我们可以得出结论，list，map 和 idbags 是最高效的（非"
+"反向）集合类型，set 则紧随其后。 在 Hibernate 中，set 应该时最通用的集合类"
+"型，这时因为“set”的语义在关系模型中是最自然的。 "
#. Tag: para
#, no-c-format
-msgid "However, in well-designed Hibernate domain models, most collections are in fact one-to-many associations with <literal>inverse=\"true\"</literal>. For these associations, the update is handled by the many-to-one end of the association, and so considerations of collection update performance simply do not apply."
-msgstr "但是，在设计良好的 Hibernate 领域模型中，我们通常可以看到更多的集合事实上是带有 <literal>inverse=\"true\"</literal> 的一对多的关联。对于这些关联，更新操作将会在多对一的这一端进行处理。因此对于此类情况，无需考虑其集合的更新性能。 "
+msgid ""
+"However, in well-designed Hibernate domain models, most collections are in "
+"fact one-to-many associations with <literal>inverse=\"true\"</literal>. For "
+"these associations, the update is handled by the many-to-one end of the "
+"association, and so considerations of collection update performance simply "
+"do not apply."
+msgstr ""
+"但是，在设计良好的 Hibernate 领域模型中，我们通常可以看到更多的集合事实上是带"
+"有 <literal>inverse=\"true\"</literal> 的一对多的关联。对于这些关联，更新操"
+"作将会在多对一的这一端进行处理。因此对于此类情况，无需考虑其集合的更新性能。 "
#. Tag: title
#, no-c-format
@@ -972,8 +1791,22 @@
#. Tag: para
#, no-c-format
-msgid "There is a particular case, however, in which bags, and also lists, are much more performant than sets. For a collection with <literal>inverse=\"true\"</literal>, the standard bidirectional one-to-many relationship idiom, for example, we can add elements to a bag or list without needing to initialize (fetch) the bag elements. This is because, unlike a <literal>set</literal>, <literal>Collection.add()</literal> or <literal>Collection.addAll()</literal> must always return true for a bag or <literal>List</literal>. This can make the following common code much faster:"
-msgstr "在把 bag 扔进水沟之前，你必须了解，在一种情况下，bag 的性能（包括list）要比 set 高得多：对于指明了 <literal>inverse=\"true\"</literal> 的集合类（比如说，标准的双向的一对多关联），我们可以在未初始化（fetch）包元素的情况下直接向 bag 或 list 添加新元素！ 这是因为 <literal>Collection.add()</literal>）或者 <literal>Collection.addAll()</literal> 方法对 bag 或者 List 总是返回 true（这点与与 Set 不同）。因此对于下面的相同代码来说，速度会快得多。 "
+msgid ""
+"There is a particular case, however, in which bags, and also lists, are much "
+"more performant than sets. For a collection with <literal>inverse=\"true\"</"
+"literal>, the standard bidirectional one-to-many relationship idiom, for "
+"example, we can add elements to a bag or list without needing to initialize "
+"(fetch) the bag elements. This is because, unlike a <literal>set</literal>, "
+"<literal>Collection.add()</literal> or <literal>Collection.addAll()</"
+"literal> must always return true for a bag or <literal>List</literal>. This "
+"can make the following common code much faster:"
+msgstr ""
+"在把 bag 扔进水沟之前，你必须了解，在一种情况下，bag 的性能（包括list）要比 "
+"set 高得多：对于指明了 <literal>inverse=\"true\"</literal> 的集合类（比如说，"
+"标准的双向的一对多关联），我们可以在未初始化（fetch）包元素的情况下直接向 "
+"bag 或 list 添加新元素！ 这是因为 <literal>Collection.add()</literal>）或者 "
+"<literal>Collection.addAll()</literal> 方法对 bag 或者 List 总是返回 true（这"
+"点与与 Set 不同）。因此对于下面的相同代码来说，速度会快得多。 "
#. Tag: title
#, no-c-format
@@ -982,18 +1815,36 @@
#. Tag: para
#, no-c-format
-msgid "Deleting collection elements one by one can sometimes be extremely inefficient. Hibernate knows not to do that in the case of an newly-empty collection (if you called <literal>list.clear()</literal>, for example). In this case, Hibernate will issue a single <literal>DELETE</literal>."
-msgstr "偶尔的，逐个删除集合类中的元素是相当低效的。Hibernate 并没那么笨，如果你想要把整个集合都删除（比如说调用 list.clear()），Hibernate 只需要一个 DELETE 就搞定了。 "
+msgid ""
+"Deleting collection elements one by one can sometimes be extremely "
+"inefficient. Hibernate knows not to do that in the case of an newly-empty "
+"collection (if you called <literal>list.clear()</literal>, for example). In "
+"this case, Hibernate will issue a single <literal>DELETE</literal>."
+msgstr ""
+"偶尔的，逐个删除集合类中的元素是相当低效的。Hibernate 并没那么笨，如果你想要"
+"把整个集合都删除（比如说调用 list.clear()），Hibernate 只需要一个 DELETE 就搞"
+"定了。 "
#. Tag: para
#, no-c-format
-msgid "Suppose you added a single element to a collection of size twenty and then remove two elements. Hibernate will issue one <literal>INSERT</literal> statement and two <literal>DELETE</literal> statements, unless the collection is a bag. This is certainly desirable."
-msgstr "假设我们在一个长度为20的集合类中新增加了一个元素，然后再删除两个。Hibernate 会安排一条 <literal>INSERT</literal> 语句和两条 <literal>DELETE</literal> 语句（除非集合类是一个 bag）。这当然是令人满意的。 "
+msgid ""
+"Suppose you added a single element to a collection of size twenty and then "
+"remove two elements. Hibernate will issue one <literal>INSERT</literal> "
+"statement and two <literal>DELETE</literal> statements, unless the "
+"collection is a bag. This is certainly desirable."
+msgstr ""
+"假设我们在一个长度为20的集合类中新增加了一个元素，然后再删除两个。Hibernate "
+"会安排一条 <literal>INSERT</literal> 语句和两条 <literal>DELETE</literal> 语"
+"句（除非集合类是一个 bag）。这当然是令人满意的。 "
#. Tag: para
#, no-c-format
-msgid "However, suppose that we remove eighteen elements, leaving two and then add thee new elements. There are two possible ways to proceed"
-msgstr "但是，假设我们删除了 18 个数据，只剩下 2 个，然后新增 3 个。则有两种处理方式："
+msgid ""
+"However, suppose that we remove eighteen elements, leaving two and then add "
+"thee new elements. There are two possible ways to proceed"
+msgstr ""
+"但是，假设我们删除了 18 个数据，只剩下 2 个，然后新增 3 个。则有两种处理方"
+"式："
#. Tag: para
#, no-c-format
@@ -1002,23 +1853,40 @@
#. Tag: para
#, no-c-format
-msgid "remove the whole collection in one SQL <literal>DELETE</literal> and insert all five current elements one by one"
+msgid ""
+"remove the whole collection in one SQL <literal>DELETE</literal> and insert "
+"all five current elements one by one"
msgstr "删除整个集合类（只用一句 DELETE 语句），然后逐一添加 5 个数据。"
#. Tag: para
#, no-c-format
-msgid "Hibernate cannot know that the second option is probably quicker. It would probably be undesirable for Hibernate to be that intuitive as such behavior might confuse database triggers, etc."
-msgstr "Hibernate 还没那么聪明，知道第二种选择可能会比较快。（也许让 Hibernate 不这么聪明也是好事，否则可能会引发意外的“数据库触发器”之类的问题。）"
+msgid ""
+"Hibernate cannot know that the second option is probably quicker. It would "
+"probably be undesirable for Hibernate to be that intuitive as such behavior "
+"might confuse database triggers, etc."
+msgstr ""
+"Hibernate 还没那么聪明，知道第二种选择可能会比较快。（也许让 Hibernate 不这么"
+"聪明也是好事，否则可能会引发意外的“数据库触发器”之类的问题。）"
#. Tag: para
#, no-c-format
-msgid "Fortunately, you can force this behavior (i.e. the second strategy) at any time by discarding (i.e. dereferencing) the original collection and returning a newly instantiated collection with all the current elements."
-msgstr "幸运的是，你可以强制使用第二种策略。你需要取消原来的整个集合类（解除其引用），然后再返回一个新的实例化的集合类，只包含需要的元素。有些时候这是非常有用的。 "
+msgid ""
+"Fortunately, you can force this behavior (i.e. the second strategy) at any "
+"time by discarding (i.e. dereferencing) the original collection and "
+"returning a newly instantiated collection with all the current elements."
+msgstr ""
+"幸运的是，你可以强制使用第二种策略。你需要取消原来的整个集合类（解除其引"
+"用），然后再返回一个新的实例化的集合类，只包含需要的元素。有些时候这是非常有"
+"用的。 "
#. Tag: para
#, no-c-format
-msgid "One-shot-delete does not apply to collections mapped <literal>inverse=\"true\"</literal>."
-msgstr "显然，一次性删除并不适用于被映射为 <literal>inverse=\"true\"</literal> 的集合。 "
+msgid ""
+"One-shot-delete does not apply to collections mapped <literal>inverse=\"true"
+"\"</literal>."
+msgstr ""
+"显然，一次性删除并不适用于被映射为 <literal>inverse=\"true\"</literal> 的集"
+"合。 "
#. Tag: title
#, no-c-format
@@ -1027,8 +1895,14 @@
#. Tag: para
#, no-c-format
-msgid "Optimization is not much use without monitoring and access to performance numbers. Hibernate provides a full range of figures about its internal operations. Statistics in Hibernate are available per <literal>SessionFactory</literal>."
-msgstr "没有监测和性能参数而进行优化是毫无意义的。Hibernate 为其内部操作提供了一系列的示意图，因此可以从 每个 <literal>SessionFactory</literal> 抓取其统计数据。"
+msgid ""
+"Optimization is not much use without monitoring and access to performance "
+"numbers. Hibernate provides a full range of figures about its internal "
+"operations. Statistics in Hibernate are available per "
+"<literal>SessionFactory</literal>."
+msgstr ""
+"没有监测和性能参数而进行优化是毫无意义的。Hibernate 为其内部操作提供了一系列"
+"的示意图，因此可以从 每个 <literal>SessionFactory</literal> 抓取其统计数据。"
#. Tag: title
#, no-c-format
@@ -1037,33 +1911,64 @@
#. Tag: para
#, no-c-format
-msgid "You can access <literal>SessionFactory</literal> metrics in two ways. Your first option is to call <literal>sessionFactory.getStatistics()</literal> and read or display the <literal>Statistics</literal> yourself."
-msgstr "你可以有两种方式访问 <literal>SessionFactory</literal> 的数据记录，第一种就是自己直接调用 <literal>sessionFactory.getStatistics()</literal> 方法读取、显示<literal>统计</literal>数据。"
+msgid ""
+"You can access <literal>SessionFactory</literal> metrics in two ways. Your "
+"first option is to call <literal>sessionFactory.getStatistics()</literal> "
+"and read or display the <literal>Statistics</literal> yourself."
+msgstr ""
+"你可以有两种方式访问 <literal>SessionFactory</literal> 的数据记录，第一种就是"
+"自己直接调用 <literal>sessionFactory.getStatistics()</literal> 方法读取、显示"
+"<literal>统计</literal>数据。"
#. Tag: para
#, no-c-format
-msgid "Hibernate can also use JMX to publish metrics if you enable the <literal>StatisticsService</literal> MBean. You can enable a single MBean for all your <literal>SessionFactory</literal> or one per factory. See the following code for minimalistic configuration examples:"
-msgstr "此外，如果你打开 <literal>StatisticsService</literal> MBean 选项，那么 Hibernate 则可以使用 JMX 技术 发布其数据记录。你可以让应用中所有的 <literal>SessionFactory</literal> 同时共享一个 MBean，也可以每个 SessionFactory 分配一个 MBean。下面的代码即是其演示代码： "
+msgid ""
+"Hibernate can also use JMX to publish metrics if you enable the "
+"<literal>StatisticsService</literal> MBean. You can enable a single MBean "
+"for all your <literal>SessionFactory</literal> or one per factory. See the "
+"following code for minimalistic configuration examples:"
+msgstr ""
+"此外，如果你打开 <literal>StatisticsService</literal> MBean 选项，那么 "
+"Hibernate 则可以使用 JMX 技术 发布其数据记录。你可以让应用中所有的 "
+"<literal>SessionFactory</literal> 同时共享一个 MBean，也可以每个 "
+"SessionFactory 分配一个 MBean。下面的代码即是其演示代码： "
#. Tag: para
#, no-c-format
-msgid "You can activate and deactivate the monitoring for a <literal>SessionFactory</literal>:"
-msgstr "你可以通过以下方法打开或关闭 <literal>SessionFactory</literal> 的监测功能： "
+msgid ""
+"You can activate and deactivate the monitoring for a "
+"<literal>SessionFactory</literal>:"
+msgstr ""
+"你可以通过以下方法打开或关闭 <literal>SessionFactory</literal> 的监测功能： "
#. Tag: para
#, no-c-format
-msgid "at configuration time, set <literal>hibernate.generate_statistics</literal> to <literal>false</literal>"
-msgstr "在配置期间，将 <literal>hibernate.generate_statistics</literal> 设置为 <literal>true</literal> 或 <literal>false</literal>；"
+msgid ""
+"at configuration time, set <literal>hibernate.generate_statistics</literal> "
+"to <literal>false</literal>"
+msgstr ""
+"在配置期间，将 <literal>hibernate.generate_statistics</literal> 设置为 "
+"<literal>true</literal> 或 <literal>false</literal>；"
#. Tag: para
#, no-c-format
-msgid "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> or <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
-msgstr "在运行期间，则可以可以通过 <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> 或 <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
+msgid ""
+"at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
+"or <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
+msgstr ""
+"在运行期间，则可以可以通过 <literal>sf.getStatistics().setStatisticsEnabled"
+"(true)</literal> 或 <literal>hibernateStatsBean.setStatisticsEnabled(true)</"
+"literal>"
#. Tag: para
#, no-c-format
-msgid "Statistics can be reset programmatically using the <literal>clear()</literal> method. A summary can be sent to a logger (info level) using the <literal>logSummary()</literal> method."
-msgstr "你也可以在程序中调用 <literal>clear()</literal> 方法重置统计数据，调用 <literal>logSummary()</literal> 在日志中记录（info 级别）其总结。 "
+msgid ""
+"Statistics can be reset programmatically using the <literal>clear()</"
+"literal> method. A summary can be sent to a logger (info level) using the "
+"<literal>logSummary()</literal> method."
+msgstr ""
+"你也可以在程序中调用 <literal>clear()</literal> 方法重置统计数据，调用 "
+"<literal>logSummary()</literal> 在日志中记录（info 级别）其总结。 "
#. Tag: title
#, no-c-format
@@ -1072,38 +1977,85 @@
#. Tag: para
#, no-c-format
-msgid "Hibernate provides a number of metrics, from basic information to more specialized information that is only relevant in certain scenarios. All available counters are described in the <literal>Statistics</literal> interface API, in three categories:"
-msgstr "Hibernate 提供了一系列数据记录，其记录的内容包括从最基本的信息到与具体场景的特殊信息。所有的测量值都可以由 <literal>Statistics</literal> 接口 API 进行访问，主要分为三类："
+msgid ""
+"Hibernate provides a number of metrics, from basic information to more "
+"specialized information that is only relevant in certain scenarios. All "
+"available counters are described in the <literal>Statistics</literal> "
+"interface API, in three categories:"
+msgstr ""
+"Hibernate 提供了一系列数据记录，其记录的内容包括从最基本的信息到与具体场景的"
+"特殊信息。所有的测量值都可以由 <literal>Statistics</literal> 接口 API 进行访"
+"问，主要分为三类："
#. Tag: para
#, no-c-format
-msgid "Metrics related to the general <literal>Session</literal> usage, such as number of open sessions, retrieved JDBC connections, etc."
-msgstr "使用 <literal>Session</literal> 的普通数据记录，例如打开的 Session 的个数、取得的 JDBC 的连接数等；"
+msgid ""
+"Metrics related to the general <literal>Session</literal> usage, such as "
+"number of open sessions, retrieved JDBC connections, etc."
+msgstr ""
+"使用 <literal>Session</literal> 的普通数据记录，例如打开的 Session 的个数、取"
+"得的 JDBC 的连接数等；"
#. Tag: para
#, no-c-format
-msgid "Metrics related to the entities, collections, queries, and caches as a whole (aka global metrics)."
+msgid ""
+"Metrics related to the entities, collections, queries, and caches as a whole "
+"(aka global metrics)."
msgstr "实体、集合、查询、缓存等内容的统一数据记录。"
#. Tag: para
#, no-c-format
-msgid "Detailed metrics related to a particular entity, collection, query or cache region."
+msgid ""
+"Detailed metrics related to a particular entity, collection, query or cache "
+"region."
msgstr "和具体实体、集合、查询、缓存相关的详细数据记录"
#. Tag: para
#, no-c-format
-msgid "For example, you can check the cache hit, miss, and put ratio of entities, collections and queries, and the average time a query needs. Be aware that the number of milliseconds is subject to approximation in Java. Hibernate is tied to the JVM precision and on some platforms this might only be accurate to 10 seconds."
-msgstr "例如：你可以检查缓存的命中成功次数，缓存的命中失败次数，实体、集合和查询的使用概率，查询的平均时间等。请注意 Java 中时间的近似精度是毫秒。Hibernate 的数据精度和具体的 JVM 有关，在有些平台上其精度甚至只能精确到 10 秒。 "
+msgid ""
+"For example, you can check the cache hit, miss, and put ratio of entities, "
+"collections and queries, and the average time a query needs. Be aware that "
+"the number of milliseconds is subject to approximation in Java. Hibernate is "
+"tied to the JVM precision and on some platforms this might only be accurate "
+"to 10 seconds."
+msgstr ""
+"例如：你可以检查缓存的命中成功次数，缓存的命中失败次数，实体、集合和查询的使"
+"用概率，查询的平均时间等。请注意 Java 中时间的近似精度是毫秒。Hibernate 的数"
+"据精度和具体的 JVM 有关，在有些平台上其精度甚至只能精确到 10 秒。 "
#. Tag: para
#, no-c-format
-msgid "Simple getters are used to access the global metrics (i.e. not tied to a particular entity, collection, cache region, etc.). You can access the metrics of a particular entity, collection or cache region through its name, and through its HQL or SQL representation for queries. Please refer to the <literal>Statistics</literal>, <literal>EntityStatistics</literal>, <literal>CollectionStatistics</literal>, <literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</literal> API Javadoc for more information. The following code is a simple example:"
-msgstr "你可以直接使用 getter 方法得到全局数据记录（例如，和具体的实体、集合、缓存区无关的数据），你也可以在具体查询中通过标记实体名、 或 HQL、SQL 语句得到某实体的数据记录。请参考 <literal>Statistics</literal>、<literal>EntityStatistics</literal>、<literal>CollectionStatistics</literal>、<literal>SecondLevelCacheStatistics</literal> 和 <literal>QueryStatistics</literal> 的 API 文档以抓取更多信息。下面的代码则是个简单的例子： "
+msgid ""
+"Simple getters are used to access the global metrics (i.e. not tied to a "
+"particular entity, collection, cache region, etc.). You can access the "
+"metrics of a particular entity, collection or cache region through its name, "
+"and through its HQL or SQL representation for queries. Please refer to the "
+"<literal>Statistics</literal>, <literal>EntityStatistics</literal>, "
+"<literal>CollectionStatistics</literal>, "
+"<literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</"
+"literal> API Javadoc for more information. The following code is a simple "
+"example:"
+msgstr ""
+"你可以直接使用 getter 方法得到全局数据记录（例如，和具体的实体、集合、缓存区"
+"无关的数据），你也可以在具体查询中通过标记实体名、 或 HQL、SQL 语句得到某实体"
+"的数据记录。请参考 <literal>Statistics</literal>、<literal>EntityStatistics</"
+"literal>、<literal>CollectionStatistics</literal>、"
+"<literal>SecondLevelCacheStatistics</literal> 和 <literal>QueryStatistics</"
+"literal> 的 API 文档以抓取更多信息。下面的代码则是个简单的例子： "
#. Tag: para
#, no-c-format
-msgid "You can work on all entities, collections, queries and region caches, by retrieving the list of names of entities, collections, queries and region caches using the following methods: <literal>getQueries()</literal>, <literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
-msgstr "如果你想得到所有实体、集合、查询和缓存区的数据，你可以通过以下方法获得实体、集合、查询和缓存区列表：<literal>getQueries()</literal>、<literal>getEntityNames()</literal>、<literal>getCollectionRoleNames()</literal> 和 <literal>getSecondLevelCacheRegionNames()</literal>。"
+msgid ""
+"You can work on all entities, collections, queries and region caches, by "
+"retrieving the list of names of entities, collections, queries and region "
+"caches using the following methods: <literal>getQueries()</literal>, "
+"<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
+"literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
+msgstr ""
+"如果你想得到所有实体、集合、查询和缓存区的数据，你可以通过以下方法获得实体、"
+"集合、查询和缓存区列表：<literal>getQueries()</literal>、"
+"<literal>getEntityNames()</literal>、<literal>getCollectionRoleNames()</"
+"literal> 和 <literal>getSecondLevelCacheRegionNames()</literal>。"
#~ msgid ""
#~ "This setting creates two new cache regions: one holding cached query "
Modified: core/trunk/entitymanager/src/main/docbook/en/modules/query_criteria.xml
===================================================================
--- core/trunk/entitymanager/src/main/docbook/en/modules/query_criteria.xml 2010-04-14 15:06:26 UTC (rev 19231)
+++ core/trunk/entitymanager/src/main/docbook/en/modules/query_criteria.xml 2010-04-14 16:27:11 UTC (rev 19232)
@@ -106,7 +106,7 @@
<area coords="4" id="ex.criteria.typedquery.entity.3" />
</areaspec>
- <programlisting role="JAVA" language="JAVA">CriteriaQuery<Person> criteria = builder.createQuery( Person.class );
+ <programlisting>CriteriaQuery<Person> criteria = builder.createQuery( Person.class );
Root<Person> personRoot = criteria.from( Person.class );
criteria.select( personRoot );
criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
@@ -160,7 +160,7 @@
<area coords="3" id="ex.criteria.typedquery.attr.2" />
</areaspec>
- <programlisting role="JAVA" language="JAVA">CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
+ <programlisting>CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
Root<Person> personRoot = criteria.from( Person.class );
criteria.select( personRoot.get( Person_.age ) );
criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
@@ -195,7 +195,7 @@
<area coords="3" id="ex.criteria.typedquery.expr.1" />
</areaspec>
- <programlisting role="JAVA" language="JAVA">CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
+ <programlisting>CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
Root<Person> personRoot = criteria.from( Person.class );
criteria.select( builder.max( personRoot.get( Person_.age ) ) );
criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
@@ -239,7 +239,7 @@
<area coords="5" id="ex.criteria.typedquery.array.2" />
</areaspec>
- <programlisting role="JAVA" language="JAVA">CriteriaQuery<Object[]> criteria = builder.createQuery( Object[].class );
+ <programlisting>CriteriaQuery<Object[]> criteria = builder.createQuery( Object[].class );
Root<Person> personRoot = criteria.from( Person.class );
Path<Long> idPath = personRoot.get( Person_.id );
Path<Integer> agePath = personRoot.get( Person_.age );
@@ -284,7 +284,7 @@
<area coords="5" id="ex.criteria.typedquery.array2.2" />
</areaspec>
- <programlisting role="JAVA" language="JAVA">CriteriaQuery<Object[]> criteria = builder.createQuery( Object[].class );
+ <programlisting>CriteriaQuery<Object[]> criteria = builder.createQuery( Object[].class );
Root<Person> personRoot = criteria.from( Person.class );
Path<Long> idPath = personRoot.get( Person_.id );
Path<Integer> agePath = personRoot.get( Person_.age );
@@ -351,7 +351,7 @@
</areaset>
</areaspec>
- <programlisting role="JAVA" language="JAVA">public class PersonWrapper {
+ <programlisting>public class PersonWrapper {
private final Long id;
private final Integer age;
public PersonWrapper(Long id, Integer age) {
@@ -433,7 +433,7 @@
</areaset>
</areaspec>
- <programlisting role="JAVA" language="JAVA">CriteriaQuery<Tuple> criteria = builder.createTupleQuery();
+ <programlisting>CriteriaQuery<Tuple> criteria = builder.createTupleQuery();
Root<Person> personRoot = criteria.from( Person.class );
Path<Long> idPath = personRoot.get( Person_.id );
Path<Integer> agePath = personRoot.get( Person_.age );
@@ -704,7 +704,7 @@
<area coords="7" id="ex.criteria.param.3" />
</areaspec>
- <programlisting role="JAVA" language="JAVA">CriteriaQuery<Person> criteria = build.createQuery( Person.class );
+ <programlisting>CriteriaQuery<Person> criteria = build.createQuery( Person.class );
Root<Person> personRoot = criteria.from( Person.class );
criteria.select( personRoot );
ParameterExpression<String> eyeColorParam = builder.parameter( String.class );
14 years
- 1
- 0
Hibernate SVN: r19231 - core/trunk/annotations/src/main/docbook/zh_cn/fop.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2010-04-14 11:06:26 -0400 (Wed, 14 Apr 2010)
New Revision: 19231
Added:
core/trunk/annotations/src/main/docbook/zh_cn/fop/readme.txt
Removed:
core/trunk/annotations/src/main/docbook/zh_cn/fop/simhei.ttf
core/trunk/annotations/src/main/docbook/zh_cn/fop/simsun.ttc
Modified:
core/trunk/annotations/src/main/docbook/zh_cn/fop/userconfig.xml
Log:
HHH-5116 Remove copyrighted fonts from annotations
Added: core/trunk/annotations/src/main/docbook/zh_cn/fop/readme.txt
===================================================================
--- core/trunk/annotations/src/main/docbook/zh_cn/fop/readme.txt (rev 0)
+++ core/trunk/annotations/src/main/docbook/zh_cn/fop/readme.txt 2010-04-14 15:06:26 UTC (rev 19231)
@@ -0,0 +1,4 @@
+simhei.ttf has been removed as it's copyrighted.
+simsun.ttf has been removed just in case.
+
+TODO find open source fonts or migrate to jdocbook's system and list of fonts.
\ No newline at end of file
Deleted: core/trunk/annotations/src/main/docbook/zh_cn/fop/simhei.ttf
===================================================================
(Binary files differ)
Deleted: core/trunk/annotations/src/main/docbook/zh_cn/fop/simsun.ttc
===================================================================
(Binary files differ)
Modified: core/trunk/annotations/src/main/docbook/zh_cn/fop/userconfig.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/zh_cn/fop/userconfig.xml 2010-04-14 13:02:29 UTC (rev 19230)
+++ core/trunk/annotations/src/main/docbook/zh_cn/fop/userconfig.xml 2010-04-14 15:06:26 UTC (rev 19231)
@@ -93,7 +93,7 @@
<font-triplet name="Mincho" style="italic" weight="bold"/>
</font>
-->
- <font metrics-file="simhei.xml" embed-file="simhei.ttf" kerning="yes">
+ <!-- font metrics-file="simhei.xml" embed-file="simhei.ttf" kerning="yes">
<font-triplet name="simhei" style="normal" weight="normal"/>
<font-triplet name="simhei" style="normal" weight="bold"/>
<font-triplet name="simhei" style="italic" weight="normal"/>
@@ -104,7 +104,7 @@
<font-triplet name="simsun" style="normal" weight="bold"/>
<font-triplet name="simsun" style="italic" weight="normal"/>
<font-triplet name="simsun" style="italic" weight="bold"/>
- </font>
+ </font -->
</fonts>
14 years
- 1
- 0
Hibernate SVN: r19230 - in core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect: resolver and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-14 09:02:29 -0400 (Wed, 14 Apr 2010)
New Revision: 19230
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
Log:
JBPAPP-4105 HHH-4442 Change StandardDialectResolver to use SybaseASE15Dialect over deprecated SybaseDialect
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java 2010-04-14 11:59:06 UTC (rev 19229)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java 2010-04-14 13:02:29 UTC (rev 19230)
@@ -25,22 +25,9 @@
*/
package org.hibernate.dialect;
-import java.sql.CallableStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.Map;
-import java.util.Iterator;
-
import org.hibernate.Hibernate;
-import org.hibernate.LockMode;
-import org.hibernate.cfg.Environment;
import org.hibernate.dialect.function.AnsiTrimEmulationFunction;
-import org.hibernate.dialect.function.CharIndexFunction;
-import org.hibernate.dialect.function.NoArgSQLFunction;
import org.hibernate.dialect.function.SQLFunctionTemplate;
-import org.hibernate.dialect.function.StandardSQLFunction;
-import org.hibernate.dialect.function.VarArgsSQLFunction;
/**
* An SQL dialect compatible with Sybase and MS SQL Server.
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java 2010-04-14 11:59:06 UTC (rev 19229)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java 2010-04-14 13:02:29 UTC (rev 19230)
@@ -38,7 +38,7 @@
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.dialect.IngresDialect;
import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.InformixDialect;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.Oracle10gDialect;
@@ -86,7 +86,7 @@
}
if ( "Sybase SQL Server".equals( databaseName ) || "Adaptive Server Enterprise".equals( databaseName ) ) {
- return new SybaseDialect();
+ return new SybaseASE15Dialect();
}
if ( "Informix Dynamic Server".equals( databaseName ) ) {
14 years
- 1
- 0